From f878b17798e57f12d9fb073b1e8457e8bae3e149 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Thu, 12 Sep 2013 17:03:05 -0700
Subject: [PATCH] fix DS reply to node on same box to remove check in AC

---
 domain-server/src/main.cpp        | 11 ++++-------
 libraries/shared/src/NodeList.cpp |  4 +---
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/domain-server/src/main.cpp b/domain-server/src/main.cpp
index 87ede8572e..c6f8023999 100644
--- a/domain-server/src/main.cpp
+++ b/domain-server/src/main.cpp
@@ -100,7 +100,7 @@ int main(int argc, const char* argv[]) {
     unsigned char* currentBufferPos;
     unsigned char* startPointer;
     
-    sockaddr_in nodePublicAddress, nodeLocalAddress;
+    sockaddr_in nodePublicAddress, nodeLocalAddress, replyDestinationSocket;
     nodeLocalAddress.sin_family = AF_INET;
     
     in_addr_t serverLocalAddress = getLocalAddress();
@@ -182,18 +182,15 @@ int main(int argc, const char* argv[]) {
                 int numBytesSocket = unpackSocket(packetData + numBytesSenderHeader + sizeof(NODE_TYPE),
                                                   (sockaddr*) &nodeLocalAddress);
                 
-                sockaddr* destinationSocket = (sockaddr*) &nodePublicAddress;
+                replyDestinationSocket = nodePublicAddress;
                 
                 // check the node public address
                 // if it matches our local address
                 // or if it's the loopback address we're on the same box
                 if (nodePublicAddress.sin_addr.s_addr == serverLocalAddress ||
                     nodePublicAddress.sin_addr.s_addr == htonl(INADDR_LOOPBACK)) {
-                    nodePublicAddress.sin_addr.s_addr = 0;
                     
-                    if (nodePublicAddress.sin_addr.s_addr != htonl(INADDR_LOOPBACK)) {
-                        destinationSocket = (sockaddr*) &nodeLocalAddress;
-                    }
+                    nodePublicAddress.sin_addr.s_addr = 0;
                 }
                 
                 Node* newNode = nodeList->addOrUpdateNode((sockaddr*) &nodePublicAddress,
@@ -264,7 +261,7 @@ int main(int argc, const char* argv[]) {
                     currentBufferPos += packNodeId(currentBufferPos, newNode->getNodeID());
                     
                     // send the constructed list back to this node
-                    nodeList->getNodeSocket()->send(destinationSocket,
+                    nodeList->getNodeSocket()->send((sockaddr*)&replyDestinationSocket,
                                                     broadcastPacket,
                                                     (currentBufferPos - startPointer) + numHeaderBytes);
                 }
diff --git a/libraries/shared/src/NodeList.cpp b/libraries/shared/src/NodeList.cpp
index 7b2566eef0..50853c1c93 100644
--- a/libraries/shared/src/NodeList.cpp
+++ b/libraries/shared/src/NodeList.cpp
@@ -120,9 +120,7 @@ void NodeList::processNodeData(sockaddr* senderAddress, unsigned char* packetDat
             sockaddr_in domainServerSocket = *(sockaddr_in*) senderAddress;
             const char* domainSenderIP = inet_ntoa(domainServerSocket.sin_addr);
             
-            if (memcmp(domainSenderIP, _domainIP, strlen(domainSenderIP)) == 0
-                || (inet_addr(_domainIP) == htonl(INADDR_LOOPBACK)
-                    && domainServerSocket.sin_addr.s_addr == getLocalAddress())) {
+            if (memcmp(domainSenderIP, _domainIP, strlen(domainSenderIP)) == 0) {
                 processDomainServerList(packetData, dataBytes);
             }