Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-04 06:03:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix DS reply to node on same box to remove check in AC

Browse source
This commit is contained in:
Stephen Birarda 2013-09-12 17:03:05 -07:00
parent cd12fb2cc6
commit f878b17798
2 changed files with 5 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
domain-server/src/main.cpp
View file

@ -100,7 +100,7 @@ int main(int argc, const char* argv[]) {
unsigned char* currentBufferPos; unsigned char* currentBufferPos;
unsigned char* startPointer; unsigned char* startPointer;
sockaddr_in nodePublicAddress, nodeLocalAddress; sockaddr_in nodePublicAddress, nodeLocalAddress, replyDestinationSocket;
nodeLocalAddress.sin_family = AF_INET; nodeLocalAddress.sin_family = AF_INET;
in_addr_t serverLocalAddress = getLocalAddress(); in_addr_t serverLocalAddress = getLocalAddress();
@ -182,18 +182,15 @@ int main(int argc, const char* argv[]) {
int numBytesSocket = unpackSocket(packetData + numBytesSenderHeader + sizeof(NODE_TYPE), int numBytesSocket = unpackSocket(packetData + numBytesSenderHeader + sizeof(NODE_TYPE),
(sockaddr*) &nodeLocalAddress); (sockaddr*) &nodeLocalAddress);
sockaddr* destinationSocket = (sockaddr*) &nodePublicAddress; replyDestinationSocket = nodePublicAddress;
// check the node public address // check the node public address
// if it matches our local address // if it matches our local address
// or if it's the loopback address we're on the same box // or if it's the loopback address we're on the same box
if (nodePublicAddress.sin_addr.s_addr == serverLocalAddress || if (nodePublicAddress.sin_addr.s_addr == serverLocalAddress ||
nodePublicAddress.sin_addr.s_addr == htonl(INADDR_LOOPBACK)) { nodePublicAddress.sin_addr.s_addr == htonl(INADDR_LOOPBACK)) {
nodePublicAddress.sin_addr.s_addr = 0;
if (nodePublicAddress.sin_addr.s_addr != htonl(INADDR_LOOPBACK)) { nodePublicAddress.sin_addr.s_addr = 0;
destinationSocket = (sockaddr*) &nodeLocalAddress;
}
} }
Node* newNode = nodeList->addOrUpdateNode((sockaddr*) &nodePublicAddress, Node* newNode = nodeList->addOrUpdateNode((sockaddr*) &nodePublicAddress,
@ -264,7 +261,7 @@ int main(int argc, const char* argv[]) {
currentBufferPos += packNodeId(currentBufferPos, newNode->getNodeID()); currentBufferPos += packNodeId(currentBufferPos, newNode->getNodeID());
// send the constructed list back to this node // send the constructed list back to this node
nodeList->getNodeSocket()->send(destinationSocket, nodeList->getNodeSocket()->send((sockaddr*)&replyDestinationSocket,
broadcastPacket, broadcastPacket,
(currentBufferPos - startPointer) + numHeaderBytes); (currentBufferPos - startPointer) + numHeaderBytes);
} }

4
libraries/shared/src/NodeList.cpp
View file

@ -120,9 +120,7 @@ void NodeList::processNodeData(sockaddr* senderAddress, unsigned char* packetDat
sockaddr_in domainServerSocket = *(sockaddr_in*) senderAddress; sockaddr_in domainServerSocket = *(sockaddr_in*) senderAddress;
const char* domainSenderIP = inet_ntoa(domainServerSocket.sin_addr); const char* domainSenderIP = inet_ntoa(domainServerSocket.sin_addr);
if (memcmp(domainSenderIP, _domainIP, strlen(domainSenderIP)) == 0 if (memcmp(domainSenderIP, _domainIP, strlen(domainSenderIP)) == 0) {
|| (inet_addr(_domainIP) == htonl(INADDR_LOOPBACK)
&& domainServerSocket.sin_addr.s_addr == getLocalAddress())) {
processDomainServerList(packetData, dataBytes); processDomainServerList(packetData, dataBytes);
} }