From a661d9f2f44727cc1a08cd7b425fdf170e5f4e6a Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Thu, 8 Aug 2013 15:19:48 -0700 Subject: [PATCH] repair header byte calculations in assignment server --- assignment-server/src/main.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/assignment-server/src/main.cpp b/assignment-server/src/main.cpp index 374009b917..be902ed5b0 100644 --- a/assignment-server/src/main.cpp +++ b/assignment-server/src/main.cpp @@ -32,9 +32,8 @@ int main(int argc, const char* argv[]) { UDPSocket serverSocket(ASSIGNMENT_SERVER_PORT); - int numHeaderBytes = numBytesForPacketHeader((unsigned char*) &PACKET_TYPE_SEND_ASSIGNMENT); unsigned char assignmentPacket[MAX_PACKET_SIZE_BYTES]; - populateTypeAndVersion(assignmentPacket, PACKET_TYPE_SEND_ASSIGNMENT); + int numSendHeaderBytes = populateTypeAndVersion(assignmentPacket, PACKET_TYPE_SEND_ASSIGNMENT); while (true) { if (serverSocket.receive((sockaddr*) &senderSocket, &senderData, &receivedBytes)) { @@ -53,7 +52,7 @@ int main(int argc, const char* argv[]) { qDebug() << "Sending assignment with URL" << scriptURL << "\n"; int scriptURLBytes = scriptURL.size(); - memcpy(assignmentPacket + numHeaderBytes, scriptURL.toLocal8Bit().constData(), scriptURLBytes); + memcpy(assignmentPacket + numSendHeaderBytes, scriptURL.toLocal8Bit().constData(), scriptURLBytes); // send the assignment serverSocket.send((sockaddr*) &senderSocket, assignmentPacket, numHeaderBytes + scriptURLBytes);