From a363f42bb206bb09b17e32a34605f4100170405a Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Thu, 9 Jul 2015 11:42:18 -0700
Subject: [PATCH] pass const NLPacket& for all sendUnreliablePacket calls

---
 domain-server/src/DomainServer.cpp         | 6 +++---
 interface/src/Application.cpp              | 2 +-
 libraries/audio-client/src/AudioClient.cpp | 2 +-
 libraries/audio/src/AudioInjector.cpp      | 2 +-
 libraries/networking/src/LimitedNodeList.h | 7 +------
 libraries/networking/src/PacketSender.cpp  | 2 +-
 6 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/domain-server/src/DomainServer.cpp b/domain-server/src/DomainServer.cpp
index fffd67876f..46b126396b 100644
--- a/domain-server/src/DomainServer.cpp
+++ b/domain-server/src/DomainServer.cpp
@@ -1029,7 +1029,7 @@ void DomainServer::broadcastNewNode(const SharedNodePointer& addedNode) {
             addNodePacket->write(rfcConnectionSecret);
 
             // send off this packet to the node
-            limitedNodeList->sendUnreliablePacket(addNodePacket, node);
+            limitedNodeList->sendUnreliablePacket(*addNodePacket, node);
         }
     );
 }
@@ -1093,7 +1093,7 @@ void DomainServer::readAvailableDatagrams() {
 
                 assignmentStream << uniqueAssignment;
 
-                limitedNodeList->sendUnreliablePacket(assignmentPacket, senderSockAddr);
+                limitedNodeList->sendUnreliablePacket(*assignmentPacket, senderSockAddr);
 
                 // add the information for that deployed assignment to the hash of pending assigned nodes
                 PendingAssignedNodeData* pendingNodeData = new PendingAssignedNodeData(assignmentToDeploy->getUUID(),
@@ -1124,7 +1124,7 @@ void DomainServer::readAvailableDatagrams() {
                 dtlsRequiredPacket->writePrimitive(dtlsPort);
             }
 
-            limitedNodeList->sendUnreliablePacket(dtlsRequiredPacket, senderSockAddr);
+            limitedNodeList->sendUnreliablePacket(*dtlsRequiredPacket, senderSockAddr);
         }
     }
 }
diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 9a7f33fda3..be773d52f3 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -2891,7 +2891,7 @@ void Application::queryOctree(NodeType_t serverType, PacketType::Value packetTyp
             queryPacket->setSizeUsed(packetSize);
 
             // make sure we still have an active socket
-            nodeList->sendUnreliablePacket(queryPacket, node);
+            nodeList->sendUnreliablePacket(*queryPacket, node);
         }
     });
 }
diff --git a/libraries/audio-client/src/AudioClient.cpp b/libraries/audio-client/src/AudioClient.cpp
index 858be03296..73a785bb7b 100644
--- a/libraries/audio-client/src/AudioClient.cpp
+++ b/libraries/audio-client/src/AudioClient.cpp
@@ -882,7 +882,7 @@ void AudioClient::handleAudioInput() {
 
             nodeList->flagTimeForConnectionStep(LimitedNodeList::ConnectionStep::SendAudioPacket);
 
-            nodeList->sendUnreliablePacket(_audioPacket, audioMixer);
+            nodeList->sendUnreliablePacket(*_audioPacket, audioMixer);
 
             _outgoingAvatarAudioSequenceNumber++;
         }
diff --git a/libraries/audio/src/AudioInjector.cpp b/libraries/audio/src/AudioInjector.cpp
index 6b28f800df..c8744ace42 100644
--- a/libraries/audio/src/AudioInjector.cpp
+++ b/libraries/audio/src/AudioInjector.cpp
@@ -238,7 +238,7 @@ void AudioInjector::injectToMixer() {
             SharedNodePointer audioMixer = nodeList->soloNodeOfType(NodeType::AudioMixer);
 
             // send off this audio packet
-            nodeList->sendUnreliablePacket(audioPacket, audioMixer);
+            nodeList->sendUnreliablePacket(*audioPacket, audioMixer);
             outgoingInjectedAudioSequenceNumber++;
 
             _currentSendPosition += bytesToCopy;
diff --git a/libraries/networking/src/LimitedNodeList.h b/libraries/networking/src/LimitedNodeList.h
index 8e188947a8..8dd2a459ad 100644
--- a/libraries/networking/src/LimitedNodeList.h
+++ b/libraries/networking/src/LimitedNodeList.h
@@ -144,16 +144,11 @@ public:
 //    qint64 writeUnverifiedDatagram(const char* data, qint64 size, const SharedNodePointer& destinationNode,
 //                         const HifiSockAddr& overridenSockAddr = HifiSockAddr());
 //
-    
+
     qint64 sendUnreliablePacket(const NLPacket& packet, const SharedNodePointer& destinationNode)
     { assert(false); return 0; }
     qint64 sendUnreliablePacket(const NLPacket& packet, const HifiSockAddr& sockAddr)
     { assert(false); return 0; }
-    // TODO remove those
-    qint64 sendUnreliablePacket(std::unique_ptr<NLPacket>& packet, const SharedNodePointer& destinationNode)
-    { assert(false); return 0; }
-    qint64 sendUnreliablePacket(std::unique_ptr<NLPacket>& packet, const HifiSockAddr& sockAddr)
-    { assert(false); return 0; }
 
     qint64 sendPacket(std::unique_ptr<NLPacket> packet, const SharedNodePointer& destinationNode)
          { assert(false); return 0; }
diff --git a/libraries/networking/src/PacketSender.cpp b/libraries/networking/src/PacketSender.cpp
index 3db845166e..de3ee7dc98 100644
--- a/libraries/networking/src/PacketSender.cpp
+++ b/libraries/networking/src/PacketSender.cpp
@@ -272,7 +272,7 @@ bool PacketSender::nonThreadedProcess() {
         unlock();
 
         // send the packet through the NodeList...
-        DependencyManager::get<NodeList>()->sendUnreliablePacket(packetPair.second, packetPair.first);
+        DependencyManager::get<NodeList>()->sendUnreliablePacket(*(packetPair.second), packetPair.first);
 
         packetsSentThisCall++;
         _packetsOverCheckInterval++;