Changeset 440

Timestamp:

Dec 9, 2007, 3:48:16 PM (16 years ago)

Author:

scheusso

Message:

added dummyserver3.cc (implements a chatserver, including main)

Location:

code/branches/FICN/src/network

Files:

• CMakeLists.txt (modified) (1 diff)
• Makefile.test (modified) (2 diffs)
• PacketDecoder.cc (modified) (8 diffs)
• PacketManager.h (modified) (4 diffs)
• Server.h (modified) (2 diffs)
• dummyserver3.cc (added)

code/branches/FICN/src/network/CMakeLists.txt

@@ -13 +13 @@
   Server.cc
   Synchronisable.cc
+  dummyserver3.cc
 )
 

code/branches/FICN/src/network/Makefile.test

@@ -31 +31 @@
 GameStateManager.o: GameStateManager.cc
         ${CC} -c GameStateManager.cc -g ${INC}
+ClientInformation.o: ClientInformation.cc
+        ${CC} -c ClientInformation.cc -g ${INC}
 
 clean:
@@ -39 +41 @@
 client: PacketGenerator.o ClientConnection.o PacketBuffer.o dummyclient2.cc 
         ${CC} dummyclient2.cc PacketGenerator.o PacketBuffer.o ClientConnection.o -o client -lenet -lboost_thread -g ${INC}
+
+chatserver: Server.o ConnectionManager.o PacketGenerator.o PacketDecoder.o PacketBuffer.o ClientInformation.o GameStateManager.o
+        ${CC} dummyserver3.cc Server.o ConnectionManager.o PacketGenerator.o PacketBuffer.o GameStateManager.o ClientInformation.o -o chatserver -lenet -lboost_thread -g ${INC}

code/branches/FICN/src/network/PacketDecoder.cc

@@ -25 +25 @@
         switch( id ) {
         case ACK:
-                acknowledgement( packet );
+                acknowledgement( packet, clientId );
                 return true;
                 break;
         case MOUSE:
-                mousem( packet );
+                mousem( packet, clientId );
                 return true;
                 break;
         case KEYBOARD:
-                keystrike( packet );
+                keystrike( packet, clientId );
                 return true;
                 break;
         case CHAT:
-                chatMessage( packet );
+                chatMessage( packet, clientId );
                 return true;
                 break;
@@ -54 +54 @@
 //following are the decode functions for the data of the packets
 
-void PacketDecoder::acknowledgement( ENetPacket* packet )
+void PacketDecoder::acknowledgement( ENetPacket* packet, int clientId )
 {
         ack* a = new ack;
@@ -65 +65 @@
 }
 
-void PacketDecoder::mousem( ENetPacket* packet )
+void PacketDecoder::mousem( ENetPacket* packet, int clientId )
 {
         mouse* mouseMove = new mouse;
@@ -77 +77 @@
 }
 
-void PacketDecoder::keystrike( ENetPacket* packet )
+void PacketDecoder::keystrike( ENetPacket* packet, int clientId )
 {
         keyboard* key = new keyboard;
@@ -89 +89 @@
 }
 
-void PacketDecoder::chatMessage( ENetPacket* packet )
+void PacketDecoder::chatMessage( ENetPacket* packet, int clientId )
 {
         chat* chatting = new chat;
@@ -104 +104 @@
         enet_packet_destroy( packet );
         
-        processChat( chatting ); //debug info
+        processChat( chatting, clientId ); //debug info
         
 }
@@ -148 +148 @@
 // now the data processing functions:
 
-void PacketDecoder::processChat( chat *data){
-  printChat(data);
+void PacketDecoder::processChat( chat *data, int clientId){
+  printChat(data, clientId);
 }
 
@@ -179 +179 @@
 }
 
-void PacketDecoder::printChat( chat* data )
-{
+void PacketDecoder::printChat( chat* data, int clientId )
+{
+  if(clientId!=CLIENTID_CLIENT)
+    cout << "client: " << clientId << endl;
         cout << "data id: " << data->id << endl;
         cout << "data:    " << data->message << endl;

code/branches/FICN/src/network/PacketManager.h

@@ -5 +5 @@
 #include <enet/enet.h>
 #include "PacketTypes.h"
+
+#define CLIENTID_CLIENT -1
 
 //enum netowk generaly used to set the type ID of a packet
@@ -27 +29 @@
         ENetPacket* mousem( double x, double y, int reliable = ENET_PACKET_FLAG_RELIABLE );
         ENetPacket* keystrike( char press, int reliable = ENET_PACKET_FLAG_RELIABLE );
-    ENetPacket* chatMessage( const char* message, int reliable = ENET_PACKET_FLAG_RELIABLE );
-    ENetPacket* gstate( GameStateCompressed *states, int reliable = ENET_PACKET_FLAG_RELIABLE );
-    ENetPacket* clid( int classid, std::string classname, int reliable = ENET_PACKET_FLAG_RELIABLE );
+  ENetPacket* chatMessage( const char* message, int reliable = ENET_PACKET_FLAG_RELIABLE );
+  ENetPacket* gstate( GameStateCompressed *states, int reliable = ENET_PACKET_FLAG_RELIABLE );
+  ENetPacket* clid( int classid, std::string classname, int reliable = ENET_PACKET_FLAG_RELIABLE );
 private:
 };
@@ -50 +52 @@
         
         
-    void acknowledgement( ENetPacket* packet );
-    void mousem( ENetPacket* packet );
-    void keystrike( ENetPacket* packet );
-    void chatMessage( ENetPacket* packet );
-    void gstate( ENetPacket* packet );
-    void clid( ENetPacket *packet);
+  void acknowledgement( ENetPacket* packet, int clientId = CLIENTID_CLIENT );
+  void mousem( ENetPacket* packet, int clientId = CLIENTID_CLIENT );
+  void keystrike( ENetPacket* packet, int clientId = CLIENTID_CLIENT );
+  void chatMessage( ENetPacket* packet, int clientId = CLIENTID_CLIENT);
+  void gstate( ENetPacket* packet );
+  void clid( ENetPacket *packet);
         
   //process data
   //two functions are note yet implemented!
   //virtual void processGamestate(GameState *state);
-  virtual void processChat( chat *data);
+  virtual void processChat( chat *data, int clientId);
   virtual void processClassid( classid *cid);
   //virtual void processAck( ack *data);
@@ -68 +70 @@
         void printMouse( mouse* data );
         void printKey( keyboard* data );
-        void printChat( chat* data );
+        void printChat( chat* data, int clientId );
         void printGamestate( GameStateCompressed *data );
-    void printClassid( classid *cid);
+  void printClassid( classid *cid);
 };
 }

code/branches/FICN/src/network/Server.h

@@ -38 +38 @@
     bool sendMSG(const char *msg);
     void tick();
+    protected:
+    void processQueue();
+    void updateGamestate();
     private:
     bool sendGameState();
@@ -44 +47 @@
     PacketGenerator packet_gen;
     
-    void processQueue();
-    void updateGamestate();
     ClientInformation *clients;
   };