Changeset edfd1d0 in network-game

Timestamp:

Dec 25, 2012, 6:27:14 PM (12 years ago)

Author:

dportnoy <dmp1488@…>

Branches:

master

Children:

4c202e0

Parents:

baaf6c8

Message:

Moved the Player class to the common directory, added a position to Player, added a new message type for sending player info, and made the server broadcast player positions everytime it receives and replies to a message

Files:

• client/makefile (modified) (2 diffs)
• common/Common.cpp (added)
• common/Common.h (modified) (1 diff)
• common/Message.h (modified) (1 diff)
• common/Player.cpp (moved) (moved from server/Player.cpp ) (3 diffs)
• common/Player.h (moved) (moved from server/Player.h ) (2 diffs)
• server/DataAccess.h (modified) (1 diff)
• server/makefile (modified) (1 diff)
• server/server.cpp (modified) (5 diffs)

client/makefile

@@ -3 +3 @@
 FLAGS = $(LIB_FLAGS)
 COMMON_PATH = ../common
-DEPENDENCIES = Message.o chat.o GuiComponent.o Window.o Textbox.o Button.o
+DEPENDENCIES = Message.o Player.o chat.o GuiComponent.o Window.o Textbox.o Button.o
 
 gameClient : Client/main.cpp $(DEPENDENCIES)
@@ -9 +9 @@
 
 Message.o : $(COMMON_PATH)/Message.cpp
+        $(CC) -c -o $@ $? $(FLAGS)
+
+Player.o : $(COMMON_PATH)/Player.cpp
         $(CC) -c -o $@ $? $(FLAGS)
 

common/Common.h

@@ -2 +2 @@
 #define _COMMON_H
 
-void set_nonblock(int sock)
+#include <fcntl.h>
+#include <assert.h>
+
+void set_nonblock(int sock);
+
+typedef struct
 {
-   #ifdef WIN32
-      unsigned long mode = 1;
-      ioctlsocket(sock, FIONBIO, &mode);
-   #else
-      int flags;
-      flags = fcntl(sock, F_GETFL,0);
-      assert(flags != -1);
-      fcntl(sock, F_SETFL, flags | O_NONBLOCK);
-   #endif
-}
+   int x;
+   int y;
+} PLAYER_POS;
 
 #endif

common/Message.h

@@ -6 +6 @@
 #define MSG_TYPE_LOGOUT       3
 #define MSG_TYPE_CHAT         4
+#define MSG_TYPE_PLAYER       5
 
 typedef struct

common/Player.cpp

@@ -10 +10 @@
    this->name = name;
    this->password = password;
+   this->pos.x = 200;
+   this->pos.y = 200;
 
    cout << "Created new player: " << this->name << endl;
@@ -18 +20 @@
    this->name = name;
    this->password = "";
+   this->pos.x = 200;
+   this->pos.y = 200;
    this->addr = addr;
 
@@ -31 +35 @@
    this->addr = addr;
 }
+
+void Player::clearSensitiveInfo()
+{
+   this->password = "";
+   this->addr.sin_family = 0;
+   this->addr.sin_port = 0;
+   this->addr.sin_addr.s_addr = 0;
+}

common/Player.h

@@ -4 +4 @@
 #include <netinet/in.h>
 #include <string>
+
+#include "Common.h"
 
 using namespace std;
@@ -14 +16 @@
 
    void setAddr(sockaddr_in addr);
+   void clearSensitiveInfo();
 
    string name;
    string password;
    sockaddr_in addr;
+   PLAYER_POS pos;
 };
 

server/DataAccess.h

@@ -6 +6 @@
 #include <mysql/mysql.h>
 
-#include "Player.h"
+#include "../common/Player.h"
 
 using namespace std;

server/makefile

@@ -3 +3 @@
 FLAGS = $(LIB_FLAGS)
 COMMON_PATH = ../common
-DEPENDENCIES = Message.o Player.o DataAccess.o
+DEPENDENCIES = Common.o Message.o Player.o DataAccess.o
 
 server : server.cpp $(DEPENDENCIES)
         $(CC) -o $@ $+ $(FLAGS)
 
+Common.o : $(COMMON_PATH)/Common.cpp
+        $(CC) -c -o $@ $?
+
 Message.o : $(COMMON_PATH)/Message.cpp
+        $(CC) -c -o $@ $?
+
+Player.o : $(COMMON_PATH)/Player.cpp
         $(CC) -c -o $@ $?
 

server/server.cpp

@@ -7 +7 @@
 #include <vector>
 #include <algorithm>
-
-#include <fcntl.h>
-#include <assert.h>
+#include <cstring>
 
 #include <sys/socket.h>
@@ -16 +14 @@
 #include <arpa/inet.h>
 
+/*
 #include <openssl/bio.h>
 #include <openssl/ssl.h>
 #include <openssl/err.h>
+*/
 
 #include "../common/Compiler.h"
+#include "../common/Common.h"
 #include "../common/Message.h"
-#include "../common/Common.h"
-
-#include "Player.h"
+#include "../common/Player.h"
+
 #include "DataAccess.h"
 
@@ -63 +63 @@
 
    return NULL;
+}
+
+void broadcastPlayerPositions(vector<Player> &vec, int sock)
+{
+   vector<Player>::iterator it, it2;
+   NETWORK_MSG serverMsg;
+
+   serverMsg.type = MSG_TYPE_PLAYER;   
+
+   for (it = vec.begin(); it != vec.end(); it++)
+   {
+      strncpy(serverMsg.buffer, (char*)&*it, sizeof(Player));
+
+      for (it2 = vec.begin(); it2 != vec.end(); it2++)
+      {
+         if ( sendMessage(&serverMsg, sock, &(it2->addr)) < 0 )
+            error("sendMessage");
+      }
+   }
 }
 
@@ -73 +92 @@
    vector<Player> vctPlayers;
 
-   SSL_load_error_strings();
-   ERR_load_BIO_strings();
-   OpenSSL_add_all_algorithms();
+   //SSL_load_error_strings();
+   //ERR_load_BIO_strings();
+   //OpenSSL_add_all_algorithms();
 
    if (argc < 2) {
@@ -127 +146 @@
                error("sendMessage");
          }
-      }
-
+
+         broadcastPlayerPositions(vctPlayers, sock);
+      }
    }