Changeset 400

Timestamp:

Dec 5, 2007, 3:46:07 PM (16 years ago)

Author:

scheusso

Message:

CLient, Server

Location:

code/branches/FICN/src/network

Files:

• Client.cc (modified) (1 diff)
• Client.h (modified) (2 diffs)
• ConnectionManager.cc (modified) (2 diffs)
• ConnectionManager.h (modified) (2 diffs)
• PacketDecoder.cc (modified) (4 diffs)
• PacketGenerator.cc (modified) (1 diff)
• PacketManager.h (modified) (7 diffs)
• Server.cc (modified) (1 diff)

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

@@ -154 +154 @@
   }
   
+  void Client::processClassid(classid *clid){
+    
+    
+    
+  }
+  
 }

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

@@ -19 +19 @@
 #include "PacketManager.h"
 #include "GameStateManager.h"
+#include "orxonox/core/IdentifierIncludes.h"
 
 
@@ -56 +57 @@
   // implement data processing functions of PacketDecoder
   void processGamestate( GameState *data);
+  void processClassid(classid *clid);
+
 };
 

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

@@ -198 +198 @@
 
   bool ConnectionManager::addClient(ENetEvent *event){
+    int id=clientVector.size();
     clientVector.push_back((event->peer->address));
-    clientMap[event->peer->address]=clientVector.size()-1;
+    clientMap[event->peer->address]=id;
     peerMap[event->peer->address]=*(event->peer);
+    syncClassid(id);
     return true;
   }
@@ -216 +218 @@
   }
   
+  void ConnectionManager::syncClassid(int clientID){
+    int i=0;
+    std::string classname;
+    bool abort=false;
+    orxonox::Identifier *id;
+    while(!abort){
+      id = orxonox::ID(i);
+      if(id == NULL)
+        abort=true;
+      else{
+        classname = id->getName();
+        addPacket(packet_gen.clid( i, classname ),clientID);
+      }
+    }
+    sendPackets();
+  }
+  
 }

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

@@ -25 +25 @@
 #include "ConnectionManager.h"
 #include "PacketBuffer.h"
+#include "PacketManager.h"
+#include "orxonox/core/IdentifierIncludes.h"
 
 namespace std{
@@ -67 +69 @@
     int getClientID(ENetPeer peer);
     int getClientID(ENetAddress address);
+    void syncClassid(int clientID);
     ENetPeer getClientPeer(int clientID);
     PacketBuffer buffer;
+    PacketGenerator packet_gen;
     
     ENetHost *server;

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

@@ -44 +44 @@
                 return true;
                 break;
+          case CLASSID:
+                clid(packet);
+                return true;
+                break;
         }
         return false;
@@ -126 +130 @@
 }
 
+void PacketDecoder::clid( ENetPacket *packet)
+{
+        classid* cid = new classid;
+        cid->length = ((classid*)(packet->data))->length;
+        cid->id = ((classid *)(packet->data))->id;
+        cid->classid = ((classid *)(packet->data))->classid;
+        cid->message = (const char *)malloc(cid->length);
+        enet_packet_destroy( packet );
+        processClassid(&cid);
+}
+
+
 // now the data processing functions:
 
@@ -131 +147 @@
   printChat(data);
 }
+
+void PacketDecoder::processClassid( classid *cid){
+  printClassid(cid);
+  return;
+}
+
+
 
 //these are some print functions for test stuff
@@ -163 +186 @@
         cout << "size of gamestate: " << data->size << endl;
 }
+
+void PacketDecoder::printClassid( classid *cid)
+{
+        cout << "id of classid:    " << cid->id << endl;
+        cout << "size of classid:  " << cid->length << endl;
+        cout << "ID of classid:    " << cid->classid <<endl;
+        cout << "data of classid:  " << cid->message <<endl;
+}

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

@@ -86 +86 @@
         return packet;
 }
+
+ENetPacket* PacketGenerator::clid( int classid, std::string classname, int reliable ){
+        unsigned char* data = (unsigned char *)malloc(3*sizeof(int)+classname.length()+1);
+        *(int *)data = CLASSID;
+        *((int *)data+1) = classname.length()+1;
+        *((int *)data+2) = classid;
+        memcpy( (void *)(data+3*sizeof(int)), classname.c_str(), classname.length()+1);
+        ENetPacket *packet = enet_packet_create( data , 3*sizeof(int)+classname.length()+1, reliable );
+        return packet;
+}
+
+

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

@@ -2 +2 @@
 #define PACKETMANAGER_H_
 
+#include <string>
 #include <enet/enet.h>
 #include "GameStateManager.h"
@@ -13 +14 @@
         KEYBOARD,
         CHAT,
-        GAMESTATE
+        GAMESTATE ,
+        CLASSID
 };
 
@@ -32 +34 @@
         ENetPacket* chatMessage( const char* message, int reliable = ENET_PACKET_FLAG_RELIABLE );
         ENetPacket* gstate( GameState* states, int reliable = ENET_PACKET_FLAG_RELIABLE );
+        ENetPacket* clid( int classid, std::string classname, int reliable = ENET_PACKET_FLAG_RELIABLE );
 private:
         //used to set the bytes in the right order
@@ -85 +88 @@
                 const char* message;
         };
+        
+        struct classid{
+          int id;
+          int length;
+          int classid;
+          const char *message;
+        };
         
         void acknowledgement( ENetPacket* packet );
@@ -91 +101 @@
         void chatMessage( ENetPacket* packet );
         void gstate( ENetPacket* packet );
+        void clid( ENetPacket *packet);
         
   //process data
@@ -96 +107 @@
   //virtual void processGamestate(GameState *state);
   virtual void processChat( chat *data);
+  virtual void processClassid( classid *cid);
   //virtual void processAck( ack *data);
   
@@ -104 +116 @@
         void printChat( chat* data );
         void printGamestate( GameState* data );
+        void printClassid( classid *cid);
 };
 }

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

@@ -112 +112 @@
   }
   
+  
 }