From b1a7e7c0523b65c92f3fcb6167044b566277aa8c Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Thu, 24 Oct 2013 17:03:49 -0700 Subject: [PATCH] make the NodeList handle ping reply packets in VS --- .../voxel-server-library/src/VoxelServer.cpp | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/libraries/voxel-server-library/src/VoxelServer.cpp b/libraries/voxel-server-library/src/VoxelServer.cpp index ca9eaf8036..1167ef8b46 100644 --- a/libraries/voxel-server-library/src/VoxelServer.cpp +++ b/libraries/voxel-server-library/src/VoxelServer.cpp @@ -435,21 +435,19 @@ void VoxelServer::run() { nodeData->initializeVoxelSendThread(this); } } - } else if (packetData[0] == PACKET_TYPE_PING - || packetData[0] == PACKET_TYPE_DOMAIN - || packetData[0] == PACKET_TYPE_STUN_RESPONSE) { - // let processNodeData handle it. - NodeList::getInstance()->processNodeData(&senderAddress, packetData, packetLength); - } else if (packetData[0] == PACKET_TYPE_DOMAIN) { - NodeList::getInstance()->processNodeData(&senderAddress, packetData, packetLength); } else if (packetData[0] == PACKET_TYPE_VOXEL_JURISDICTION_REQUEST) { if (_jurisdictionSender) { _jurisdictionSender->queueReceivedPacket(senderAddress, packetData, packetLength); } - } else if (_voxelServerPacketProcessor) { + } else if (_voxelServerPacketProcessor && + (packetData[0] == PACKET_TYPE_SET_VOXEL + || packetData[0] == PACKET_TYPE_SET_VOXEL_DESTRUCTIVE + || packetData[0] == PACKET_TYPE_ERASE_VOXEL + || packetData[0] == PACKET_TYPE_Z_COMMAND)) { _voxelServerPacketProcessor->queueReceivedPacket(senderAddress, packetData, packetLength); } else { - qDebug("unknown packet ignored... packetData[0]=%c\n", packetData[0]); + // let processNodeData handle it. + NodeList::getInstance()->processNodeData(&senderAddress, packetData, packetLength); } } }