Changeset 1705 for code/branches

Timestamp:

Sep 4, 2008, 9:45:05 PM (16 years ago)

Author:

scheusso

Message:

further changes

Location:

code/branches/network/src/network

Files:

• CMakeLists.txt (modified) (2 diffs)
• Client.cc (modified) (6 diffs)
• Client.h (modified) (5 diffs)
• ClientInformation.cc (modified) (1 diff)
• ClientInformation.h (modified) (1 diff)
• ConnectionManager.cc (modified) (14 diffs)
• ConnectionManager.h (modified) (5 diffs)
• GameStateManager.cc (deleted)
• GameStateManager.h (deleted)
• GamestateManager.cc (added)
• GamestateManager.h (added)
• Host.cc (modified) (1 diff)
• Host.h (modified) (4 diffs)
• NetworkPrereqs.h (modified) (1 diff)
• PacketDecoder.cc (deleted)
• PacketGenerator.cc (deleted)
• PacketManager.h (deleted)
• PacketTypes.h (deleted)
• Server.cc (modified) (16 diffs)
• Server.h (modified) (3 diffs)
• packet/Acknowledgement.cc (modified) (3 diffs)
• packet/Acknowledgement.h (modified) (1 diff)
• packet/Chat.cc (modified) (1 diff)
• packet/ClassID.cc (modified) (3 diffs)
• packet/ClassID.h (modified) (1 diff)
• packet/Gamestate.cc (modified) (8 diffs)
• packet/Gamestate.h (modified) (3 diffs)
• packet/Packet.cc (modified) (4 diffs)
• packet/Packet.h (modified) (2 diffs)
• packet/PacketContent.h (modified) (3 diffs)
• packet/Welcome.cc (added)
• packet/Welcome.h (added)

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

@@ -4 +4 @@
   ClientInformation.cc
   ConnectionManager.cc
-  GameStateManager.cc
-  GameStateClient.cc
+  GamestateManager.cc
+  GamestateClient.cc
+  GamestateHandler.cc
   PacketBuffer.cc
-  PacketDecoder.cc
-  PacketGenerator.cc
   Server.cc
   Synchronisable.cc
@@ -17 +16 @@
   packet/Acknowledgement.cc
   packet/Gamestate.cc
+  packet/Welcome.cc
   Host.cc
 )

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

@@ -45 +45 @@
 #include "core/ConsoleCommand.h"
 #include "packet/Packet.h"
+#include "packet/Acknowledgement.h"
 
 namespace network
@@ -127 +128 @@
     return p->send();
   }
+  
 
   /**
@@ -137 +139 @@
     if(!isConnected)
       return false;
-    return client_connection.addPacket(pck_gen.chatMessage( message.c_str() ));
+    packet::Packet p(new packet::Chat(message, clientID_));
+    return p.send();
       //return client_connection.sendPackets();
     // send packets
-    return false;
   }
 
@@ -150 +152 @@
     if(client_connection.isConnected() && isSynched_){
       COUT(4) << "popping partial gamestate: " << std::endl;
-      GameStateCompressed *gs = gamestate.popPartialGameState();
+      packet::Gamestate *gs = gamestate.getGamestate();
       if(gs){
         COUT(4) << "client tick: sending gs " << gs << std::endl;
-        ENetPacket *packet = pck_gen.gstate(gs);
-        if( packet == NULL || !client_connection.addPacket(packet))
+        packet::Packet p(gs);
+        if( !p.send() )
           COUT(3) << "Problem adding partial gamestate to queue" << std::endl;
         // now delete it to save memory
-        delete[] gs->data;
         delete gs;
       }
@@ -166 +167 @@
       event = client_connection.getEvent();
       COUT(5) << "tick packet size " << event->packet->dataLength << std::endl;
-      elaborate(event->packet, 0); // ================= i guess we got to change this .... (client_ID is always same = server)
+      packet::Packet packet(event->packet, event->peer);
+      assert(packet.getPacketContent()->process());
     }
-    int gameStateID = gamestate.processGameState();
+    int gameStateID = gamestate.processGamestates();
     if(gameStateID==GAMESTATEID_INITIAL)
       if(gameStateFailure_){
-        if(!client_connection.addPacket(pck_gen.acknowledgement(GAMESTATEID_INITIAL)))
+        packet::Packet packet(new packet::Acknowledgement(GAMESTATEID_INITIAL, 0));
+        if(!packet.send())
           COUT(3) << "could not (negatively) ack gamestate" << std::endl;
         else 
@@ -183 +186 @@
         isSynched_=true;
       gameStateFailure_=false;
-      if(!client_connection.addPacket(pck_gen.acknowledgement(gameStateID)))
+      packet::Packet packet(new packet::Acknowledgement(gameStateID, 0));
+      if(!packet.send())
         COUT(3) << "could not ack gamestate" << std::endl;
     }// otherwise we had no gamestate to load
     gamestate.cleanup();
-    /*if(!client_connection.sendPackets())
-      COUT(3) << "Problem sending packets to server" << std::endl;*/
     return;
   }
 
