Changeset ca44f82 in network-game for server

Timestamp:

Feb 24, 2013, 1:28:32 AM (12 years ago)

Author:

dportnoy <dmp1488@…>

Branches:

master

Children:

7b43385

Parents:

3a79253 (diff), 8f85180 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Updated files to correctly compile on Windows

Location:

server

Files:

• DataAccess.cpp (modified) (5 diffs)
• DataAccess.h (modified) (2 diffs)
• crypt.cpp (deleted)
• crypt.h (deleted)
• database.cpp (deleted)
• database.h (deleted)
• makefile (modified) (2 diffs)
• server.cpp (modified) (18 diffs)

server/DataAccess.cpp

@@ -3 +3 @@
 #include <iostream>
 #include <sstream>
+#include <cstdlib>
 
 using namespace std;
@@ -27 +28 @@
    ostringstream oss;
 
-   oss << "'" << username << "', '" << password << "'";
+   string salt = "$1$";
+   int random;
+   char chr;
+   for(int i=0; i<8; i++)
+   {
+      random = rand() % 62;
+      if (random < 26)
+         chr = (char)('a'+random);
+      else if (random < 52)
+         chr = (char)('A'+random-26);
+      else
+         chr = (char)('0'+random-52);
+      salt += chr;
+   }
+   salt += '$';
+
+   string encrypted(crypt(password.c_str(), salt.c_str()));
+
+   oss << "'" << username << "', '" << encrypted << "'";
 
    return insert("users", "name, password", oss.str());
+}
+
+int DataAccess::updatePlayer(string username, string password)
+{
+   ostringstream values, where;
+
+   values << "password='" << password << "'";
+   
+   where << "name='" << username << "'";
+
+   return update("users", values.str(), where.str());
 }
 
@@ -51 +81 @@
    }
 
