From 729074b50215e2013a29b25168a9d7142ef543c8 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Mon, 8 Jul 2013 13:58:20 -0700 Subject: [PATCH] use packet header byte methods in NodeList bulk processing --- libraries/shared/src/NodeList.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/libraries/shared/src/NodeList.cpp b/libraries/shared/src/NodeList.cpp index 210c07417b..9ba2e54008 100644 --- a/libraries/shared/src/NodeList.cpp +++ b/libraries/shared/src/NodeList.cpp @@ -117,9 +117,11 @@ void NodeList::processBulkNodeData(sockaddr *senderAddress, unsigned char *packe bulkSendNode->setLastHeardMicrostamp(usecTimestampNow()); bulkSendNode->recordBytesReceived(numTotalBytes); } - + + int numBytesPacketHeader = numBytesForPacketHeader(packetData); + unsigned char *startPosition = packetData; - unsigned char *currentPosition = startPosition + sizeof(PACKET_TYPE) + sizeof(PACKET_VERSION); + unsigned char *currentPosition = startPosition + numBytesPacketHeader; unsigned char packetHolder[numTotalBytes]; // we've already verified packet version for the bulk packet, so all head data in the packet is also up to date @@ -129,7 +131,7 @@ void NodeList::processBulkNodeData(sockaddr *senderAddress, unsigned char *packe while ((currentPosition - startPosition) < numTotalBytes) { unpackNodeId(currentPosition, &nodeID); - memcpy(packetHolder + sizeof(PACKET_TYPE) + sizeof(PACKET_VERSION), + memcpy(packetHolder + numBytesPacketHeader, currentPosition, numTotalBytes - (currentPosition - startPosition));