-  void Client::processGamestate( GameStateCompressed *data, int clientID){
-    COUT(5) << "received gamestate id: " << data->id << std::endl;
-    gamestate.addGameState(data);
-  }
-
-  void Client::processClassid(classid *clid){
-    orxonox::Identifier *id;
-    id=ID(std::string(clid->message));
-    if(id!=NULL)
-      id->setNetworkID(clid->clid);
-    COUT(4) << "Client: received and set network id: " << clid->clid << "; classname: " << clid->message << std::endl;
-    COUT(4) << "id(classid)->getName " << ID((unsigned int)clid->clid)->getName() << std::endl;
-    delete clid;
-    return;
-  }
-  
-  bool Client::ackGamestateID(int gamestateID, int clientID){
-    return true;
-    //TODO: maybe change this (not needed at the moment)
-  }
-
-//   void Client::processChat( chat *data, int clientId){
-//     COUT(1) << data->message << std::endl;
-//     delete[] data->message;
-//     delete data;
-//   }
-  
-  bool Client::processWelcome( welcome *w ){
-    COUT(4) << "processing welcome message" << std::endl;
-    clientID_ = w->clientID;
-    shipID_ = w->shipID;
-    delete w;
-    return true;
-  }
-
 }

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

@@ -49 +49 @@
 #include "packet/Chat.h"
 #include "ClientConnection.h"
-#include "PacketManager.h"
-#include "GameStateClient.h"
+#include "GamestateClient.h"
 //#include "NetworkFrameListener.h"
 
@@ -64 +63 @@
   *
   */