-   if ( ( row = mysql_fetch_row(result)) != NULL )
+   if ( ( row = mysql_fetch_row(result)) != NULL ) {
+      cout << "Creating a new player" << endl;
       p = new Player(string(row[1]), string(row[2]));
-   else {
+   }else {
       cout << "Returned no results for some reason" << endl;
       p = NULL;
@@ -63 +94 @@
 }
 
-int DataAccess::printPlayers()
+// need to make sure this list is freed
+// since we need to create a DataAccess class
+// when calling these functions,
+// we could free this list in the destructor
+list<Player*>* DataAccess::getPlayers()
 {
    MYSQL_RES *result;
@@ -73 +108 @@
    if (result == NULL) {
       cout << mysql_error(connection) << endl;
-      return 1;
+      return NULL;
    }
 
+   list<Player*>* lstPlayers = new list<Player*>();
    while ( ( row = mysql_fetch_row(result)) != NULL ) {
       cout << row[0] << ", " << row[1] << ", " << row[2] << endl;
+      lstPlayers->push_back(new Player(row[1], row[2]));
    }
 
    mysql_free_result(result);
 
-   return 0;
+   return lstPlayers;
 }
 
-int DataAccess::insert(string table, string rows, string values)
+bool DataAccess::verifyPassword(string password, string encrypted)
+{
+   string test(crypt(password.c_str(), encrypted.c_str()));
+
+   return encrypted.compare(test) == 0;
+}
+
+int DataAccess::insert(string table, string columns, string values)
 {
    int query_state;
    ostringstream oss;
 
-   oss << "INSERT into " << table << " (" << rows << ") VALUES (" << values << ")";
+   oss << "INSERT into " << table << " (" << columns << ") VALUES (" << values << ")";
+   cout << "query: " << oss.str() << endl;
+
+   query_state = mysql_query(connection, oss.str().c_str());
+
+   if (query_state != 0) {
+      cout << mysql_error(connection) << endl;
+      return 1;
+   }
+
+   return 0;
+}
+
+int DataAccess::update(string table, string values, string where)
+{
+   int query_state;
+   ostringstream oss;
+
+   oss << "UPDATE " << table << " SET " << values << " WHERE " << where;
    cout << "query: " << oss.str() << endl;
 

server/DataAccess.h

@@ -3 +3 @@
 
 #include <string>
+#include <list>
 
 #include <mysql/mysql.h>
@@ -16 +17 @@
 
    int insertPlayer(string username, string password);
+   int updatePlayer(string username, string password);
 
-   Player *getPlayer(string username);
-   int printPlayers();
+   Player* getPlayer(string username);
+   list<Player*>* getPlayers();
+   bool verifyPassword(string encrypted, string password);
 
    int insert(string table, string rows, string values);
+   int update(string table, string values, string where);
    MYSQL_RES *select(string table, string filter);
 

server/makefile

@@ -1 +1 @@
 CC = g++
-LIB_FLAGS = -lssl -lmysqlclient
+LIB_FLAGS = -lssl -lmysqlclient -lcrypt -lrt
 FLAGS = $(LIB_FLAGS)
 COMMON_PATH = ../common
-DEPENDENCIES = Common.o Message.o Player.o DataAccess.o
+DEPENDENCIES = Common.o Message.o Player.o WorldMap.o DataAccess.o
 
 server : server.cpp $(DEPENDENCIES)
@@ -17 +17 @@
         $(CC) -c -o $@ $?
 
+WorldMap.o : $(COMMON_PATH)/WorldMap.cpp
+        $(CC) -c -o $@ $?
+
 %.o : %.cpp
         $(CC) -c -o $@ $?

server/server.cpp

@@ -6 +6 @@
 #include <sstream>
 #include <cstring>
+#include <cmath>
 
 #include <vector>
@@ -14 +15 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
+
+#include <crypt.h>
 
 /*
@@ -24 +27 @@
 #include "../common/Common.h"
 #include "../common/Message.h"
+#include "../common/WorldMap.h"
 #include "../common/Player.h"
 
@@ -30 +34 @@
 using namespace std;
 
-bool processMessage(const NETWORK_MSG &clientMsg, const struct sockaddr_in &from, map<unsigned int, Player>& mapPlayers, unsigned int& unusedId, NETWORK_MSG &serverMsg);
-
-void updateUnusedId(unsigned int& id);
+bool processMessage(const NETWORK_MSG &clientMsg, const struct sockaddr_in &from, map<unsigned int, Player>& mapPlayers, WorldMap* gameMap, unsigned int& unusedId, NETWORK_MSG &serverMsg);
+
+void updateUnusedId(unsigned int& id, map<unsigned int, Player>& mapPlayers);
 
 // this should probably go somewhere in the common folder
@@ -94 +98 @@
    NETWORK_MSG clientMsg, serverMsg;
    map<unsigned int, Player> mapPlayers;
-   unsigned int unusedId = 0;
+   unsigned int unusedId = 1;
 
    //SSL_load_error_strings();
@@ -104 +108 @@
       exit(1);
    }
+
+   WorldMap* gameMap = NULL; //WorldMap::createDefaultMap();
  
    sock = socket(AF_INET, SOCK_DGRAM, 0);
@@ -127 +133 @@
          cout << "Got a message" << endl;
 
-         broadcastResponse = processMessage(clientMsg, from, mapPlayers, unusedId, serverMsg);
-
+         broadcastResponse = processMessage(clientMsg, from, mapPlayers, gameMap, unusedId, serverMsg);
+
+         // probably replace this with a function that prints based on the
+         // message type
          cout << "msg: " << serverMsg.buffer << endl;
-
+         cout << "broadcastResponse: " << broadcastResponse << endl;
          if (broadcastResponse)
          {
@@ -136 +144 @@
 
             map<unsigned int, Player>::iterator it;
-
             for (it = mapPlayers.begin(); it != mapPlayers.end(); it++)
             {
@@ -151 +158 @@
          }
 
+         // update player positions
+         map<unsigned int, Player>::iterator it;
+         for (it = mapPlayers.begin(); it != mapPlayers.end(); it++)
+         {
+            it->second.move();
+         }
+
          broadcastPlayerPositions(mapPlayers, sock);
       }
@@ -158 +172 @@
 }
 
-bool processMessage(const NETWORK_MSG& clientMsg, const struct sockaddr_in& from, map<unsigned int, Player>& mapPlayers, unsigned int& unusedId, NETWORK_MSG& serverMsg)
+bool processMessage(const NETWORK_MSG& clientMsg, const struct sockaddr_in& from, map<unsigned int, Player>& mapPlayers, WorldMap* gameMap, unsigned int& unusedId, NETWORK_MSG& serverMsg)
 {
    DataAccess da;
@@ -195 +209 @@
       case MSG_TYPE_LOGIN:
       {
+         cout << "Got login message" << endl;
+
          string username(clientMsg.buffer);
          string password(strchr(clientMsg.buffer, '\0')+1);
-         cout << "Player logging in: " << username << endl;
 
          Player* p = da.getPlayer(username);
 
-         if (p == NULL || p->password != password)
+         if (p == NULL || !da.verifyPassword(password, p->password))
          {
             strcpy(serverMsg.buffer, "Incorrect username or password");
@@ -212 +227 @@
          {
             p->setAddr(from);
+            updateUnusedId(unusedId, mapPlayers);
             p->id = unusedId;
             mapPlayers[unusedId] = *p;
-            updateUnusedId(unusedId);
-
-            strcpy(serverMsg.buffer, "Login successful. Enjoy chatting with other players.");
+
+            // sendd back the new player info to the user
+            p->serialize(serverMsg.buffer);
          }
 
@@ -235 +251 @@
          {
             strcpy(serverMsg.buffer, "That player is not logged in. This is either a bug, or you're trying to hack the server.");
+            cout << "Player not logged in" << endl;
          }
          else if ( p->addr.sin_addr.s_addr != from.sin_addr.s_addr ||
@@ -240 +257 @@
          {
             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.");
+            cout << "Player logged in using a different connection" << endl;
          }
          else
@@ -247 +265 @@
             mapPlayers.erase(p->id);
             strcpy(serverMsg.buffer, "You have successfully logged out.");
-         }
+            cout << "Player logged out successfuly" << endl;
+         }
+
+         // should really be serverMsg.type = MSG_TYPE_LOGOUT;
+         serverMsg.type = MSG_TYPE_LOGIN;
 
          break;
@@ -265 +287 @@
             broadcastResponse = true;
 
-            stringstream ss;
-            ss << p->name << ": " << clientMsg.buffer;
-
-            strcpy(serverMsg.buffer, ss.str().c_str());
+            ostringstream oss;
+            oss << p->name << ": " << clientMsg.buffer;
+
+            strcpy(serverMsg.buffer, oss.str().c_str());
          }      
 
@@ -275 +297 @@
          break;
       }
+      case MSG_TYPE_PLAYER_MOVE:
+      {
+         cout << "Got a move message" << endl;
+
+         istringstream iss;
+         iss.str(clientMsg.buffer);
+
+         cout << "PLAYER_MOVE" << endl;
+
+         int id, x, y;
+
+         memcpy(&id, clientMsg.buffer, 4);
+         memcpy(&x, clientMsg.buffer+4, 4);
+         memcpy(&y, clientMsg.buffer+8, 4);
+         
+         cout << "x: " << x << endl;
+         cout << "y: " << y << endl;
+         cout << "id: " << id << endl;
+
+         if ( mapPlayers[id].addr.sin_addr.s_addr == from.sin_addr.s_addr &&
+              mapPlayers[id].addr.sin_port == from.sin_port )
+         {
+            // we need to make sure the player can move here
+            if (0 <= x && x < 300 && 0 <= y && y < 300 &&
+               gameMap->getElement(x/25, y/25) == WorldMap::TERRAIN_GRASS)
+            {
+               // first we get the correct vector 
+               mapPlayers[id].target.x = x;
+               mapPlayers[id].target.y = y;
+               int xDiff = mapPlayers[id].target.x - mapPlayers[id].pos.x;
+               int yDiff = mapPlayers[id].target.y - mapPlayers[id].pos.y;
+               cout << "xDiff: " << xDiff << endl;               
+               cout << "yDiff: " << yDiff << endl;               
+
+               // then we get the correct angle
+               double angle = atan2(yDiff, xDiff);
+               cout << "angle: " << angle << endl;               
+
+               // finally we use the angle to determine
+               // how much the player moves
+               // the player will move 50 pixels in the correct direction
+               mapPlayers[id].pos.x += cos(angle)*50;
+               mapPlayers[id].pos.y += sin(angle)*50;
+               cout << "new x: " << mapPlayers[id].pos.x << endl;               
+               cout << "new y: " << mapPlayers[id].pos.y << endl;               
+
+               serverMsg.type = MSG_TYPE_PLAYER_MOVE;
+               
+               memcpy(serverMsg.buffer, &id, 4);
+               memcpy(serverMsg.buffer+4, &mapPlayers[id].pos.x, 4);
+               memcpy(serverMsg.buffer+8, &mapPlayers[id].pos.y, 4);
+               //memcpy(serverMsg.buffer, clientMsg.buffer, 12);
+
+               broadcastResponse = true;
+            }
+            else
+               cout << "Bad terrain detected" << endl;
+         }
+         else  // nned to send back a message indicating failure
+            cout << "Player id (" << id << ") doesn't match sender" << endl;
+
+         break;
+      }
       default:
       {
@@ -285 +370 @@
    }
 
+   cout << "Got to the end of the switch" << endl;
+
    return broadcastResponse;
 }
 
-void updateUnusedId(unsigned int& id)
-{
-   id = 5;
-}
+void updateUnusedId(unsigned int& id, map<unsigned int, Player>& mapPlayers)
+{
+   while (mapPlayers.find(id) != mapPlayers.end())
+      id++;
+}