From 2804d286d53fb6929569cf4fa8e6bcf7e5d4c2f5 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Thu, 22 Aug 2013 11:52:59 -0700 Subject: [PATCH] send correctly sized packet for assignment --- assignment-server/src/main.cpp | 5 +++++ libraries/shared/src/Assignment.h | 1 + libraries/shared/src/NodeList.cpp | 6 +++--- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/assignment-server/src/main.cpp b/assignment-server/src/main.cpp index 244ffd53ee..c0ce97adbd 100644 --- a/assignment-server/src/main.cpp +++ b/assignment-server/src/main.cpp @@ -49,6 +49,11 @@ int main(int argc, const char* argv[]) { qDebug() << "Received assignment of type " << newAssignment.getType() << "\n"; + // for the puroposes of debugging before implementing a GUID system - only keep latest + if (assignmentQueue.size() > 0) { + assignmentQueue.pop(); + } + // add this assignment to the queue assignmentQueue.push(newAssignment); } diff --git a/libraries/shared/src/Assignment.h b/libraries/shared/src/Assignment.h index 0f7f930bb4..53b237d327 100644 --- a/libraries/shared/src/Assignment.h +++ b/libraries/shared/src/Assignment.h @@ -13,6 +13,7 @@ class Assignment { public: + enum Type { AudioMixer }; diff --git a/libraries/shared/src/NodeList.cpp b/libraries/shared/src/NodeList.cpp index ba3b80efd7..a3886124d0 100644 --- a/libraries/shared/src/NodeList.cpp +++ b/libraries/shared/src/NodeList.cpp @@ -13,6 +13,7 @@ #include +#include "Assignment.h" #include "NodeList.h" #include "NodeTypes.h" #include "PacketHeaders.h" @@ -377,10 +378,9 @@ void NodeList::requestAssignment() { void NodeList::sendAssignment(Assignment& assignment) { unsigned char assignmentPacket[MAX_PACKET_SIZE]; int numHeaderBytes = populateTypeAndVersion(assignmentPacket, PACKET_TYPE_SEND_ASSIGNMENT); - - qDebug() << "The socket IP is " << inet_ntoa(assignmentServerSocket.sin_addr); + *(assignmentPacket + numHeaderBytes) = assignment.getType(); - _nodeSocket.send((sockaddr*) &assignmentServerSocket, assignmentPacket, numHeaderBytes); + _nodeSocket.send((sockaddr*) &assignmentServerSocket, assignmentPacket, numHeaderBytes + sizeof(unsigned char)); } Node* NodeList::addOrUpdateNode(sockaddr* publicSocket, sockaddr* localSocket, char nodeType, uint16_t nodeId) {