-  class _NetworkExport Client : PacketDecoder, public Host{
+  class _NetworkExport Client : public Host{
   public:
     Client();
@@ -81 +80 @@
     unsigned int shipID(){return shipID_;}
     int playerID(){return clientID_;}
-
+    static void setShipID( unsigned int shipID){ dynamic_cast<Client *>(instance_)->shipID_=shipID; }
+    static void setClientID( unsigned int clientID){ dynamic_cast<Client *>(instance_)->clientID_=clientID; }
+    
     void tick(float time);
 
@@ -87 +88 @@
     
     ClientConnection client_connection;
-    PacketGenerator pck_gen;
-    GameStateClient gamestate;
+    GamestateClient gamestate;
     bool isConnected;
     bool isSynched_;
@@ -95 +95 @@
     
     // implement data processing functions of PacketDecoder
-    void processGamestate( GameStateCompressed *data, int clientID);
-    void processClassid(classid *clid);
-    bool ackGamestateID(int gamestateID, int clientID);
 //     void processChat( chat *data, int clientId );
-    bool processWelcome( welcome *w );
     int clientID_;     // this is the id the server gave to us
     int shipID_;

code/branches/network/src/network/ClientInformation.cc

@@ -123 +123 @@
   }
 
-  bool ClientInformation::setGameStateID(int id){
+  bool ClientInformation::setGamestateID(int id){
     if(!this)
       return false;

code/branches/network/src/network/ClientInformation.h

@@ -70 +70 @@
     void setID(int clientID);
     bool setPeer(ENetPeer *peer);
-    bool setGameStateID(int id);
+    bool setGamestateID(int id);
     bool setPartialGamestateID(int id);
     inline void setShipID(unsigned int id){ShipID_=id;}

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

@@ -51 +51 @@
 #include "ConnectionManager.h"
 #include "Synchronisable.h"
+#include "packet/ClassID.h"
 
 namespace std
@@ -75 +76 @@
     bindAddress.port = NETWORK_PORT;
   }
-  boost::recursive_mutex ConnectionManager::enet_mutex_;
+  boost::recursive_mutex ConnectionManager::enet_mutex;
   
 //   ConnectionManager::ConnectionManager(ClientInformation *head) : receiverThread_(0) {
@@ -172 +173 @@
   
   bool ConnectionManager::addPacket(ENetPacket *packet, ENetPeer *peer) {
-    boost::recursive_mutex::scoped_lock lock(instance_->enet_mutex_);
+    boost::recursive_mutex::scoped_lock lock(instance_->enet_mutex);
     if(enet_peer_send(peer, NETWORK_DEFAULT_CHANNEL, packet)!=0)
       return false;
@@ -190 +191 @@
     if(!instance_)
       return false;
-    boost::recursive_mutex::scoped_lock lock(instance_->enet_mutex_);
+    boost::recursive_mutex::scoped_lock lock(instance_->enet_mutex);
     for(ClientInformation *i=ClientInformation::getBegin()->next(); i!=0; i=i->next()){
       COUT(3) << "adding broadcast packet for client: " << i->getID() << std::endl;
@@ -203 +204 @@
     if(server==NULL || !instance_)
       return false;
-    boost::recursive_mutex::scoped_lock lock(enet_mutex_);
+    boost::recursive_mutex::scoped_lock lock(enet_mutex);
     enet_host_flush(server);
     lock.unlock();
@@ -214 +215 @@
     atexit(enet_deinitialize);
     { //scope of the mutex
-      boost::recursive_mutex::scoped_lock lock(enet_mutex_);
+      boost::recursive_mutex::scoped_lock lock(enet_mutex);
       enet_initialize();
       server = enet_host_create(&bindAddress, NETWORK_MAX_CONNECTIONS, 0, 0);
@@ -228 +229 @@
     while(!quit){
       { //mutex scope
-        boost::recursive_mutex::scoped_lock lock(enet_mutex_);
+        boost::recursive_mutex::scoped_lock lock(enet_mutex);
         if(enet_host_service(server, event, NETWORK_WAIT_TIMEOUT)<0){
           // we should never reach this point
@@ -270 +271 @@
     // if we're finishied, destroy server
     {
-      boost::recursive_mutex::scoped_lock lock(enet_mutex_);
+      boost::recursive_mutex::scoped_lock lock(enet_mutex);
       enet_host_destroy(server);
       lock.unlock();
@@ -284 +285 @@
     while(temp!=0){
       {
-        boost::recursive_mutex::scoped_lock lock(enet_mutex_);
+        boost::recursive_mutex::scoped_lock lock(enet_mutex);
         enet_peer_disconnect(temp->getPeer(), 0);
         lock.unlock();
@@ -292 +293 @@
     //bugfix: might be the reason why server crashes when clients disconnects
     temp = ClientInformation::getBegin()->next();
-    boost::recursive_mutex::scoped_lock lock(enet_mutex_);
+    boost::recursive_mutex::scoped_lock lock(enet_mutex);
     while( temp!=0 && enet_host_service(server, &event, NETWORK_WAIT_TIMEOUT) >= 0){
       switch (event.type)
@@ -337 +338 @@
     std::string classname;
     orxonox::Identifier *id;
+    packet::Packet packet;
+    packet.setClientID(clientID);
+    packet::ClassID *classid;
     std::map<std::string, orxonox::Identifier*>::const_iterator it = orxonox::Factory::getFactoryBegin();
     while(it != orxonox::Factory::getFactoryEnd()){
@@ -348 +352 @@
       COUT(4) << "Con.Man:syncClassid:\tnetwork_id: " << network_id << ", classname: " << classname << std::endl;
 
-      while(!addPacket(packet_gen.clid( (int)network_id, classname ), clientID) && failures < 10){
+      classid = new packet::ClassID(network_id, classname);
+      packet.setPacketContent(classid);
+      while(!packet.send() && failures < 10){
         failures++;
       }
+      delete classid;
       ++it;
     }
+    packet.setPacketContent(0);
     //sendPackets();
     COUT(4) << "syncClassid:\tall synchClassID packets have been sent" << std::endl;
@@ -370 +378 @@
   }
   
-  bool ConnectionManager::sendWelcome(int clientID, int shipID, bool allowed){
-    if(addPacket(packet_gen.generateWelcome(clientID, shipID, allowed),clientID)){
-      //sendPackets();
-      return true;
-    }else
-      return false;
-  }
   
   void ConnectionManager::disconnectClient(ClientInformation *client){
     {
-      boost::recursive_mutex::scoped_lock lock(enet_mutex_);
+      boost::recursive_mutex::scoped_lock lock(enet_mutex);
       enet_peer_disconnect(client->getPeer(), 0);
       lock.unlock();
@@ -387 +388 @@
   }
   
-  bool ConnectionManager::addFakeConnectRequest(ENetEvent *ev){
-    ENetEvent event;
-    event.peer=ev->peer;
-    event.packet = packet_gen.generateConnectRequest();
-    return buffer.push(&event);
-  }
-  
-  
 
 }

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

@@ -51 +51 @@
 
 #include "PacketBuffer.h"
-#include "PacketManager.h"
 #include "packet/Packet.h"
 
@@ -73 +72 @@
 
   class ConnectionManager{
-  public:
+    public:
+    static boost::recursive_mutex enet_mutex;
     ConnectionManager();
     //ConnectionManager(ClientInformation *head);
@@ -95 +95 @@
     void disconnectClient(ClientInformation *client);
     void syncClassid(int clientID);
-    bool sendWelcome(int clientID, int shipID, bool allowed);
 
   private:
@@ -109 +108 @@
     //bool createShip(ClientInformation *client);
     bool removeShip(ClientInformation *client);
-    bool addFakeConnectRequest(ENetEvent *ev);
     PacketBuffer buffer;
-    PacketGenerator packet_gen;
 
     ENetHost *server;
@@ -119 +116 @@
 
     boost::thread *receiverThread_;
-    static boost::recursive_mutex enet_mutex_;
     static ConnectionManager *instance_;
 

code/branches/network/src/network/Host.cc

@@ -54 +54 @@
 }
 
-bool Host::ackGamestate(int gamestateID, int clientID){
-  return instance_->ackGamestateID(gamestateID, clientID);
-}
-
 }//namespace network

code/branches/network/src/network/Host.h

@@ -31 +31 @@
 #include <string>
 
+#include "NetworkPrereqs.h"
 #include "packet/Chat.h"
 
@@ -44 +45 @@
     virtual bool sendChat(packet::Chat *chat)=0;
     virtual bool queuePacket(ENetPacket *packet, int clientID)=0;
-    virtual bool ackGamestateID(int gamestateID, int clientID)=0;
     virtual unsigned int shipID()=0;
     virtual int playerID()=0;
     
-    static Host *instance_;
     
     
@@ -54 +53 @@
     Host();
     ~Host();
+    static Host *instance_;
     
   public:
@@ -62 +62 @@
     static int getPlayerID();
     static unsigned int getShipID();
-    static bool ackGamestate(int gamestateID, int clientID);
+    
+    // packet process functions
 };
 

code/branches/network/src/network/NetworkPrereqs.h

@@ -66 +66 @@
   class ClientInformation;
   class ConnectionManager;
-  class GameStateClient;
-  class GameStateManager;
+  class GamestateClient;
+  class GamestateManager;
+  class GamestateHandler;
   class PacketBuffer;
-  class PacketDecoder;
-  class PacketGenerator;
   class Server;
   class ServerFrameListener;
   class Synchronisable;
-  struct ack;
-  struct chat;
-  struct classid;
-  struct welcome;
-  struct connectRequest;
   struct ClientList;
-  struct GameState;
-  struct GameStateCompressed;
-  struct keyboard;
-  struct mouse;
   struct PacketEnvelope;
   struct QueueItem;
   struct syncData;
   struct synchronisableVariable;
+  namespace packet{
+    class Gamestate;
+    class Packet;
+    class PacketContent;
+    class Acknowledgement;
+    class ClassID;
+    class Welcome;
+  }
 }
 

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

@@ -45 +45 @@
 
 #include "ConnectionManager.h"
-#include "PacketTypes.h"
-#include "GameStateManager.h"
+#include "GamestateManager.h"
 #include "ClientInformation.h"
 #include "util/Sleep.h"
@@ -53 +52 @@
 #include "packet/Chat.h"
 #include "packet/Packet.h"
+#include "packet/Welcome.h"
 
 namespace network
@@ -65 +65 @@
   Server::Server() {
     timeSinceLastUpdate_=0;
-    packet_gen = PacketGenerator();
     connection = new ConnectionManager();
-    gamestates = new GameStateManager();
+    gamestates_ = new GamestateManager();
   }
   
   Server::Server(int port){
     timeSinceLastUpdate_=0;
-    packet_gen = PacketGenerator();
     connection = new ConnectionManager(port);
-    gamestates = new GameStateManager();
+    gamestates_ = new GamestateManager();
   }
 
@@ -84 +82 @@
   Server::Server(int port, std::string bindAddress) {
     timeSinceLastUpdate_=0;
-    packet_gen = PacketGenerator();
     connection = new ConnectionManager(port, bindAddress);
-    gamestates = new GameStateManager();
+    gamestates_ = new GamestateManager();
   }
 
@@ -96 +93 @@
   Server::Server(int port, const char *bindAddress) {
     timeSinceLastUpdate_=0;
-    packet_gen = PacketGenerator();
     connection = new ConnectionManager(port, bindAddress);
-    gamestates = new GameStateManager();
+    gamestates_ = new GamestateManager();
   }
 
@@ -173 +169 @@
       timeSinceLastUpdate_=(float)((int)(timeSinceLastUpdate_*NETWORK_FREQUENCY))/timeSinceLastUpdate_;
 //      timeSinceLastUpdate_-=1./NETWORK_FREQUENCY;
-      gamestates->processGameStates();
+      gamestates_->processGamestates();
       updateGamestate();
     }
@@ -191 +187 @@
   void Server::processQueue() {
     ENetEvent *event;
-    int clientID=-1;
     while(!connection->queueEmpty()){
       //std::cout << "Client " << clientID << " sent: " << std::endl;
@@ -209 +204 @@
         break;
       case ENET_EVENT_TYPE_RECEIVE:
-        if(ClientInformation::findClient(&event->peer->address)){
-          clientID = ClientInformation::findClient(&event->peer->address)->getID();
-          if( !elaborate(event->packet, clientID) ) 
-            COUT(3) << "Server: could not elaborate" << std::endl;
-        }
+        if(!processPacket(event->packet, event->peer))
+          COUT(3) << "processing incoming packet failed" << std::endl;
         break;
       default:
@@ -227 +219 @@
   */
   void Server::updateGamestate() {
-    gamestates->update();
+    gamestates_->update();
     COUT(5) << "Server: one gamestate update complete, goig to sendGameState" << std::endl;
     //std::cout << "updated gamestate, sending it" << std::endl;
@@ -236 +228 @@
   }
 
+  bool Server::processPacket( ENetPacket *packet, ENetPeer *peer ){
+    packet::Packet p = packet::Packet(packet, peer);
+    return p.getPacketContent()->process();
+  }
+  
   /**
   * sends the gamestate
@@ -257 +254 @@
       int cid = temp->getID(); //get client id
       COUT(5) << "Server: got acked (gamestate) ID from clientlist: " << gid << std::endl;
-      GameStateCompressed *gs = gamestates->popGameState(cid);
+      packet::Gamestate *gs = gamestates_->popGameState(cid);
       if(gs==NULL){
         COUT(2) << "Server: could not generate gamestate (NULL from compress)" << std::endl;
@@ -263 +260 @@
       }
       //std::cout << "adding gamestate" << std::endl;
-      ENetPacket *packet = packet_gen.gstate(gs);
-      if(!packet)
-        continue;
-      if ( !(connection->addPacket(packet, cid)) ){
+      packet::Packet packet(gs);
+      packet.setClientID(cid);
+      if ( !packet.send() ){
         COUT(3) << "Server: packet with client id (cid): " << cid << " not sended: " << temp->getFailures() << std::endl; 
         temp->addFailure();
@@ -277 +273 @@
       temp=temp->next();
       // now delete gamestate
-      delete[] gs->data;
       delete gs;
     }
@@ -286 +281 @@
     //COUT(5) << "Server: had no gamestates to send" << std::endl;
     return true;
-  }
-
-  void Server::processAck( ack *data, int clientID) {
-    COUT(4) << "Server: processing ack from client: " << clientID << "; ack-id: " << data->a << std::endl;
-    gamestates->ackGameState(clientID, data->a);
-    delete data;
-  }
-  
-  bool Server::processConnectRequest( connectRequest *con, int clientID ){
-    //(COUT(3) << "processing connectRequest " << std::endl;
-    //connection->addPacket(packet_gen.gstate(gamestates->popGameState(clientID)) , clientID);
-    //createClient(clientID);
-    delete con;
-    return true;
-  }
-  
-  bool Server::ackGamestateID(int gamestateID, int clientID){
-    gamestates->ackGameState(clientID, gamestateID);
-    return true;
-  }
-  
-  void Server::processGamestate( GameStateCompressed *data, int clientID){
-    COUT(4) << "processing partial gamestate from client " << clientID << std::endl;
-    gamestates->addGameState(data, clientID);
-        /*COUT(3) << "Could not push gamestate\t\t\t\t=====" << std::endl;
-    else
-      if(clients->findClient(clientID))
-        clients->findClient(clientID)->resetFailures();*/
   }
   
@@ -359 +326 @@
     temp->setSynched(true);
     COUT(3) << "sending welcome" << std::endl;
-    connection->sendWelcome(temp->getID(), temp->getShipID(), true);
+    packet::Packet packet(new packet::Welcome(temp->getID(), temp->getShipID()));
+    assert(packet.send());
     return true;
   }
@@ -421 +389 @@
   void Server::disconnectClient( ClientInformation *client){
     connection->disconnectClient(client);
-    gamestates->removeClient(client);
+    gamestates_->removeClient(client);
   }
   

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

@@ -47 +47 @@
 
 #include "Host.h"
-#include "PacketManager.h"
-
-
+#include "GamestateManager.h"
 
 namespace network
@@ -59 +57 @@
   * It implements all functions necessary for a Server
   */
-  class _NetworkExport Server : public PacketDecoder, public Host{
+  class _NetworkExport Server : public Host{
   public:
     Server();
@@ -85 +83 @@
     void disconnectClient(int clientID);
     void disconnectClient( ClientInformation *client);
+    bool processPacket( ENetPacket *packet, ENetPeer *peer );
     bool sendGameState();
-    void processAck( ack *data, int clientID);
-    bool processConnectRequest( connectRequest *con, int clientID );
-    void processGamestate( GameStateCompressed *data, int clientID);
     
-    bool ackGamestateID(int gamestateID, int clientID);
     
     //void processChat( chat *data, int clientId);
     ConnectionManager *connection;
-    GameStateManager *gamestates;
-    PacketGenerator packet_gen;
+    GamestateManager *gamestates_;
 
     

code/branches/network/src/network/packet/Acknowledgement.cc

@@ -2 +2 @@
 #include "Packet.h"
 #include "network/Host.h"
+#include "network/GamestateHandler.h"
 
 namespace network {
@@ -21 +22 @@
 
 Acknowledgement::Acknowledgement( unsigned char *data, int clientID )
-  : PacketContent(data)
+  : PacketContent(data, clientID)
 {
   clientID_=clientID;
@@ -39 +40 @@
 
 bool Acknowledgement::process(){
-  return Host::ackGamestate(data_[_ACKID], clientID_);
+  return GamestateHandler::ackGamestate(data_[_ACKID], clientID_);
 }
 

code/branches/network/src/network/packet/Acknowledgement.h

@@ -50 +50 @@
   unsigned int getAckID();
 private:
-  int clientID_;
 };
 

code/branches/network/src/network/packet/Chat.cc

@@ -23 +23 @@
 
 Chat::Chat( unsigned char *data, int clientID )
-  : PacketContent(data)
+  : PacketContent(data, clientID)
 {
   messageLength_ = *(unsigned int *)&data[ _MESSAGELENGTH ];
-  clientID_ = clientID;
 }
 

code/branches/network/src/network/packet/ClassID.cc

@@ -3 +3 @@
 #include "core/CoreIncludes.h"
 #include <string>
-
+#include <assert.h>
 
 namespace network {
@@ -19 +19 @@
   flags_ = flags_ | PACKET_FLAGS_CLASSID;
   classNameLength_=className.length()+1;
+  assert(getSize());
   data_=new unsigned char[ getSize() ];
   if(!data_)
@@ -28 +29 @@
 }
 
-ClassID::ClassID( unsigned char *data )
-  : PacketContent(data)
+ClassID::ClassID( unsigned char *data, int clientID )
+  : PacketContent(data, clientID)
 {
   memcpy( (void *)&classNameLength_, &data[ sizeof(ENUM::Type) + sizeof(int) ], sizeof(classNameLength_) );

code/branches/network/src/network/packet/ClassID.h

@@ -43 +43 @@
 public:
   ClassID( unsigned int classID, std::string className );
-  ClassID( unsigned char* data );
+  ClassID( unsigned char* data, int clientID );
   ~ClassID();
   

code/branches/network/src/network/packet/Gamestate.cc

@@ -1 +1 @@
 #include "Gamestate.h"
 #include "network/ClientInformation.h"
-
+#include "network/GamestateHandler.h"
 
 #include <zlib.h>
@@ -21 +21 @@
 }
 
-Gamestate::Gamestate(unsigned char *data, bool compressed):
-    PacketContent(data)
+Gamestate::Gamestate(unsigned char *data, bool compressed, int clientID):
+    PacketContent(data, clientID)
 {
   compressed_ = compressed;
@@ -133 +133 @@
 }
 
+int Gamestate::getID(){
+  return HEADER->id;
+}
+
 unsigned char *Gamestate::getData()
 {
@@ -146 +150 @@
   {
     return HEADER->normsize+sizeof(GamestateHeader);
-    //assert(bs_);
-    //return bs_->getSize();
   }
 }
@@ -153 +155 @@
 bool Gamestate::process()
 {
-  //FIXME: TODO: implement this function
-  return true;
+  return GamestateHandler::addGamestate(this, getClientID());
 }
 
@@ -182 +183 @@
   *GAMESTATE_HEADER(ndata) = *HEADER;
   //delete old data
-//  delete bs_;
   delete[] data_;
   //save new data
@@ -250 +250 @@
   }
 
-  Gamestate *g = new Gamestate(ndata, false);
+  Gamestate *g = new Gamestate(ndata, false, 0);
   return g;
 }
@@ -282 +282 @@
   }
   
-  Gamestate *g = new Gamestate(ndata, false);
+  Gamestate *g = new Gamestate(ndata, false, 0);
   return g;
 }

code/branches/network/src/network/packet/Gamestate.h

@@ -54 +54 @@
   public:
     Gamestate();
-    Gamestate(unsigned char *data, bool compressed);
+    Gamestate(unsigned char *data, bool compressed, int clientID);
     
     ~Gamestate();
@@ -60 +60 @@
     bool collectData(int id, int mode=0x0);
     bool spreadData(int mode=0x0);
+    int getID();
+    Gamestate *diff(Gamestate *base);
+    Gamestate *undiff(Gamestate *base);
+    bool compressData();
+    bool decompressData();
     
     // PacketContent functions
@@ -68 +73 @@
     
   private:
-    bool compressData();
-    bool decompressData();
-    Gamestate *diff(Gamestate *base);
-    Gamestate *undiff(Gamestate *base);
     unsigned int calcGamestateSize(int mode=0x0);
-    //unsigned char *getGs(){ return bs_->getData(); }
     void removeObject(orxonox::Iterator<Synchronisable> &it);
 

code/branches/network/src/network/packet/Packet.cc

@@ -10 +10 @@
 #include "ClassID.h"
 #include "network/Host.h"
-//#include "Gamestate.h"
+#include "core/CoreIncludes.h"
 
 namespace network{
@@ -39 +39 @@
   clientID_ = ClientInformation::findClient(&peer->address)->getID();
   packetContent_ = createPacketContent(packet);
+  delete packet;
+  delete peer;
 }
 
@@ -49 +51 @@
 }
 
+void Packet::setPacketContent(PacketContent *content){
+  packetContent_ = content;
+  if(enetPacket_){
+    enet_packet_destroy(enetPacket_);
+    enetPacket_=0;
+  }
+}
 
 bool Packet::send(){
-  if(!packetDirection_ == ENUM::Outgoing || !packetDirection_ == ENUM::Bidirectional )
+  if(packetDirection_ != ENUM::Outgoing && packetDirection_ != ENUM::Bidirectional )
     return false;
   if(!enetPacket_){
     if(!packetContent_)
       return false;
+    COUT(3) << "creating packet with data: " << packetContent_->getData() << " size: " << packetContent_->getSize() << " and flags: " << packetContent_->getFlags() << std::endl;
     enetPacket_ = enet_packet_create(packetContent_->getData(), packetContent_->getSize(), packetContent_->getFlags());
   }
   network::Host::addPacket( enetPacket_, clientID_);
+  enetPacket_ = 0; // otherwise we have a double free because enet already handles the deallocation of the packet
   return true;
 }
@@ -73 +84 @@
       break;
     case ENUM::ClassID:
-      packetContent_ = new ClassID( data );
+      packetContent_ = new ClassID( data, clientID_ );
       break;
     case ENUM::Gamestate:

code/branches/network/src/network/packet/Packet.h

@@ -47 +47 @@
     Gamestate,
     ClassID,
-    Chat
+    Chat,
+    Welcome
   };
 }
@@ -65 +66 @@
     
     void setClientID( int id ){ clientID_ = id; }
-    void setPacketContent(PacketContent *content){ packetContent_=content; }
+    void setPacketContent(PacketContent *content);
     
     bool send();

code/branches/network/src/network/packet/PacketContent.h

@@ -47 +47 @@
     virtual unsigned char *getData()=0;
     virtual unsigned int getSize() const =0;
+    int getClientID(){return clientID_;}
     virtual bool process()=0;
     enet_uint32 getFlags(){ return flags_; }
@@ -53 +54 @@
         { flags_ = PACKET_FLAG_DEFAULT;
         data_=0; }
-    PacketContent( unsigned char *data )
-        { flags_ = PACKET_FLAG_DEFAULT; data_=data; }
+    PacketContent( unsigned char *data, int clientID )
+        { flags_ = PACKET_FLAG_DEFAULT; data_=data; clientID_=clientID; }
     PacketContent(const PacketContent& p){
       flags_=p.flags_;
@@ -66 +67 @@
     enet_uint32 flags_;
     unsigned char *data_;
+    int clientID_;
   private:
 };