From 0ae825d7610835914a629eb92eda2fc746575cf7 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Thu, 17 Oct 2013 13:01:03 -0700 Subject: [PATCH] temporary activation of node public socket in VS --- libraries/voxel-server-library/src/VoxelSendThread.cpp | 2 +- libraries/voxel-server-library/src/VoxelServer.cpp | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/libraries/voxel-server-library/src/VoxelSendThread.cpp b/libraries/voxel-server-library/src/VoxelSendThread.cpp index d4cf3b491d..2cc0277cff 100644 --- a/libraries/voxel-server-library/src/VoxelSendThread.cpp +++ b/libraries/voxel-server-library/src/VoxelSendThread.cpp @@ -83,7 +83,7 @@ void VoxelSendThread::handlePacketSend(Node* node, VoxelNodeData* nodeData, int& } else { // just send the voxel packet NodeList::getInstance()->getNodeSocket()->send(node->getActiveSocket(), - nodeData->getPacket(), nodeData->getPacketLength()); + nodeData->getPacket(), nodeData->getPacketLength()); } // remember to track our stats nodeData->stats.packetSent(nodeData->getPacketLength()); diff --git a/libraries/voxel-server-library/src/VoxelServer.cpp b/libraries/voxel-server-library/src/VoxelServer.cpp index fec946bef9..1899eec02f 100644 --- a/libraries/voxel-server-library/src/VoxelServer.cpp +++ b/libraries/voxel-server-library/src/VoxelServer.cpp @@ -393,6 +393,11 @@ void VoxelServer::run() { NODE_TYPE_AGENT, &senderAddress, &senderAddress); + + // temp activation of public socket before server ping/reply is setup + if (!node->getActiveSocket()) { + node->activatePublicSocket(); + } NodeList::getInstance()->updateNodeWithData(node, packetData, packetLength);