diff --git a/assignment-server/src/main.cpp b/assignment-server/src/main.cpp index b828b9749a..a878e644c0 100644 --- a/assignment-server/src/main.cpp +++ b/assignment-server/src/main.cpp @@ -48,10 +48,11 @@ int main(int argc, const char* argv[]) { assignmentQueue.pop(); QString scriptURL = QString("http://base8-compute.s3.amazonaws.com/%1").arg(firstAssignment.scriptFilename); - memcpy(assignmentPacket + numHeaderBytes, scriptURL.toLocal8Bit().constData(), scriptURL.size()); + int scriptURLBytes = scriptURL.size(); + memcpy(assignmentPacket + numHeaderBytes, scriptURL.toLocal8Bit().constData(), scriptURLBytes); // send the assignment - serverSocket.send((sockaddr*) &senderSocket, assignmentPacket, sizeof(assignmentPacket)); + serverSocket.send((sockaddr*) &senderSocket, assignmentPacket, numHeaderBytes + scriptURLBytes); } } else if (senderData[0] == PACKET_TYPE_SEND_ASSIGNMENT) { Assignment newAssignment; diff --git a/libraries/shared/src/Node.cpp b/libraries/shared/src/Node.cpp index 7aebb0c022..c91626d99d 100644 --- a/libraries/shared/src/Node.cpp +++ b/libraries/shared/src/Node.cpp @@ -94,6 +94,8 @@ const char* Node::getTypeName() const { return NODE_TYPE_NAME_AUDIO_INJECTOR; case NODE_TYPE_ANIMATION_SERVER: return NODE_TYPE_NAME_ANIMATION_SERVER; + case NODE_TYPE_UNASSIGNED: + return NODE_TYPE_NAME_UNASSIGNED; default: return NODE_TYPE_NAME_UNKNOWN; } diff --git a/libraries/shared/src/NodeTypes.h b/libraries/shared/src/NodeTypes.h index aa4ae51ec5..a9deebf333 100644 --- a/libraries/shared/src/NodeTypes.h +++ b/libraries/shared/src/NodeTypes.h @@ -24,5 +24,6 @@ const NODE_TYPE NODE_TYPE_AUDIO_MIXER = 'M'; const NODE_TYPE NODE_TYPE_AVATAR_MIXER = 'W'; const NODE_TYPE NODE_TYPE_AUDIO_INJECTOR = 'A'; const NODE_TYPE NODE_TYPE_ANIMATION_SERVER = 'a'; +const NODE_TYPE NODE_TYPE_UNASSIGNED = 1; #endif