From 3ba9c8c30e3e324bb0cf0e50ff623623e0f16312 Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Tue, 5 Nov 2013 13:41:15 -0800 Subject: [PATCH 1/2] added more debugging --- .../src/VoxelServerPacketProcessor.cpp | 21 ++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/libraries/voxel-server-library/src/VoxelServerPacketProcessor.cpp b/libraries/voxel-server-library/src/VoxelServerPacketProcessor.cpp index 2ade24928a..e8b7b9f5c7 100644 --- a/libraries/voxel-server-library/src/VoxelServerPacketProcessor.cpp +++ b/libraries/voxel-server-library/src/VoxelServerPacketProcessor.cpp @@ -24,6 +24,12 @@ VoxelServerPacketProcessor::VoxelServerPacketProcessor(VoxelServer* myServer) : void VoxelServerPacketProcessor::processPacket(sockaddr& senderAddress, unsigned char* packetData, ssize_t packetLength) { + bool debugProcessPacket = true; // temporarily debugging.... + + if (debugProcessPacket) { + printf("VoxelServerPacketProcessor::processPacket(() packetData=%p packetLength=%ld\n", packetData, packetLength); + } + int numBytesPacketHeader = numBytesForPacketHeader(packetData); if (packetData[0] == PACKET_TYPE_SET_VOXEL || packetData[0] == PACKET_TYPE_SET_VOXEL_DESTRUCTIVE) { @@ -41,7 +47,7 @@ void VoxelServerPacketProcessor::processPacket(sockaddr& senderAddress, unsigned packetLength, itemNumber); } - if (_myServer->wantsDebugVoxelReceiving()) { + if (debugProcessPacket || _myServer->wantsDebugVoxelReceiving()) { printf("got %s - %d command from client receivedBytes=%ld itemNumber=%d\n", destructive ? "PACKET_TYPE_SET_VOXEL_DESTRUCTIVE" : "PACKET_TYPE_SET_VOXEL", _receivedPacketCount, packetLength, itemNumber); @@ -50,6 +56,13 @@ void VoxelServerPacketProcessor::processPacket(sockaddr& senderAddress, unsigned unsigned char* voxelData = (unsigned char*)&packetData[atByte]; while (atByte < packetLength) { int maxSize = packetLength - atByte; + + if (debugProcessPacket) { + printf("VoxelServerPacketProcessor::processPacket(() %s packetData=%p packetLength=%ld voxelData=%p atByte=%d maxSize=%d\n", + destructive ? "PACKET_TYPE_SET_VOXEL_DESTRUCTIVE" : "PACKET_TYPE_SET_VOXEL", + packetData, packetLength, voxelData, atByte, maxSize); + } + int octets = numberOfThreeBitSectionsInCode(voxelData, maxSize); if (octets == OVERFLOWED_OCTCODE_BUFFER) { @@ -84,6 +97,12 @@ void VoxelServerPacketProcessor::processPacket(sockaddr& senderAddress, unsigned } } + if (debugProcessPacket) { + printf("VoxelServerPacketProcessor::processPacket(() DONE LOOPING FOR %s packetData=%p packetLength=%ld voxelData=%p atByte=%d\n", + destructive ? "PACKET_TYPE_SET_VOXEL_DESTRUCTIVE" : "PACKET_TYPE_SET_VOXEL", + packetData, packetLength, voxelData, atByte); + } + // Make sure our Node and NodeList knows we've heard from this node. Node* node = NodeList::getInstance()->nodeWithAddress(&senderAddress); if (node) { From 1c580551bbc910e094d8c38821c696002960f4ac Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Tue, 5 Nov 2013 13:47:58 -0800 Subject: [PATCH 2/2] added more debugging --- libraries/shared/src/ReceivedPacketProcessor.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libraries/shared/src/ReceivedPacketProcessor.cpp b/libraries/shared/src/ReceivedPacketProcessor.cpp index dce65b586e..7e8ffec44f 100644 --- a/libraries/shared/src/ReceivedPacketProcessor.cpp +++ b/libraries/shared/src/ReceivedPacketProcessor.cpp @@ -32,6 +32,10 @@ bool ReceivedPacketProcessor::process() { } while (_packets.size() > 0) { NetworkPacket& packet = _packets.front(); + + printf("ReceivedPacketProcessor::process() calling processPacket() NetworkPacket=%p packet.getData()=%p packet.getLength()=%ld\n", + &packet, packet.getData(), packet.getLength() ); + processPacket(packet.getAddress(), packet.getData(), packet.getLength()); lock();