From 6d6b9b81171782119bb8c0c9060c6ab47c2eaf27 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Tue, 14 Jul 2015 16:11:48 -0700
Subject: [PATCH] pass sending node to processListRequestPacket

---
 domain-server/src/DomainServer.cpp | 29 ++++++++++-------------------
 domain-server/src/DomainServer.h   |  2 +-
 2 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/domain-server/src/DomainServer.cpp b/domain-server/src/DomainServer.cpp
index 21b2ce0f58..0a546d45db 100644
--- a/domain-server/src/DomainServer.cpp
+++ b/domain-server/src/DomainServer.cpp
@@ -726,31 +726,22 @@ void DomainServer::processConnectRequestPacket(QSharedPointer<NLPacket> packet)
     }
 }
 
-void DomainServer::processListRequestPacket(QSharedPointer<NLPacket> packet) {
-    QDataStream packetStream(packet.data());
+void DomainServer::processListRequestPacket(QSharedPointer<NLPacket> packet, SharedNodePointer sendingNode) {
     
-    const QUuid& nodeUUID = packet->getSourceID();
+    NodeType_t throwawayNodeType;
+    HifiSockAddr nodePublicAddress, nodeLocalAddress;
 
-    auto limitedNodeList = DependencyManager::get<LimitedNodeList>();
+    QDataStream packetStream(packet.data());
 
-    SharedNodePointer checkInNode = limitedNodeList->nodeWithUUID(nodeUUID);
+    parseNodeData(packetStream, throwawayNodeType, nodePublicAddress, nodeLocalAddress, packet->getSenderSockAddr());
 
-    if (!nodeUUID.isNull() && checkInNode) {
-        NodeType_t throwawayNodeType;
-        HifiSockAddr nodePublicAddress, nodeLocalAddress;
+    sendingNode->setPublicSocket(nodePublicAddress);
+    sendingNode->setLocalSocket(nodeLocalAddress);
 
-        QDataStream packetStream(packet.data());
+    QList<NodeType_t> nodeInterestList;
+    packetStream >> nodeInterestList;
 
-        parseNodeData(packetStream, throwawayNodeType, nodePublicAddress, nodeLocalAddress, packet->getSenderSockAddr());
-
-        checkInNode->setPublicSocket(nodePublicAddress);
-        checkInNode->setLocalSocket(nodeLocalAddress);
-
-        QList<NodeType_t> nodeInterestList;
-        packetStream >> nodeInterestList;
-
-        sendDomainListToNode(checkInNode, packet->getSenderSockAddr(), nodeInterestList.toSet());
-    }
+    sendDomainListToNode(sendingNode, packet->getSenderSockAddr(), nodeInterestList.toSet());
 }
 
 unsigned int DomainServer::countConnectedUsers() {
diff --git a/domain-server/src/DomainServer.h b/domain-server/src/DomainServer.h
index 7f7cba7445..c2d5db367f 100644
--- a/domain-server/src/DomainServer.h
+++ b/domain-server/src/DomainServer.h
@@ -58,7 +58,7 @@ public slots:
 
     void processRequestAssignmentPacket(QSharedPointer<NLPacket> packet);
     void processConnectRequestPacket(QSharedPointer<NLPacket> packet);
-    void processListRequestPacket(QSharedPointer<NLPacket> packet);
+    void processListRequestPacket(QSharedPointer<NLPacket> packet, SharedNodePointer sendingNode);
     void processNodeJSONStatsPacket(QSharedPointer<NLPacket> packet, SharedNodePointer sendingNode);
     void processPathQueryPacket(QSharedPointer<NLPacket> packet);
     void processICEPingPacket(QSharedPointer<NLPacket> packet);