Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 04:57:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

accept a script filename in the send assignment packet

Browse source
This commit is contained in:
Stephen Birarda 2013-08-05 16:16:16 -07:00
parent 7021d3c6a5
commit 1c32cd8a68
1 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
assignment-server/src/main.cpp
View file

@ -10,13 +10,17 @@
#include <fstream> #include <fstream>
#include <queue> #include <queue>
#include <QtCore/QString>
#include <PacketHeaders.h> #include <PacketHeaders.h>
#include <SharedUtil.h> #include <SharedUtil.h>
#include <UDPSocket.h> #include <UDPSocket.h>
const int MAX_PACKET_SIZE_BYTES = 1400; const int MAX_PACKET_SIZE_BYTES = 1400;
struct Assignment {}; struct Assignment {
QString scriptFilename;
};
int main(int argc, const char* argv[]) { int main(int argc, const char* argv[]) {
@ -35,13 +39,16 @@ int main(int argc, const char* argv[]) {
while (true) { while (true) {
if (serverSocket.receive((sockaddr*) &senderSocket, &senderData, &receivedBytes)) { if (serverSocket.receive((sockaddr*) &senderSocket, &senderData, &receivedBytes)) {
// int numHeaderBytes = numBytesForPacketHeader(senderData); int numHeaderBytes = numBytesForPacketHeader(senderData);
if (senderData[0] == PACKET_TYPE_REQUEST_ASSIGNMENT) { if (senderData[0] == PACKET_TYPE_REQUEST_ASSIGNMENT) {
// grab the FI assignment in the queue, if it exists // grab the FI assignment in the queue, if it exists
if (assignmentQueue.size() > 0) { if (assignmentQueue.size() > 0) {
// Assignment firstAssignment = assignmentQueue.front(); Assignment firstAssignment = assignmentQueue.front();
assignmentQueue.pop(); assignmentQueue.pop();
QString scriptURL = QString("http://base8-compute.s3.amazonaws.com/%1").arg(firstAssignment.scriptFilename);
memcpy(assignmentPacket + numHeaderBytes, scriptURL.toLocal8Bit().constData(), scriptURL.size());
// send the assignment // send the assignment
serverSocket.send((sockaddr*) &senderSocket, assignmentPacket, sizeof(assignmentPacket)); serverSocket.send((sockaddr*) &senderSocket, assignmentPacket, sizeof(assignmentPacket));
@ -49,6 +56,11 @@ int main(int argc, const char* argv[]) {
} else if (senderData[0] == PACKET_TYPE_SEND_ASSIGNMENT) { } else if (senderData[0] == PACKET_TYPE_SEND_ASSIGNMENT) {
Assignment newAssignment; Assignment newAssignment;
senderData[receivedBytes] = '\0';
newAssignment.scriptFilename = QString((const char*)senderData + numHeaderBytes);
qDebug() << "Added an assignment with script with filename" << newAssignment.scriptFilename << "\n";
// add this assignment to the queue // add this assignment to the queue
assignmentQueue.push(newAssignment); assignmentQueue.push(newAssignment);
} }