Index: common/Common.cpp =================================================================== --- common/Common.cpp (revision b35b2b25df5c3c0e8e63e6f9c60d145b6996c085) +++ common/Common.cpp (revision d05086b35357b52ba3843d9c5195f9bd226aa3e7) @@ -1,5 +1,5 @@ #include "Common.h" -#include +#include #include @@ -7,18 +7,8 @@ #include #elif defined LINUX - #include + #include #endif using namespace std; - -/* -FLOAT_POSITION POSITION::toFloat() { - FLOAT_POSITION floatPosition; - floatPosition.x = x; - floatPosition.y = y; - - return floatPosition; -} -*/ void set_nonblock(int sock) @@ -51,4 +41,14 @@ } +string getCurrentDateTimeString() { + time_t millis = time(NULL); + struct tm *time = localtime(&millis); + + ostringstream timeString; + timeString << time->tm_hour << ":" << time->tm_min << ":"<< time->tm_sec << " " << (time->tm_mon+1) << "/" << time->tm_mday << "/" << (time->tm_year+1900); + + return timeString.str(); +} + float posDistance(FLOAT_POSITION pos1, FLOAT_POSITION pos2) { float xDiff = pos2.x - pos1.x; Index: common/Common.h =================================================================== --- common/Common.h (revision b35b2b25df5c3c0e8e63e6f9c60d145b6996c085) +++ common/Common.h (revision d05086b35357b52ba3843d9c5195f9bd226aa3e7) @@ -12,4 +12,8 @@ #endif +#include + +using namespace std; + typedef struct { @@ -22,5 +26,4 @@ int x; int y; - //FLOAT_POSITION toFloat(); FLOAT_POSITION toFloat() { FLOAT_POSITION floatPosition; @@ -34,4 +37,5 @@ void set_nonblock(int sock); unsigned long long getCurrentMillis(); +string getCurrentDateTimeString(); float posDistance(FLOAT_POSITION pos1, FLOAT_POSITION pos2); Index: common/MessageProcessor.cpp =================================================================== --- common/MessageProcessor.cpp (revision b35b2b25df5c3c0e8e63e6f9c60d145b6996c085) +++ common/MessageProcessor.cpp (revision d05086b35357b52ba3843d9c5195f9bd226aa3e7) @@ -2,4 +2,5 @@ #include +#include #include "Common.h" @@ -12,10 +13,12 @@ } -int MessageProcessor::sendMessage(NETWORK_MSG *msg, int sock, struct sockaddr_in *dest) { +int MessageProcessor::sendMessage(NETWORK_MSG *msg, int sock, struct sockaddr_in *dest, ofstream* outputLog) { cout << "Sending message of type " << msg->type << endl; msg->id = ++lastUsedId; MessageContainer message(*msg, *dest); - sentMessages[msg->id][dest->sin_addr.s_addr] = message; + + if (outputLog) + (*outputLog) << "Sending message (id " << msg->id << ") of type " << MessageContainer::getMsgTypeString(msg->type) << endl; sentMessages[msg->id][dest->sin_addr.s_addr] = message; @@ -26,5 +29,5 @@ } -int MessageProcessor::receiveMessage(NETWORK_MSG *msg, int sock, struct sockaddr_in *source) { +int MessageProcessor::receiveMessage(NETWORK_MSG *msg, int sock, struct sockaddr_in *source, ofstream* outputLog) { socklen_t socklen = sizeof(struct sockaddr_in); @@ -40,4 +43,6 @@ sentMessages[msg->id][source->sin_addr.s_addr].setAcked(true); sentMessages[msg->id][source->sin_addr.s_addr].setTimeAcked(getCurrentMillis()); + if (outputLog) + (*outputLog) << "Received ack for message id " << msg->id << endl; } @@ -49,6 +54,9 @@ isDuplicate = true; cout << "Got duplicate of type " << msg->type << endl; - }else + }else { cout << "Got message of type " << msg->type << endl; + if (outputLog) + (*outputLog) << "Received message (id " << msg->id << ") of type " << MessageContainer::getMsgTypeString(msg->type) << endl; + } ackedMessages[msg->id] = MessageContainer(*msg, *source); @@ -69,5 +77,5 @@ } -void MessageProcessor::resendUnackedMessages(int sock) { +void MessageProcessor::resendUnackedMessages(int sock, ofstream* outputLog) { map >::iterator it; map::iterator it2; @@ -84,5 +92,5 @@ } -void MessageProcessor::cleanAckedMessages() { +void MessageProcessor::cleanAckedMessages(ofstream* outputLog) { map >::iterator it = sentMessages.begin(); map::iterator it2; @@ -92,7 +100,9 @@ while (it2 != it->second.end()) { if (it2->second.getAcked()) { - if ((getCurrentMillis() - it2->second.getTimeAcked()) > 1000) + if ((getCurrentMillis() - it2->second.getTimeAcked()) > 1000) { + if (outputLog) + (*outputLog) << "Removing id " << it2->second.getMessage()->id << " from the acked record" << endl; it->second.erase(it2++); - else + }else it2++; }else Index: common/MessageProcessor.h =================================================================== --- common/MessageProcessor.h (revision b35b2b25df5c3c0e8e63e6f9c60d145b6996c085) +++ common/MessageProcessor.h (revision d05086b35357b52ba3843d9c5195f9bd226aa3e7) @@ -24,8 +24,8 @@ ~MessageProcessor(); - int sendMessage(NETWORK_MSG *msg, int sock, struct sockaddr_in *dest); - int receiveMessage(NETWORK_MSG *msg, int sock, struct sockaddr_in *dest); - void resendUnackedMessages(int sock); - void cleanAckedMessages(); + int sendMessage(NETWORK_MSG *msg, int sock, struct sockaddr_in *dest, ofstream* outputLog = NULL); + int receiveMessage(NETWORK_MSG *msg, int sock, struct sockaddr_in *dest, ofstream* outputLog = NULL); + void resendUnackedMessages(int sock, ofstream* outputLog = NULL); + void cleanAckedMessages(ofstream* outputLog = NULL); map >& getSentMessages(); Index: server/.gitignore =================================================================== --- server/.gitignore (revision b35b2b25df5c3c0e8e63e6f9c60d145b6996c085) +++ server/.gitignore (revision d05086b35357b52ba3843d9c5195f9bd226aa3e7) @@ -1,2 +1,3 @@ server *.o +*.log Index: server/server.cpp =================================================================== --- server/server.cpp (revision b35b2b25df5c3c0e8e63e6f9c60d145b6996c085) +++ server/server.cpp (revision d05086b35357b52ba3843d9c5195f9bd226aa3e7) @@ -5,4 +5,5 @@ #include #include +#include #include #include @@ -10,4 +11,6 @@ #include #include + +#include #include @@ -37,7 +40,9 @@ using namespace std; +bool done; + // from used to be const. Removed that so I could take a reference // and use it to send messages -bool processMessage(const NETWORK_MSG &clientMsg, struct sockaddr_in &from, MessageProcessor &msgProcessor, map& mapPlayers, WorldMap* gameMap, unsigned int& unusedPlayerId, NETWORK_MSG &serverMsg, int sock, int &scoreBlue, int &scoreRed); +bool processMessage(const NETWORK_MSG &clientMsg, struct sockaddr_in &from, MessageProcessor &msgProcessor, map& mapPlayers, WorldMap* gameMap, unsigned int& unusedPlayerId, NETWORK_MSG &serverMsg, int sock, int &scoreBlue, int &scoreRed, ofstream& outputLog); void updateUnusedPlayerId(unsigned int& id, map& mapPlayers); @@ -45,5 +50,5 @@ void damagePlayer(Player *p, int damage); -void addObjectToMap(WorldMap::ObjectType objectType, int x, int y, WorldMap* gameMap, map& mapPlayers, MessageProcessor &msgProcessor, int sock); +void addObjectToMap(WorldMap::ObjectType objectType, int x, int y, WorldMap* gameMap, map& mapPlayers, MessageProcessor &msgProcessor, int sock, ofstream& outputLog); // this should probably go somewhere in the common folder @@ -79,4 +84,8 @@ return NULL; +} + +void quit(int sig) { + done = true; } @@ -92,7 +101,12 @@ unsigned int unusedPlayerId = 1, unusedProjectileId = 1; int scoreBlue, scoreRed; + ofstream outputLog; + + done = false; scoreBlue = 0; scoreRed = 0; + + signal(SIGINT, quit); //SSL_load_error_strings(); @@ -104,4 +118,7 @@ exit(1); } + + outputLog.open("server.log", ios::app); + outputLog << "Started server on " << getCurrentDateTimeString() << endl; WorldMap* gameMap = WorldMap::loadMapFromFile("../data/map.txt"); @@ -138,5 +155,5 @@ timespec ts; int timeLastUpdated = 0, curTime = 0, timeLastBroadcast = 0; - while (true) { + while (!done) { usleep(5000); @@ -150,6 +167,6 @@ timeLastUpdated = curTime; - msgProcessor.cleanAckedMessages(); - msgProcessor.resendUnackedMessages(sock); + msgProcessor.cleanAckedMessages(&outputLog); + msgProcessor.resendUnackedMessages(sock, &outputLog); map::iterator it; @@ -191,5 +208,5 @@ for (it2 = mapPlayers.begin(); it2 != mapPlayers.end(); it2++) { - if ( msgProcessor.sendMessage(&serverMsg, sock, &(it2->second.addr)) < 0 ) + if ( msgProcessor.sendMessage(&serverMsg, sock, &(it2->second.addr), &outputLog) < 0 ) error("sendMessage"); } @@ -206,5 +223,5 @@ for (it2 = mapPlayers.begin(); it2 != mapPlayers.end(); it2++) { - if ( msgProcessor.sendMessage(&serverMsg, sock, &(it2->second.addr)) < 0 ) + if ( msgProcessor.sendMessage(&serverMsg, sock, &(it2->second.addr), &outputLog) < 0 ) error("sendMessage"); } @@ -319,5 +336,5 @@ for (it2 = mapPlayers.begin(); it2 != mapPlayers.end(); it2++) { - if ( msgProcessor.sendMessage(&serverMsg, sock, &(it2->second.addr)) < 0 ) + if ( msgProcessor.sendMessage(&serverMsg, sock, &(it2->second.addr), &outputLog) < 0 ) error("sendMessage"); } @@ -329,5 +346,5 @@ for (it2 = mapPlayers.begin(); it2 != mapPlayers.end(); it2++) { - if ( msgProcessor.sendMessage(&serverMsg, sock, &(it2->second.addr)) < 0 ) + if ( msgProcessor.sendMessage(&serverMsg, sock, &(it2->second.addr), &outputLog) < 0 ) error("sendMessage"); } @@ -370,5 +387,5 @@ for (it2 = mapPlayers.begin(); it2 != mapPlayers.end(); it2++) { - if ( msgProcessor.sendMessage(&serverMsg, sock, &(it2->second.addr)) < 0 ) + if ( msgProcessor.sendMessage(&serverMsg, sock, &(it2->second.addr), &outputLog) < 0 ) error("sendMessage"); } @@ -383,5 +400,5 @@ for (it2 = mapPlayers.begin(); it2 != mapPlayers.end(); it2++) { - if ( msgProcessor.sendMessage(&serverMsg, sock, &(it2->second.addr)) < 0 ) + if ( msgProcessor.sendMessage(&serverMsg, sock, &(it2->second.addr), &outputLog) < 0 ) error("sendMessage"); } @@ -404,5 +421,5 @@ for (it2 = mapPlayers.begin(); it2 != mapPlayers.end(); it2++) { - if ( msgProcessor.sendMessage(&serverMsg, sock, &(it2->second.addr)) < 0 ) + if ( msgProcessor.sendMessage(&serverMsg, sock, &(it2->second.addr), &outputLog) < 0 ) error("sendMessage"); } @@ -422,5 +439,5 @@ if (flagType != WorldMap::OBJECT_NONE) { - addObjectToMap(flagType, target->pos.x, target->pos.y, gameMap, mapPlayers, msgProcessor, sock); + addObjectToMap(flagType, target->pos.x, target->pos.y, gameMap, mapPlayers, msgProcessor, sock, outputLog); } } @@ -452,5 +469,5 @@ for (it2 = mapPlayers.begin(); it2 != mapPlayers.end(); it2++) { - if (msgProcessor.sendMessage(&serverMsg, sock, &(it2->second.addr)) < 0 ) + if (msgProcessor.sendMessage(&serverMsg, sock, &(it2->second.addr), &outputLog) < 0 ) error("sendMessage"); } @@ -474,5 +491,5 @@ for (it2 = mapPlayers.begin(); it2 != mapPlayers.end(); it2++) { - if ( msgProcessor.sendMessage(&serverMsg, sock, &(it2->second.addr)) < 0 ) + if ( msgProcessor.sendMessage(&serverMsg, sock, &(it2->second.addr), &outputLog) < 0 ) error("sendMessage"); } @@ -492,5 +509,5 @@ if (flagType != WorldMap::OBJECT_NONE) { - addObjectToMap(flagType, target->pos.x, target->pos.y, gameMap, mapPlayers, msgProcessor, sock); + addObjectToMap(flagType, target->pos.x, target->pos.y, gameMap, mapPlayers, msgProcessor, sock, outputLog); } } @@ -502,5 +519,5 @@ for (it2 = mapPlayers.begin(); it2 != mapPlayers.end(); it2++) { - if ( msgProcessor.sendMessage(&serverMsg, sock, &(it2->second.addr)) < 0 ) + if ( msgProcessor.sendMessage(&serverMsg, sock, &(it2->second.addr), &outputLog) < 0 ) error("sendMessage"); } @@ -510,8 +527,8 @@ } - n = msgProcessor.receiveMessage(&clientMsg, sock, &from); + n = msgProcessor.receiveMessage(&clientMsg, sock, &from, &outputLog); if (n >= 0) { - broadcastResponse = processMessage(clientMsg, from, msgProcessor, mapPlayers, gameMap, unusedPlayerId, serverMsg, sock, scoreBlue, scoreRed); + broadcastResponse = processMessage(clientMsg, from, msgProcessor, mapPlayers, gameMap, unusedPlayerId, serverMsg, sock, scoreBlue, scoreRed, outputLog); if (broadcastResponse) @@ -523,5 +540,5 @@ { cout << "Sent message back to " << it->second.name << endl; - if ( msgProcessor.sendMessage(&serverMsg, sock, &(it->second.addr)) < 0 ) + if ( msgProcessor.sendMessage(&serverMsg, sock, &(it->second.addr), &outputLog) < 0 ) error("sendMessage"); } @@ -531,14 +548,17 @@ cout << "Should be sending back the message" << endl; - if ( msgProcessor.sendMessage(&serverMsg, sock, &from) < 0 ) + if ( msgProcessor.sendMessage(&serverMsg, sock, &from, &outputLog) < 0 ) error("sendMessage"); } } } + + outputLog << "Stopped server on " << getCurrentDateTimeString() << endl; + outputLog.close(); return 0; } -bool processMessage(const NETWORK_MSG &clientMsg, struct sockaddr_in &from, MessageProcessor &msgProcessor, map& mapPlayers, WorldMap* gameMap, unsigned int& unusedPlayerId, NETWORK_MSG &serverMsg, int sock, int &scoreBlue, int &scoreRed) +bool processMessage(const NETWORK_MSG &clientMsg, struct sockaddr_in &from, MessageProcessor &msgProcessor, map& mapPlayers, WorldMap* gameMap, unsigned int& unusedPlayerId, NETWORK_MSG &serverMsg, int sock, int &scoreBlue, int &scoreRed, ofstream& outputLog) { DataAccess da; @@ -630,5 +650,5 @@ cout << "sending info about " << it->second.name << endl; cout << "sending id " << it->second.id << endl; - if ( msgProcessor.sendMessage(&serverMsg, sock, &from) < 0 ) + if ( msgProcessor.sendMessage(&serverMsg, sock, &from, &outputLog) < 0 ) error("sendMessage"); } @@ -643,5 +663,5 @@ itObjects->serialize(serverMsg.buffer); cout << "sending item id " << itObjects->id << endl; - if ( msgProcessor.sendMessage(&serverMsg, sock, &from) < 0 ) + if ( msgProcessor.sendMessage(&serverMsg, sock, &from, &outputLog) < 0 ) error("sendMessage"); } @@ -651,5 +671,5 @@ memcpy(serverMsg.buffer, &scoreBlue, 4); memcpy(serverMsg.buffer+4, &scoreRed, 4); - if ( msgProcessor.sendMessage(&serverMsg, sock, &from) < 0 ) + if ( msgProcessor.sendMessage(&serverMsg, sock, &from, &outputLog) < 0 ) error("sendMessage"); @@ -661,5 +681,5 @@ { cout << "Sent message back to " << it->second.name << endl; - if ( msgProcessor.sendMessage(&serverMsg, sock, &(it->second.addr)) < 0 ) + if ( msgProcessor.sendMessage(&serverMsg, sock, &(it->second.addr), &outputLog) < 0 ) error("sendMessage"); } @@ -701,5 +721,5 @@ if (flagType != WorldMap::OBJECT_NONE) { - addObjectToMap(flagType, p->pos.x, p->pos.y, gameMap, mapPlayers, msgProcessor, sock); + addObjectToMap(flagType, p->pos.x, p->pos.y, gameMap, mapPlayers, msgProcessor, sock, outputLog); } } @@ -826,5 +846,5 @@ for (it = mapPlayers.begin(); it != mapPlayers.end(); it++) { - if ( msgProcessor.sendMessage(&serverMsg, sock, &(it->second.addr)) < 0 ) + if ( msgProcessor.sendMessage(&serverMsg, sock, &(it->second.addr), &outputLog) < 0 ) error("sendMessage"); } @@ -862,5 +882,5 @@ flagType = WorldMap::OBJECT_RED_FLAG; - addObjectToMap(flagType, mapPlayers[id].pos.x, mapPlayers[id].pos.y, gameMap, mapPlayers, msgProcessor, sock); + addObjectToMap(flagType, mapPlayers[id].pos.x, mapPlayers[id].pos.y, gameMap, mapPlayers, msgProcessor, sock, outputLog); mapPlayers[id].hasBlueFlag = false; @@ -942,5 +962,5 @@ } -void addObjectToMap(WorldMap::ObjectType objectType, int x, int y, WorldMap* gameMap, map& mapPlayers, MessageProcessor &msgProcessor, int sock) { +void addObjectToMap(WorldMap::ObjectType objectType, int x, int y, WorldMap* gameMap, map& mapPlayers, MessageProcessor &msgProcessor, int sock, ofstream& outputLog) { NETWORK_MSG serverMsg; @@ -954,5 +974,5 @@ for (it = mapPlayers.begin(); it != mapPlayers.end(); it++) { - if ( msgProcessor.sendMessage(&serverMsg, sock, &(it->second.addr)) < 0 ) + if ( msgProcessor.sendMessage(&serverMsg, sock, &(it->second.addr), &outputLog) < 0 ) error("sendMessage"); }