From 957e6394a9465e20057629502e08737875f9b36f Mon Sep 17 00:00:00 2001 From: Atlante45 Date: Mon, 13 Jul 2015 11:57:20 -0700 Subject: [PATCH] sendPacket function take Node& not a pointer --- assignment-client/src/AssignmentClientMonitor.cpp | 2 +- assignment-client/src/audio/AudioMixer.cpp | 8 ++++---- assignment-client/src/audio/AudioMixerClientData.cpp | 2 +- assignment-client/src/avatars/AvatarMixer.cpp | 4 ++-- assignment-client/src/entities/EntityServer.cpp | 2 +- assignment-client/src/octree/OctreeSendThread.cpp | 10 +++++----- domain-server/src/DomainServer.cpp | 6 +++--- interface/src/Application.cpp | 6 +++--- libraries/audio-client/src/AudioClient.cpp | 4 ++-- libraries/audio-client/src/AudioIOStats.cpp | 2 +- libraries/audio/src/AudioInjector.cpp | 2 +- libraries/networking/src/LimitedNodeList.h | 12 ++++++------ libraries/networking/src/PacketSender.cpp | 2 +- libraries/octree/src/OctreeHeadlessViewer.cpp | 2 +- libraries/script-engine/src/ScriptEngine.cpp | 2 +- 15 files changed, 33 insertions(+), 33 deletions(-) diff --git a/assignment-client/src/AssignmentClientMonitor.cpp b/assignment-client/src/AssignmentClientMonitor.cpp index 6796c122dc..7855956763 100644 --- a/assignment-client/src/AssignmentClientMonitor.cpp +++ b/assignment-client/src/AssignmentClientMonitor.cpp @@ -196,7 +196,7 @@ void AssignmentClientMonitor::checkSpares() { childNode->activateLocalSocket(); auto diePacket = NLPacket::create(PacketType::StopNode, 0); - nodeList->sendPacket(std::move(diePacket), childNode); + nodeList->sendPacket(std::move(diePacket), *childNode); } } } diff --git a/assignment-client/src/audio/AudioMixer.cpp b/assignment-client/src/audio/AudioMixer.cpp index e81f4c66f8..40c1a9d7ab 100644 --- a/assignment-client/src/audio/AudioMixer.cpp +++ b/assignment-client/src/audio/AudioMixer.cpp @@ -528,7 +528,7 @@ void AudioMixer::sendAudioEnvironmentPacket(SharedNodePointer node) { envPacket->writePrimitive(reverbTime); envPacket->writePrimitive(wetLevel); } - nodeList->sendPacket(std::move(envPacket), node); + nodeList->sendPacket(std::move(envPacket), *node); } } @@ -555,7 +555,7 @@ void AudioMixer::readPendingDatagram(const QByteArray& receivedPacket, const Hif nodeList->eachNode([&](const SharedNodePointer& node){ if (node->getType() == NodeType::Agent && node->getActiveSocket() && node->getLinkedData() && node != sendingNode) { - nodeList->sendPacket(std::move(packet), node); + nodeList->sendPacket(std::move(packet), *node); } }); } @@ -793,7 +793,7 @@ void AudioMixer::run() { if (nodeData->getAvatarAudioStream() && shouldMute(nodeData->getAvatarAudioStream()->getQuietestFrameLoudness())) { auto mutePacket = NLPacket::create(PacketType::NoisyMute, 0); - nodeList->sendPacket(std::move(mutePacket), node); + nodeList->sendPacket(std::move(mutePacket), *node); } if (node->getType() == NodeType::Agent && node->getActiveSocket() @@ -831,7 +831,7 @@ void AudioMixer::run() { sendAudioEnvironmentPacket(node); // send mixed audio packet - nodeList->sendPacket(std::move(mixPacket), node); + nodeList->sendPacket(std::move(mixPacket), *node); nodeData->incrementOutgoingMixedAudioSequenceNumber(); // send an audio stream stats packet if it's time diff --git a/assignment-client/src/audio/AudioMixerClientData.cpp b/assignment-client/src/audio/AudioMixerClientData.cpp index 13cfe4d1a0..0060b45f6e 100644 --- a/assignment-client/src/audio/AudioMixerClientData.cpp +++ b/assignment-client/src/audio/AudioMixerClientData.cpp @@ -190,7 +190,7 @@ void AudioMixerClientData::sendAudioStreamStatsPackets(const SharedNodePointer& numStreamStatsRemaining -= numStreamStatsToPack; // send the current packet - nodeList->sendPacket(std::move(statsPacket), destinationNode); + nodeList->sendPacket(std::move(statsPacket), *destinationNode); } } diff --git a/assignment-client/src/avatars/AvatarMixer.cpp b/assignment-client/src/avatars/AvatarMixer.cpp index 0d4e5b5934..487db1b380 100644 --- a/assignment-client/src/avatars/AvatarMixer.cpp +++ b/assignment-client/src/avatars/AvatarMixer.cpp @@ -312,7 +312,7 @@ void AvatarMixer::broadcastAvatarData() { billboardPacket->write(rfcUUID); billboardPacket->write(billboard); - nodeList->sendPacket(std::move(billboardPacket), node); + nodeList->sendPacket(std::move(billboardPacket), *node); ++_sumBillboardPackets; } @@ -330,7 +330,7 @@ void AvatarMixer::broadcastAvatarData() { identityPacket->write(individualData); - nodeList->sendPacket(std::move(identityPacket), node); + nodeList->sendPacket(std::move(identityPacket), *node); ++_sumIdentityPackets; } diff --git a/assignment-client/src/entities/EntityServer.cpp b/assignment-client/src/entities/EntityServer.cpp index 08907380fb..8ec2a82afe 100644 --- a/assignment-client/src/entities/EntityServer.cpp +++ b/assignment-client/src/entities/EntityServer.cpp @@ -101,7 +101,7 @@ int EntityServer::sendSpecialPackets(const SharedNodePointer& node, OctreeQueryN totalBytes += specialPacket->getSizeWithHeader(); packetsSent++; - DependencyManager::get()->sendPacket(std::move(specialPacket), node); + DependencyManager::get()->sendPacket(std::move(specialPacket), *node); } nodeData->setLastDeletedEntitiesSentAt(deletePacketSentAt); diff --git a/assignment-client/src/octree/OctreeSendThread.cpp b/assignment-client/src/octree/OctreeSendThread.cpp index a9619034d9..520b796e47 100644 --- a/assignment-client/src/octree/OctreeSendThread.cpp +++ b/assignment-client/src/octree/OctreeSendThread.cpp @@ -179,12 +179,12 @@ int OctreeSendThread::handlePacketSend(OctreeQueryNode* nodeData, int& trueBytes // actually send it OctreeServer::didCallWriteDatagram(this); - DependencyManager::get()->sendUnreliablePacket(statsPacket, _node); + DependencyManager::get()->sendUnreliablePacket(statsPacket, *_node); packetSent = true; } else { // not enough room in the packet, send two packets OctreeServer::didCallWriteDatagram(this); - DependencyManager::get()->sendUnreliablePacket(statsPacket, _node); + DependencyManager::get()->sendUnreliablePacket(statsPacket, *_node); // since a stats message is only included on end of scene, don't consider any of these bytes "wasted", since // there was nothing else to send. @@ -215,7 +215,7 @@ int OctreeSendThread::handlePacketSend(OctreeQueryNode* nodeData, int& trueBytes packetsSent++; OctreeServer::didCallWriteDatagram(this); - DependencyManager::get()->sendUnreliablePacket(nodeData->getPacket(), _node); + DependencyManager::get()->sendUnreliablePacket(nodeData->getPacket(), *_node); packetSent = true; int packetSizeWithHeader = nodeData->getPacket().getSizeWithHeader(); @@ -247,7 +247,7 @@ int OctreeSendThread::handlePacketSend(OctreeQueryNode* nodeData, int& trueBytes if (nodeData->isPacketWaiting() && !nodeData->isShuttingDown()) { // just send the octree packet OctreeServer::didCallWriteDatagram(this); - DependencyManager::get()->sendUnreliablePacket(nodeData->getPacket(), _node); + DependencyManager::get()->sendUnreliablePacket(nodeData->getPacket(), *_node); packetSent = true; int packetSizeWithHeader = nodeData->getPacket().getSizeWithHeader(); @@ -592,7 +592,7 @@ int OctreeSendThread::packetDistributor(OctreeQueryNode* nodeData, bool viewFrus while (nodeData->hasNextNackedPacket() && packetsSentThisInterval < maxPacketsPerInterval) { const NLPacket* packet = nodeData->getNextNackedPacket(); if (packet) { - DependencyManager::get()->sendUnreliablePacket(*packet, _node); + DependencyManager::get()->sendUnreliablePacket(*packet, *_node); truePacketsSent++; packetsSentThisInterval++; diff --git a/domain-server/src/DomainServer.cpp b/domain-server/src/DomainServer.cpp index a77156a8c9..bb98bb1186 100644 --- a/domain-server/src/DomainServer.cpp +++ b/domain-server/src/DomainServer.cpp @@ -1030,7 +1030,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); } ); } @@ -1094,7 +1094,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(), @@ -1125,7 +1125,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 04ffe64d8d..09f8e111ba 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -1769,7 +1769,7 @@ void Application::sendPingPackets() { return false; } }, [nodeList](const SharedNodePointer& node) { - nodeList->sendPacket(std::move(nodeList->constructPingPacket()), node); + nodeList->sendPacket(std::move(nodeList->constructPingPacket()), *node); }); } @@ -2710,7 +2710,7 @@ int Application::sendNackPackets() { packetsSent += nackPacketList.getNumPackets(); // send the packet list - nodeList->sendPacketList(nackPacketList, node); + nodeList->sendPacketList(nackPacketList, *node); } } }); @@ -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 73a785bb7b..918e5e23db 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++; } @@ -924,7 +924,7 @@ void AudioClient::sendMuteEnvironmentPacket() { if (audioMixer) { // send off this mute packet - nodeList->sendPacket(std::move(mutePacket), audioMixer); + nodeList->sendPacket(std::move(mutePacket), *audioMixer); } } diff --git a/libraries/audio-client/src/AudioIOStats.cpp b/libraries/audio-client/src/AudioIOStats.cpp index 8f7ab2ecaa..d29f976da5 100644 --- a/libraries/audio-client/src/AudioIOStats.cpp +++ b/libraries/audio-client/src/AudioIOStats.cpp @@ -124,5 +124,5 @@ void AudioIOStats::sendDownstreamAudioStatsPacket() { // send packet SharedNodePointer audioMixer = nodeList->soloNodeOfType(NodeType::AudioMixer); - nodeList->sendPacket(std::move(statsPacket), audioMixer); + nodeList->sendPacket(std::move(statsPacket), *audioMixer); } diff --git a/libraries/audio/src/AudioInjector.cpp b/libraries/audio/src/AudioInjector.cpp index c8744ace42..ac11d8f8ca 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 5298eec042..715eedc33b 100644 --- a/libraries/networking/src/LimitedNodeList.h +++ b/libraries/networking/src/LimitedNodeList.h @@ -123,14 +123,14 @@ public: qint64 readDatagram(QByteArray& incomingPacket, QHostAddress* address, quint16 * port); - qint64 sendUnreliablePacket(const NLPacket& packet, const SharedNodePointer& destinationNode) { assert(false); return 0; } - qint64 sendUnreliablePacket(const NLPacket& packet, const HifiSockAddr& sockAddr) { assert(false); return 0; } + qint64 sendUnreliablePacket(const NLPacket& packet, const Node& destinationNode); + qint64 sendUnreliablePacket(const NLPacket& packet, const HifiSockAddr& sockAddr); - qint64 sendPacket(std::unique_ptr packet, const SharedNodePointer& destinationNode) { assert(false); return 0; } - qint64 sendPacket(std::unique_ptr packet, const HifiSockAddr& sockAddr) { assert(false); return 0; } + qint64 sendPacket(std::unique_ptr packet, const Node& destinationNode); + qint64 sendPacket(std::unique_ptr packet, const HifiSockAddr& sockAddr); - qint64 sendPacketList(NLPacketList& packetList, const SharedNodePointer& destinationNode) { assert(false); return 0; } - qint64 sendPacketList(NLPacketList& packetList, const HifiSockAddr& sockAddr) { assert(false); return 0; } + qint64 sendPacketList(NLPacketList& packetList, const Node& destinationNode); + qint64 sendPacketList(NLPacketList& packetList, const HifiSockAddr& sockAddr); void (*linkedDataCreateCallback)(Node *); diff --git a/libraries/networking/src/PacketSender.cpp b/libraries/networking/src/PacketSender.cpp index de3ee7dc98..3313403033 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()->sendUnreliablePacket(*(packetPair.second), packetPair.first); + DependencyManager::get()->sendUnreliablePacket(*packetPair.second, *packetPair.first); packetsSentThisCall++; _packetsOverCheckInterval++; diff --git a/libraries/octree/src/OctreeHeadlessViewer.cpp b/libraries/octree/src/OctreeHeadlessViewer.cpp index 2a9dd1dd33..168d08082f 100644 --- a/libraries/octree/src/OctreeHeadlessViewer.cpp +++ b/libraries/octree/src/OctreeHeadlessViewer.cpp @@ -219,7 +219,7 @@ void OctreeHeadlessViewer::queryOctree() { _octreeQuery.getBroadcastData(reinterpret_cast(queryPacket->getPayload())); // ask the NodeList to send it - nodeList->sendPacket(std::move(queryPacket), node); + nodeList->sendPacket(std::move(queryPacket), *node); } }); } diff --git a/libraries/script-engine/src/ScriptEngine.cpp b/libraries/script-engine/src/ScriptEngine.cpp index be959b9f0c..134766fb6b 100644 --- a/libraries/script-engine/src/ScriptEngine.cpp +++ b/libraries/script-engine/src/ScriptEngine.cpp @@ -675,7 +675,7 @@ void ScriptEngine::run() { audioPacket->writePrimitive(sequence); // send audio packet - nodeList->sendUnreliablePacket(*audioPacket, node); + nodeList->sendUnreliablePacket(*audioPacket, *node); } }); }