From a61c04aa92e4d5d9f6095aed6a4054181a7cc9f9 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Tue, 21 Jul 2015 12:00:16 -0700
Subject: [PATCH] allow socket owner to specify unfiltered packets

---
 interface/src/Application.cpp                | 3 +--
 libraries/networking/src/LimitedNodeList.cpp | 1 +
 libraries/networking/src/LimitedNodeList.h   | 2 ++
 libraries/networking/src/udt/Socket.cpp      | 2 +-
 libraries/networking/src/udt/Socket.h        | 4 ++++
 5 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index f0dcdd1a8a..e920c760ba 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -452,8 +452,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer &startup_time) :
     connect(nodeList.data(), &NodeList::uuidChanged, _myAvatar, &MyAvatar::setSessionUUID);
     connect(nodeList.data(), &NodeList::uuidChanged, this, &Application::setSessionUUID);
     connect(nodeList.data(), &NodeList::limitOfSilentDomainCheckInsReached, nodeList.data(), &NodeList::reset);
-    connect(&nodeList->getPacketReceiver(), &PacketReceiver::packetVersionMismatch,
-            this, &Application::notifyPacketVersionMismatch);
+    connect(&nodeList.data(), &NodeList::packetVersionMismatch, this, &Application::notifyPacketVersionMismatch);
 
     // connect to appropriate slots on AccountManager
     AccountManager& accountManager = AccountManager::getInstance();
diff --git a/libraries/networking/src/LimitedNodeList.cpp b/libraries/networking/src/LimitedNodeList.cpp
index 821cd5e47b..4d8b7e48a3 100644
--- a/libraries/networking/src/LimitedNodeList.cpp
+++ b/libraries/networking/src/LimitedNodeList.cpp
@@ -710,6 +710,7 @@ void LimitedNodeList::startSTUNPublicSocketUpdate() {
         // if we don't know the STUN IP yet we need to have ourselves be called once it is known
         if (_stunSockAddr.getAddress().isNull()) {
             connect(&_stunSockAddr, &HifiSockAddr::lookupCompleted, this, &LimitedNodeList::startSTUNPublicSocketUpdate);
+            connect(&_stunSockAddr, &HifiSockAddr::lookupCompleted, this, &LimitedNodeList::addSTUNSockAddrToUnfiltered);
 
             // in case we just completely fail to lookup the stun socket - add a 10s timeout that will trigger the fail case
             const quint64 STUN_DNS_LOOKUP_TIMEOUT_MSECS = 10 * 1000;
diff --git a/libraries/networking/src/LimitedNodeList.h b/libraries/networking/src/LimitedNodeList.h
index f05ba4b0dc..ebfe77cc8b 100644
--- a/libraries/networking/src/LimitedNodeList.h
+++ b/libraries/networking/src/LimitedNodeList.h
@@ -310,9 +310,11 @@ protected:
             functor(it);
         }
     }
+    
 private slots:
     void flagTimeForConnectionStep(ConnectionStep connectionStep, quint64 timestamp);
     void possiblyTimeoutSTUNAddressLookup();
+    void addSTUNSockAddrToUnfiltered() { _nodeSocket.addUnfilteredSockAddr(_stunSockAddr); } // called once STUN socket known
 };
 
 #endif // hifi_LimitedNodeList_h
diff --git a/libraries/networking/src/udt/Socket.cpp b/libraries/networking/src/udt/Socket.cpp
index 661c27bef5..0192e306c3 100644
--- a/libraries/networking/src/udt/Socket.cpp
+++ b/libraries/networking/src/udt/Socket.cpp
@@ -85,7 +85,7 @@ void Socket::readPendingDatagrams() {
         auto packet = Packet::fromReceivedPacket(std::move(buffer), packetSizeWithHeader, senderSockAddr);
         
         // call our verification operator to see if this packet is verified
-        if (!_verifyPacketOperator || _verifyPacketOperator(*packet)) {
+        if (_unfilteredSockAddrs.contains(senderSockAddr) || !_verifyPacketOperator || _verifyPacketOperator(*packet)) {
             
             // call the verified packet callback to let it handle this packet
             return _verifiedPacketCallback(std::move(packet));
diff --git a/libraries/networking/src/udt/Socket.h b/libraries/networking/src/udt/Socket.h
index 4d98667c3a..36f11213ff 100644
--- a/libraries/networking/src/udt/Socket.h
+++ b/libraries/networking/src/udt/Socket.h
@@ -46,6 +46,8 @@ public:
         { _verifiedPacketCallback = verifiedPacketCallback; }
     
     void setBufferSizes(int numBytes);
+    
+    void addUnfilteredSockAddr(const HifiSockAddr& senderSockAddr) { _unfilteredSockAddrs.insert(senderSockAddr); }
 
 private slots:
     void readPendingDatagrams();
@@ -54,6 +56,8 @@ private:
     QUdpSocket _udpSocket { this };
     VerifyPacketOperator _verifyPacketOperator;
     VerifiedPacketCallback _verifiedPacketCallback;
+    
+    QSet<HifiSockAddr> _unfilteredSockAddrs;
 };
     
 }