Index: common/message.h =================================================================== --- common/message.h (revision 2318ffff1f3b22cd0e452eaff6c10a7e677b6c3a) +++ common/message.h (revision 8e540f4f076cccb0fd4d74b3fbb0902d34ce5444) @@ -1,3 +1,3 @@ -#ifndef _MESAGE_H +#ifndef _MESSAGE_H #define _MESSAGE_H Index: server/Player.cpp =================================================================== --- server/Player.cpp (revision 8e540f4f076cccb0fd4d74b3fbb0902d34ce5444) +++ server/Player.cpp (revision 8e540f4f076cccb0fd4d74b3fbb0902d34ce5444) @@ -0,0 +1,26 @@ +#include "Player.h" + +#include +#include + +using namespace std; + +Player::Player(string name, sockaddr_in addr) +{ + this->name = name; + this->addr = addr; + + cout << "Created new played: " << this->name << endl; +} + +Player::~Player() +{ +} + +// was meant for the find find function. Currently unused +bool Player::operator == (const Player &p) +{ + bool eq = addr.sin_addr.s_addr == p.addr.sin_addr.s_addr; + + return eq; +} Index: server/Player.h =================================================================== --- server/Player.h (revision 8e540f4f076cccb0fd4d74b3fbb0902d34ce5444) +++ server/Player.h (revision 8e540f4f076cccb0fd4d74b3fbb0902d34ce5444) @@ -0,0 +1,20 @@ +#ifndef _PLAYER_H +#define _PLAYER_H + +#include +#include + +using namespace std; + +class Player { +public: + Player(string name, sockaddr_in addr); + ~Player(); + + bool operator == (const Player &p); + + string name; + sockaddr_in addr; +}; + +#endif Index: server/makefile =================================================================== --- server/makefile (revision 2318ffff1f3b22cd0e452eaff6c10a7e677b6c3a) +++ server/makefile (revision 8e540f4f076cccb0fd4d74b3fbb0902d34ce5444) @@ -3,5 +3,5 @@ FLAGS = $(LIB_FLAGS) COMMON_PATH = ../common -DEPENDENCIES = message.o player.o +DEPENDENCIES = message.o Player.o server : server.cpp $(DEPENDENCIES) Index: rver/player.cpp =================================================================== --- server/player.cpp (revision 2318ffff1f3b22cd0e452eaff6c10a7e677b6c3a) +++ (revision ) @@ -1,26 +1,0 @@ -#include "player.h" - -#include -#include - -using namespace std; - -player::player(string name, sockaddr_in addr) -{ - this->name = name; - this->addr = addr; - - cout << "Created new played: " << this->name << endl; -} - -player::~player() -{ -} - -// was meant for the find find function. Currently unused -bool player::operator == (const player &p) -{ - bool eq = addr.sin_addr.s_addr == p.addr.sin_addr.s_addr; - - return eq; -} Index: rver/player.h =================================================================== --- server/player.h (revision 2318ffff1f3b22cd0e452eaff6c10a7e677b6c3a) +++ (revision ) @@ -1,20 +1,0 @@ -#ifndef _PLAYER_H -#define _PLAYER_H - -#include -#include - -using namespace std; - -class player { -public: - string name; - sockaddr_in addr; - - player(string name, sockaddr_in addr); - ~player(); - - bool operator == (const player &p); -}; - -#endif Index: server/server.cpp =================================================================== --- server/server.cpp (revision 2318ffff1f3b22cd0e452eaff6c10a7e677b6c3a) +++ server/server.cpp (revision 8e540f4f076cccb0fd4d74b3fbb0902d34ce5444) @@ -20,5 +20,5 @@ #include -#include "player.h" +#include "Player.h" #include "../common/message.h" @@ -42,4 +42,6 @@ using namespace std; +void processMessage(const NETWORK_MSG &clientMsg, const struct sockaddr_in &from, vector &vctPlayers, int &num, NETWORK_MSG &serverMsg); + // this should probably go somewhere in the common folder void error(const char *msg) @@ -49,7 +51,7 @@ } -player *findPlayerByName(vector &vec, string name) -{ - vector::iterator it; +Player *findPlayerByName(vector &vec, string name) +{ + vector::iterator it; for (it = vec.begin(); it != vec.end(); it++) @@ -64,7 +66,7 @@ // not sure if we actually need this function // when I made it, I thought we did -player *findPlayerByAddr(vector &vec, sockaddr_in &addr) -{ - vector::iterator it; +Player *findPlayerByAddr(vector &vec, const sockaddr_in &addr) +{ + vector::iterator it; for (it = vec.begin(); it != vec.end(); it++) @@ -84,5 +86,5 @@ struct sockaddr_in from; // holds the info on the connected client NETWORK_MSG clientMsg, serverMsg; - vector vctPlayers; + vector vctPlayers; srand(time(NULL)); @@ -115,97 +117,6 @@ if (n < 0) error("recieveMessage"); - cout << "ip address: " << inet_ntoa(from.sin_addr) << endl; - cout << "port: " << from.sin_port << endl; - cout << "MSG: type: " << clientMsg.type << endl; - cout << "MSG contents: " << clientMsg.buffer << endl; - - // Check that if an invalid message is sent, the client will corectly - // receive and display the response. Maybe make a special error msg type - switch(clientMsg.type) - { - case MSG_TYPE_LOGIN: - { - string name(clientMsg.buffer); - cout << "Player logging in: " << name << endl; - - player *p = findPlayerByName(vctPlayers, name); - - if (p == NULL) - { - vctPlayers.push_back(player(name, from)); - strcpy(serverMsg.buffer, "I'm thinking of a number between 1 and 1000. Guess what it is."); - } - else - { - strcpy(serverMsg.buffer, "Player has already logged in."); - } - - serverMsg.type = MSG_TYPE_LOGIN; - - break; - } - case MSG_TYPE_LOGOUT: - { - string name(clientMsg.buffer); - cout << "Player logging out: " << name << endl; - - player *p = findPlayerByName(vctPlayers, name); - - if (p == NULL) - { - strcpy(serverMsg.buffer, "That player is not logged in. This is either a bug, or you're trying to hack the server."); - } - else if( p->addr.sin_addr.s_addr != from.sin_addr.s_addr || - p->addr.sin_port != from.sin_port ) - { - strcpy(serverMsg.buffer, "That player is logged in using a differemt connection. This is either a bug, or you're trying to hack the server."); - } - else - { - vctPlayers.erase((vector::iterator)p); - strcpy(serverMsg.buffer, "You have successfully logged out. You may quit the game."); - } - - break; - } - case MSG_TYPE_CHAT: - { - player *p = findPlayerByAddr(vctPlayers, from); - - if (p == NULL) - { - strcpy(serverMsg.buffer, "No player is logged in using this connection. This is either a bug, or you're trying to hack the server."); - } - else - { - int guess = atoi(clientMsg.buffer); - - cout << "guess: " << guess << endl; - - if (guess < 1 || guess > 1000) { - strcpy(serverMsg.buffer, "You must guess a number between 1 and 1000"); - }else if(guess > num) - strcpy(serverMsg.buffer, "The number I'm thinking of is less than that."); - else if(guess < num) - strcpy(serverMsg.buffer, "The number I'm thinking of is greater than that."); - else if(guess == num) { - strcpy(serverMsg.buffer, "Congratulations! I will now think of a new number."); - num = (rand() % 1000) + 1; - } - } - - serverMsg.type = MSG_TYPE_CHAT; - - break; - } - default: - { - strcpy(serverMsg.buffer, "Server error occured. Report this please."); - - serverMsg.type = MSG_TYPE_CHAT; - - break; - } - } + + processMessage(clientMsg, from, vctPlayers, num, serverMsg); cout << "msg: " << serverMsg.buffer << endl; @@ -216,4 +127,115 @@ } return 0; +} + +void processMessage(const NETWORK_MSG &clientMsg, const struct sockaddr_in &from, vector &vctPlayers, int &num, NETWORK_MSG &serverMsg) +{ + cout << "ip address: " << inet_ntoa(from.sin_addr) << endl; + cout << "port: " << from.sin_port << endl; + cout << "MSG: type: " << clientMsg.type << endl; + cout << "MSG contents: " << clientMsg.buffer << endl; + + // Check that if an invalid message is sent, the client will correctly + // receive and display the response. Maybe make a special error msg type + switch(clientMsg.type) + { + case MSG_TYPE_REGISTER: + { + string username(clientMsg.buffer); + string password(strchr(clientMsg.buffer, '\0')+1); + + cout << "username: " << username << endl; + cout << "password: " << password << endl; + + strcpy(serverMsg.buffer, "Registration test"); + + serverMsg.type = MSG_TYPE_REGISTER; + + break; + } + case MSG_TYPE_LOGIN: + { + string username(clientMsg.buffer); + cout << "Player logging in: " << username << endl; + + Player *p = findPlayerByName(vctPlayers, username); + + if (p == NULL) + { + vctPlayers.push_back(Player(username, from)); + strcpy(serverMsg.buffer, "I'm thinking of a number between 1 and 1000. Guess what it is."); + } + else + { + strcpy(serverMsg.buffer, "Player has already logged in."); + } + + serverMsg.type = MSG_TYPE_LOGIN; + + break; + } + case MSG_TYPE_LOGOUT: + { + string name(clientMsg.buffer); + cout << "Player logging out: " << name << endl; + + Player *p = findPlayerByName(vctPlayers, name); + + if (p == NULL) + { + strcpy(serverMsg.buffer, "That player is not logged in. This is either a bug, or you're trying to hack the server."); + } + else if( p->addr.sin_addr.s_addr != from.sin_addr.s_addr || + p->addr.sin_port != from.sin_port ) + { + strcpy(serverMsg.buffer, "That player is logged in using a differemt connection. This is either a bug, or you're trying to hack the server."); + } + else + { + vctPlayers.erase((vector::iterator)p); + strcpy(serverMsg.buffer, "You have successfully logged out. You may quit the game."); + } + + break; + } + case MSG_TYPE_CHAT: + { + Player *p = findPlayerByAddr(vctPlayers, from); + + if (p == NULL) + { + strcpy(serverMsg.buffer, "No player is logged in using this connection. This is either a bug, or you're trying to hack the server."); + } + else + { + int guess = atoi(clientMsg.buffer); + + cout << "guess: " << guess << endl; + + if (guess < 1 || guess > 1000) { + strcpy(serverMsg.buffer, "You must guess a number between 1 and 1000"); + }else if(guess > num) + strcpy(serverMsg.buffer, "The number I'm thinking of is less than that."); + else if(guess < num) + strcpy(serverMsg.buffer, "The number I'm thinking of is greater than that."); + else if(guess == num) { + strcpy(serverMsg.buffer, "Congratulations! I will now think of a new number."); + num = (rand() % 1000) + 1; + } + } + + serverMsg.type = MSG_TYPE_CHAT; + + break; + } + default: + { + strcpy(serverMsg.buffer, "Server error occured. Report this please."); + + serverMsg.type = MSG_TYPE_CHAT; + + break; + } + } }