From 81ad0056c3d5f03fa8d3d1ccb7b35637f4d0c498 Mon Sep 17 00:00:00 2001 From: Atlante45 Date: Mon, 13 Jul 2015 15:34:37 -0700 Subject: [PATCH] Fix a few node deref --- assignment-client/src/avatars/AvatarMixer.cpp | 2 +- .../src/octree/OctreeInboundPacketProcessor.cpp | 2 +- domain-server/src/DomainServer.cpp | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/assignment-client/src/avatars/AvatarMixer.cpp b/assignment-client/src/avatars/AvatarMixer.cpp index 4e5f7f91d4..32371122ee 100644 --- a/assignment-client/src/avatars/AvatarMixer.cpp +++ b/assignment-client/src/avatars/AvatarMixer.cpp @@ -337,7 +337,7 @@ void AvatarMixer::broadcastAvatarData() { }); // send the avatar data PacketList - nodeList->sendPacketList(avatarPacketList, node); + nodeList->sendPacketList(avatarPacketList, *node); // record the bytes sent for other avatar data in the AvatarMixerClientData nodeData->recordSentAvatarData(numAvatarDataBytes); diff --git a/assignment-client/src/octree/OctreeInboundPacketProcessor.cpp b/assignment-client/src/octree/OctreeInboundPacketProcessor.cpp index ebc18162d9..521c4bce46 100644 --- a/assignment-client/src/octree/OctreeInboundPacketProcessor.cpp +++ b/assignment-client/src/octree/OctreeInboundPacketProcessor.cpp @@ -287,7 +287,7 @@ int OctreeInboundPacketProcessor::sendNackPackets() { packetsSent += nackPacketList.getNumPackets(); // send the list of nack packets - nodeList->sendPacketList(nackPacketList, destinationNode); + nodeList->sendPacketList(nackPacketList, *destinationNode); } } diff --git a/domain-server/src/DomainServer.cpp b/domain-server/src/DomainServer.cpp index 9cdac34c30..20eb2c9ac4 100644 --- a/domain-server/src/DomainServer.cpp +++ b/domain-server/src/DomainServer.cpp @@ -974,7 +974,7 @@ void DomainServer::sendDomainListToNode(const SharedNodePointer& node, const Hif } // write the PacketList to this node - limitedNodeList->sendPacketList(domainListPackets, node); + limitedNodeList->sendPacketList(domainListPackets, *node); } QUuid DomainServer::connectionSecretForNodes(const SharedNodePointer& nodeA, const SharedNodePointer& nodeB) { @@ -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); } } }