Changeset 1666

Timestamp:

Aug 26, 2008, 12:52:43 AM (16 years ago)

Author:

scheusso

Message:

a hole lot of changes:

• changes in structure concerning client/server (they inherit from Host now)
• some small changes in spaceship
• delete unused files
• modified clientinformation (is a singleton now)
• modified gamestatemanager (adopted clientinformation changes)
• modified connectionmanager (adopted CI changes, is a singleton now)

Location:

code/branches/network/src/network

Files:

• CMakeLists.txt (modified) (1 diff)
• Client.cc (modified) (3 diffs)
• Client.h (modified) (4 diffs)
• ClientInformation.cc (modified) (8 diffs)
• ClientInformation.h (modified) (6 diffs)
• ConnectionManager.cc (modified) (9 diffs)
• ConnectionManager.h (modified) (5 diffs)
• GameStateManager.cc (modified) (4 diffs)
• GameStateManager.h (modified) (2 diffs)
• Host.cc (added)
• Host.h (added)
• Node.h (added)
• Server.cc (modified) (19 diffs)
• Server.h (modified) (4 diffs)
• dummyclient.cc (deleted)
• dummyclient2.cc (deleted)
• dummyclient3.cc (deleted)
• dummyclient4.cc (deleted)
• dummyserver.cc (deleted)
• dummyserver3.cc (deleted)
• dummyserver4.cc (deleted)

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

@@ -11 +11 @@
   Server.cc
   Synchronisable.cc
+  Host.cc
+  packet/Packet.cc
+  packet/Chat.cc
+  packet/ClassID.cc
+  packet/Acknowledgement.cc
+  packet/Gamestate.cc
+  Host.cc
 )
 

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

@@ -40 +40 @@
 
 #include "Client.h"
+#include "Host.h"
 #include "Synchronisable.h"
 #include "core/CoreIncludes.h"
 #include "core/ConsoleCommand.h"
-#include "Server.h"
+#include "packet/Packet.h"
 
 namespace network
 {
-  SetConsoleCommandShortcut(Client, Chat);
-  
-  Client* Client::_sClient = 0;
-  
-  Client* Client::createSingleton(){
-    if(!_sClient){
-      _sClient = new Client();
-    }
-    return _sClient;
-  }
-  
-  Client* Client::createSingleton(std::string address, int port){
-    if(!_sClient)
-      _sClient = new Client(address, port);
-    return _sClient;
-  }
-  
-  Client* Client::createSingleton(const char *address, int port){
-    if(!_sClient)
-      _sClient = new Client(address, port);
-    return _sClient;
-  }
-  
-  void Client::destroySingleton(){
-    if(_sClient){
-      delete _sClient;
-      _sClient = 0;
-    }
-  }
-  
-  Client* Client::getSingleton(){
-    return _sClient; 
-  }
+//   SetConsoleCommandShortcut(Client, chat);
+  
   
   /**
@@ -144 +114 @@
   }
 
-  
-
-  void Client::Chat( std::string message ){
-    if(Client::getSingleton())
-      Client::getSingleton()->sendChat(message);
-    else if(Server::getSingleton())
-      Server::getSingleton()->sendChat(message);
-    else
-      COUT(1) << "do you want to monologize ??" << std::endl;
-  }
-  
+  bool Client::queuePacket(ENetPacket *packet, int clientID){
+    return client_connection.addPacket(packet);
+  }
+  
+  bool Client::processChat(packet::Chat *message, unsigned int clientID){
+    return message->process();
+  }
+  
+  bool Client::sendChat(packet::Chat *chat){
+    chat->process();
+    packet::Packet *p = new packet::Packet(chat);
+    return p->send();
+  }
 
   /**
@@ -236 +208 @@
   }
 
-  void Client::processChat( chat *data, int clientId){
-    COUT(1) << data->message << std::endl;
-    delete[] data->message;
-    delete data;
-  }
+//   void Client::processChat( chat *data, int clientId){
+//     COUT(1) << data->message << std::endl;
+//     delete[] data->message;
+//     delete data;
+//   }
   
   bool Client::processWelcome( welcome *w ){

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

@@ -46 +46 @@
 #include <string>
 
+#include "Host.h"
+#include "packet/Chat.h"
 #include "ClientConnection.h"
 #include "PacketManager.h"
@@ -62 +64 @@
   *
   */
-  class _NetworkExport Client : PacketDecoder{
+  class _NetworkExport Client : PacketDecoder, public Host{
   public:
-    
-    static Client* createSingleton();
-    static Client* createSingleton(std::string address, int port);
-    static Client* createSingleton(const char *address, int port);
-    static void destroySingleton();
-    static Client *getSingleton();
-    
-    bool establishConnection();
-    bool closeConnection();
-
-    static void Chat( std::string message );
-    
-    int getShipID(){return shipID_;}
-    int getClientID(){return clientID_;}
-
-    void tick(float time);
-
-  private:
     Client();
     Client(std::string address, int port);
@@ -87 +71 @@
     ~Client();
     
-    static Client* _sClient;
+    bool establishConnection();
+    bool closeConnection();
+    bool queuePacket(ENetPacket *packet, int clientID);
+    bool processChat(packet::Chat *message, unsigned int clientID);
+    bool sendChat(packet::Chat *chat);
+    
+//    static void Chat( std::string message );
+    
+    int shipID(){return shipID_;}
+    int playerID(){return clientID_;}
+
+    void tick(float time);
+
+  private:
     
     ClientConnection client_connection;
@@ -100 +97 @@
     void processGamestate( GameStateCompressed *data, int clientID);
     void processClassid(classid *clid);
-    void processChat( chat *data, int clientId );
+//     void processChat( chat *data, int clientId );
     bool processWelcome( welcome *w );
     int clientID_;     // this is the id the server gave to us

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

@@ -46 +46 @@
 {
   
+  ClientInformation *ClientInformation::head_=0;
+  
   ClientInformation::ClientInformation() {
+    if(!head_)
+      head_=this;
     gamestateID_=GAMESTATEID_INITIAL;
     preve=0;
     nexte=0;
     partialGamestateID_=GAMESTATEID_INITIAL-1;
-    this->head_=false;
     synched_=false;
   }
 
-  ClientInformation::ClientInformation(bool head) {
-    gamestateID_=GAMESTATEID_INITIAL;
-    preve=0;
-    nexte=0;
-    partialGamestateID_=GAMESTATEID_INITIAL-1;
-    this->head_=head;
-    synched_=false;
-  }
-
-  // ClientInformation::ClientInformation(ClientInformation *prev) {
-  //   if(prev->next()!=0){
-  //     this->nexte=prev->next();
-  //     this->nexte->setPrev(this);
-  //   }
-  //   else
-  //     this->nexte = 0;
-  //   prev->setNext(this);
-  //   this->preve = pref;
-  // }
-  //
-  // ClientInformation::ClientInformation(ClientInformation *prev, ClientInformation *next){
-  //   this->nexte = next;
-  //   this->preve = prev;
-  //   this->preve->setNext(this);
-  //   this->nexte->setPrev(this);
-  // }
-
   ClientInformation::~ClientInformation() {
+    if(this==head_)
+      head_=next();
     if(prev()!=0)
       prev()->setNext(this->next());
@@ -103 +81 @@
 
   bool ClientInformation::setPrev(ClientInformation *prev) {
-    if(!head_)
-      this->preve = prev;
-    else
-      return false;
+    if(this==head_)
+      head_=prev;
+    this->preve = prev;
     return true;
   }
@@ -174 +151 @@
   }
   
-  bool ClientInformation::getHead(){
-    return head_;
-  }
-  
-  void ClientInformation::setHead(bool h){
-    head_=h;
-  }
-  
   int ClientInformation::getFailures(){
     return failures_;
@@ -215 +184 @@
 
   ClientInformation *ClientInformation::insertBack(ClientInformation *ins) {
-    if(!this)
-      return NULL;
-    ClientInformation *temp = this;
+    ClientInformation *temp = head_;
+    if(temp==head_){
+      return head_;
+    }
     while(temp->next()!=0){
       temp = temp->next();
@@ -227 +197 @@
 
   bool ClientInformation::removeClient(int clientID) {
-    if(!this || clientID==CLIENTID_UNKNOWN)
-      return false;
-    ClientInformation *temp = this;
+    if(clientID==CLIENTID_UNKNOWN)
+      return false;
+    ClientInformation *temp = head_;
     while(temp!=0 && temp->getID()!=clientID)
       temp = temp->next();
@@ -239 +209 @@
 
   bool ClientInformation::removeClient(ENetPeer *peer) {
-    if(!this || !peer)
-      return false;
-    ClientInformation *temp = this;
+    if(!peer)
+      return false;
+    ClientInformation *temp = head_;
     while(temp!=0){
-      if(!temp->head_)
-        if(temp->getPeer()->address.host==peer->address.host && temp->getPeer()->address.port==peer->address.port)
-          break;
+      if(temp->getPeer()->address.host==peer->address.host && temp->getPeer()->address.port==peer->address.port)
+        break;
       temp = temp->next();
     }
@@ -261 +230 @@
   */
   ClientInformation *ClientInformation::findClient(int clientID, bool look_backwards) {
-    ClientInformation *temp = this;
-    if (temp->head_)
-      temp=temp->next();
+    ClientInformation *temp = head_;
     while(temp!=0 && temp->getID()!=clientID){
       temp = temp->next();
@@ -278 +245 @@
   */
   ClientInformation *ClientInformation::findClient(ENetAddress *address, bool look_backwards) {
-    ClientInformation *temp = this;
+    ClientInformation *temp = head_;
     while(temp!=0){
-      if(temp->head_){
-        temp = temp->next();
-        continue;
-      }
       if(temp->getPeer()->address.host==address->host && temp->getPeer()->address.port == address->port)
         break;

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

@@ -60 +60 @@
   public:
     ClientInformation();
-    ClientInformation(bool head);
     //   ClientInformation(ClientInformation *prev, ClientInformation *next);
     //   ClientInformation(ClientInformation *prev);
@@ -66 +65 @@
     ClientInformation *next();
     ClientInformation *prev();
-    ClientInformation *insertBack(ClientInformation *ins);
+    static ClientInformation *insertBack(ClientInformation *ins);
     
     // set functions
@@ -81 +80 @@
     int getPartialGamestateID();
     ENetPeer *getPeer();
-    bool getHead();
-    void setHead(bool h);
     
     int getFailures();
@@ -90 +87 @@
     enet_uint32 getPacketLoss();
     
-    bool removeClient(int clientID);
-    bool removeClient(ENetPeer *peer);
-    //## add bool mask-function eventually
-    ClientInformation *findClient(int clientID, bool look_backwards=false);
-    //## add bool mask-function eventually
-    ClientInformation *findClient(ENetAddress *address, bool look_backwards=false);
+    static bool removeClient(int clientID);
+    static bool removeClient(ENetPeer *peer);
+    static ClientInformation *findClient(int clientID, bool look_backwards=false);
+    static ClientInformation *findClient(ENetAddress *address, bool look_backwards=false);
+    static ClientInformation *getBegin(){return head_;}
 
     bool setSynched(bool s);
@@ -101 +97 @@
 
 
-    private:
-      bool setNext(ClientInformation *next);
-      bool setPrev(ClientInformation *prev);
+  private:
+    static ClientInformation *head_;
+    
+    bool setNext(ClientInformation *next);
+    bool setPrev(ClientInformation *prev);
     ClientInformation *insertAfter(ClientInformation *ins);
     ClientInformation *insertBefore(ClientInformation *ins);
@@ -116 +114 @@
     int ShipID_;   // this is the unique objectID
     bool synched_;
-    bool head_;
     unsigned short failures_;
     

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

@@ -39 +39 @@
 
 #include <iostream>
+#include <assert.h>
 // boost.thread library for multithreading support
 #include <boost/bind.hpp>
@@ -65 +66 @@
   //boost::thread_group network_threads;
   
-  ConnectionManager::ConnectionManager():receiverThread_(0){}
-  boost::recursive_mutex ConnectionManager::enet_mutex_;
-  
-  ConnectionManager::ConnectionManager(ClientInformation *head) : receiverThread_(0) {
+  ConnectionManager *ConnectionManager::instance_=0;
+  
+  ConnectionManager::ConnectionManager():receiverThread_(0){
+    assert(instance_==0);
+    instance_=this;
     quit=false;
     bindAddress.host = ENET_HOST_ANY;
     bindAddress.port = NETWORK_PORT;
-    head_ = head;
-  }
-  
-  ConnectionManager::ConnectionManager(ClientInformation *head, int port){
+  }
+  boost::recursive_mutex ConnectionManager::enet_mutex_;
+  
+//   ConnectionManager::ConnectionManager(ClientInformation *head) : receiverThread_(0) {
+//     assert(instance_==0);
+//     instance_=this;
+//     quit=false;
+//     bindAddress.host = ENET_HOST_ANY;
+//     bindAddress.port = NETWORK_PORT;
+//   }
+  
+  ConnectionManager::ConnectionManager(int port){
+    assert(instance_==0);
+    instance_=this;
     quit=false;
     bindAddress.host = ENET_HOST_ANY;
     bindAddress.port = port;
-    head_ = head;
-  }
-
-  ConnectionManager::ConnectionManager(int port, std::string address, ClientInformation *head) :receiverThread_(0) {
+  }
+
+  ConnectionManager::ConnectionManager(int port, std::string address) :receiverThread_(0) {
+    assert(instance_==0);
+    instance_=this;
     quit=false;
     enet_address_set_host (& bindAddress, address.c_str());
     bindAddress.port = NETWORK_PORT;
-    head_ = head;
-  }
-
-  ConnectionManager::ConnectionManager(int port, const char *address, ClientInformation *head) : receiverThread_(0) {
+  }
+
+  ConnectionManager::ConnectionManager(int port, const char *address) : receiverThread_(0) {
+    assert(instance_==0);
+    instance_=this;
     quit=false;
     enet_address_set_host (& bindAddress, address);
     bindAddress.port = NETWORK_PORT;
-    head_ = head;
+  }
+  
+  ConnectionManager::~ConnectionManager(){
+    instance_=0;
+    if(!quit)
+      quitListener();
   }
 
@@ -140 +159 @@
     return true;
   }
-
+  
+//   bool ConnectionManager::addPacket(Packet::Packet *packet){
+//     ClientInformation *temp = instance_->head_->findClient(packet->getClientID());
+//     if(!temp){
+//       COUT(3) << "C.Man: addPacket findClient failed" << std::endl;
+//       return false;
+//     }
+//     ENetPacket *packet = new ENetPacket;
+//     //  TODO: finish implementation
+//   }
+//   
+  
   bool ConnectionManager::addPacket(ENetPacket *packet, ENetPeer *peer) {
-    ClientInformation *temp = head_->findClient(&(peer->address));
-    if(!temp)
-      return false;
-    boost::recursive_mutex::scoped_lock lock(enet_mutex_);
-    if(enet_peer_send(peer, (enet_uint8)temp->getID() , packet)!=0)
+    boost::recursive_mutex::scoped_lock lock(instance_->enet_mutex_);
+    if(enet_peer_send(peer, NETWORK_DEFAULT_CHANNEL, packet)!=0)
       return false;
     return true;
@@ -152 +179 @@
 
   bool ConnectionManager::addPacket(ENetPacket *packet, int clientID) {
-    ClientInformation *temp = head_->findClient(clientID);
+    ClientInformation *temp = ClientInformation::findClient(clientID);
     if(!temp){
       COUT(3) << "C.Man: addPacket findClient failed" << std::endl;
       return false;
     }
-    boost::recursive_mutex::scoped_lock lock(enet_mutex_);
-    if(enet_peer_send(temp->getPeer(), 0, packet)!=0){
-      COUT(3) << "C.Man: addPacket enet_peer_send failed" << std::endl;
-      return false;
-    }
-    return true;
+    return addPacket(packet, temp->getPeer());
   }
 
   bool ConnectionManager::addPacketAll(ENetPacket *packet) {
-    boost::recursive_mutex::scoped_lock lock(enet_mutex_);
-    for(ClientInformation *i=head_->next(); i!=0; i=i->next()){
+    if(!instance_)
+      return false;
+    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;
       if(enet_peer_send(i->getPeer(), 0, packet)!=0)
@@ -177 +201 @@
   // we actually dont need that function, because host_service does that for us
   bool ConnectionManager::sendPackets() {
-    if(server==NULL)
+    if(server==NULL || !instance_)
       return false;
     boost::recursive_mutex::scoped_lock lock(enet_mutex_);
@@ -257 +281 @@
   void ConnectionManager::disconnectClients() {
     ENetEvent event;
-    ClientInformation *temp = head_->next();
+    ClientInformation *temp = ClientInformation::getBegin()->next();
     while(temp!=0){
       {
@@ -267 +291 @@
     }
     //bugfix: might be the reason why server crashes when clients disconnects
-    temp = head_->next();
+    temp = ClientInformation::getBegin()->next();
     boost::recursive_mutex::scoped_lock lock(enet_mutex_);
     while( temp!=0 && enet_host_service(server, &event, NETWORK_WAIT_TIMEOUT) >= 0){
@@ -279 +303 @@
       case ENET_EVENT_TYPE_DISCONNECT:
         COUT(4) << "disconnecting all clients" << std::endl;
-        if(head_->findClient(&(event.peer->address)))
-          delete head_->findClient(&(event.peer->address));
+        if(ClientInformation::findClient(&(event.peer->address)))
+          delete ClientInformation::findClient(&(event.peer->address));
         //maybe needs bugfix: might also be a reason for the server to crash
         temp = temp->next();
@@ -302 +326 @@
 
   int ConnectionManager::getClientID(ENetAddress address) {
-    return head_->findClient(&address)->getID();
+    return ClientInformation::findClient(&address)->getID();
   }
 
   ENetPeer *ConnectionManager::getClientPeer(int clientID) {
-    return head_->findClient(clientID)->getPeer();
+    return ClientInformation::findClient(clientID)->getPeer();
   }
 

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

@@ -52 +52 @@
 #include "PacketBuffer.h"
 #include "PacketManager.h"
+#include "packet/Packet.h"
 
 namespace std
@@ -63 +64 @@
 #define NETWORK_MAX_CONNECTIONS 50
 #define NETWORK_WAIT_TIMEOUT 1
+#define NETWORK_DEFAULT_CHANNEL 0
 
   struct ClientList{
@@ -73 +75 @@
   public:
     ConnectionManager();
-    ConnectionManager(ClientInformation *head);
-    ConnectionManager(ClientInformation *head, int port);
-    ConnectionManager(int port, const char *address, ClientInformation *head);
-    ConnectionManager(int port, std::string address, ClientInformation *head);
+    //ConnectionManager(ClientInformation *head);
+    ConnectionManager(int port);
+    ConnectionManager(int port, const char *address);
+    ConnectionManager(int port, std::string address);
+    ~ConnectionManager();
     //ENetPacket *getPacket(ENetAddress &address); // thread1
     //ENetPacket *getPacket(int &clientID);
@@ -83 +86 @@
     void createListener();
     bool quitListener();
-    bool addPacket(ENetPacket *packet, ENetPeer *peer);
-    bool addPacket(ENetPacket *packet, int ID);
-    bool addPacketAll(ENetPacket *packet);
+//     bool addPacket(Packet::Packet *packet);
+    static bool addPacket(ENetPacket *packet, ENetPeer *peer);
+    static bool addPacket(ENetPacket *packet, int ID);
+    static bool addPacketAll(ENetPacket *packet);
   //  bool sendPackets(ENetEvent *event);
     bool sendPackets();
@@ -113 +117 @@
 
     bool quit; // quit-variable (communication with threads)
-    ClientInformation *head_;
 
     boost::thread *receiverThread_;
     static boost::recursive_mutex enet_mutex_;
-//     int getNumberOfClients();
-    //functions to map what object every clients uses
-    /*std::map<int, int> clientsShip;
-    void addClientsObjectID( int clientID, int objectID );
-    int getClientsShipID( int clientID );
-    int getObjectsClientID( int objectID );
-    void deleteClientIDReg( int clientID );
-    void deleteObjectIDReg( int objectID );*/
+    static ConnectionManager *instance_;
+
   };
 

code/branches/network/src/network/GameStateManager.cc

@@ -53 +53 @@
 namespace network
 {
-  GameStateManager::GameStateManager(ClientInformation *head) {
+  GameStateManager::GameStateManager() {
     id_=0;
-    head_=head;
   }
 
@@ -130 +129 @@
     //why are we searching the same client's gamestate id as we searched in
     //Server::sendGameState?
-    int gID = head_->findClient(clientID)->getGamestateID();
+    int gID = ClientInformation::findClient(clientID)->getGamestateID();
     COUT(4) << "G.St.Man: popgamestate: sending gstate_id: " << id_ << " diffed from: " << gID << std::endl;
 //     COUT(3) << "gamestatemap: " << &gameStateMap << std::endl;
@@ -467 +466 @@
 
   void GameStateManager::ackGameState(int clientID, int gamestateID) {
-    ClientInformation *temp = head_->findClient(clientID);
+    ClientInformation *temp = ClientInformation::findClient(clientID);
     if(temp==0)
       return;
@@ -524 +523 @@
     if(client->getGamestateID()>=0)
       gameStateUsed[client->getGamestateID()]--;
-    head_->removeClient(client->getID());
+    ClientInformation::removeClient(client->getID());
   }
 

code/branches/network/src/network/GameStateManager.h

@@ -69 +69 @@
   class GameStateManager{
   public:
-    GameStateManager(ClientInformation *head);
+    GameStateManager();
     ~GameStateManager();
     
@@ -96 +96 @@
     std::map<int, GameStateCompressed*> gameStateQueue;
     GameState *reference;
-    ClientInformation *head_;
     int id_;
     

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

@@ -48 +48 @@
 #include "GameStateManager.h"
 #include "ClientInformation.h"
-//#include "NetworkFrameListener.h"
 #include "util/Sleep.h"
 #include "objects/SpaceShip.h"
 #include "core/ConsoleCommand.h"
+#include "packet/Chat.h"
+#include "packet/Packet.h"
 
 namespace network
@@ -58 +59 @@
   #define NETWORK_FREQUENCY 30
   
-  Server *Server::instance_=0;
-  
-  Server *Server::createSingleton(){
-    if(!instance_)
-      instance_ = new Server();
-    return instance_;
-  }
-  Server *Server::createSingleton(int port){
-    if(!instance_)
-      instance_ = new Server(port);
-    return instance_;
-  }
-  Server *Server::createSingleton(int port, std::string bindAddress){
-    if(!instance_)
-      instance_ = new Server(port, bindAddress);
-    return instance_;
-  }
-  Server *Server::createSingleton(int port, const char *bindAddress){
-    if(!instance_)
-      instance_ = new Server(port, bindAddress);
-    return instance_;
-  }
-  
-  Server *Server::getSingleton(){
-    return instance_;
-  }
-  
-  
   /**
   * Constructor for default values (bindaddress is set to ENET_HOST_ANY
@@ -93 +66 @@
     timeSinceLastUpdate_=0;
     packet_gen = PacketGenerator();
-    clients = new ClientInformation(true);
-    connection = new ConnectionManager(clients);
-    gamestates = new GameStateManager(clients);
+    connection = new ConnectionManager();
+    gamestates = new GameStateManager();
   }
   
@@ -101 +73 @@
     timeSinceLastUpdate_=0;
     packet_gen = PacketGenerator();
-    clients = new ClientInformation(true);
-    connection = new ConnectionManager(clients, port);
-    gamestates = new GameStateManager(clients);
+    connection = new ConnectionManager(port);
+    gamestates = new GameStateManager();
   }
 
@@ -114 +85 @@
     timeSinceLastUpdate_=0;
     packet_gen = PacketGenerator();
-    clients = new ClientInformation();
-    connection = new ConnectionManager(port, bindAddress, clients);
-    gamestates = new GameStateManager(clients);
+    connection = new ConnectionManager(port, bindAddress);
+    gamestates = new GameStateManager();
   }
 
@@ -127 +97 @@
     timeSinceLastUpdate_=0;
     packet_gen = PacketGenerator();
-    clients = new ClientInformation();
-    connection = new ConnectionManager(port, bindAddress, clients);
-    gamestates = new GameStateManager(clients);
+    connection = new ConnectionManager(port, bindAddress);
+    gamestates = new GameStateManager();
   }
 
@@ -148 +117 @@
   }
 
+  bool Server::processChat(packet::Chat *message, unsigned int clientID){
+    ClientInformation *temp = ClientInformation::getBegin();
+    packet::Packet *pkt;
+    while(temp){
+      pkt = new packet::Packet(message);
+      pkt->setClientID(temp->getID());
+      if(!pkt->send())
+        COUT(3) << "could not send Chat message to client ID: " << temp->getID() << std::endl;
+    }
+    return message->process();
+  }
+  
   /**
   * This function sends out a message to all clients
@@ -153 +134 @@
   * @return true/false
   */
-  bool Server::sendChat(std::string msg) {
-    return sendChat(msg.c_str());
+  bool Server::sendChat(packet::Chat *chat) {
+    //TODO: change this (no informations about who wrote a message)
+    ClientInformation *temp = ClientInformation::getBegin();
+    packet::Packet *pkt;
+    while(temp){
+      pkt = new packet::Packet(chat);
+      pkt->setClientID(temp->getID());
+      if(!pkt->send())
+        COUT(3) << "could not send Chat message to client ID: " << temp->getID() << std::endl;
+    }
+    return chat->process();
   }
 
@@ -162 +152 @@
   * @return true/false
   */
-  bool Server::sendChat(const char *msg) {
-    char *message = new char [strlen(msg)+10+1];
-    sprintf(message, "Player %d: %s", CLIENTID_SERVER, msg);
-    COUT(1) << message << std::endl;
-    ENetPacket *packet = packet_gen.chatMessage(message);
-    COUT(5) <<"Server: adding Packets" << std::endl;
-    return connection->addPacketAll(packet);
-  }
+//   bool Server::sendChat(const char *msg) {
+//     char *message = new char [strlen(msg)+10+1];
+//     sprintf(message, "Player %d: %s", CLIENTID_SERVER, msg);
+//     COUT(1) << message << std::endl;
+//     ENetPacket *packet = packet_gen.chatMessage(message);
+//     COUT(5) <<"Server: adding Packets" << std::endl;
+//     return connection->addPacketAll(packet);
+//   }
 
   /**
@@ -190 +180 @@
 //     usleep(5000); // TODO remove
     return;
+  }
+  
+  bool Server::queuePacket(ENetPacket *packet, int clientID){
+    return connection->addPacket(packet, clientID);
   }
 
@@ -211 +205 @@
         break;
       case ENET_EVENT_TYPE_DISCONNECT:
-        if(clients->findClient(&event->peer->address))
+        if(ClientInformation::findClient(&event->peer->address))
           disconnectClient(event);
         break;
       case ENET_EVENT_TYPE_RECEIVE:
-        if(clients->findClient(&event->peer->address)){
-          clientID = clients->findClient(&event->peer->address)->getID();
+        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;
@@ -247 +241 @@
   bool Server::sendGameState() {
     COUT(5) << "Server: starting function sendGameState" << std::endl;
-    ClientInformation *temp = clients;
+    ClientInformation *temp = ClientInformation::getBegin();
     bool added=false;
     while(temp != NULL){
-      if(temp->getHead()){
-        temp=temp->next();
-        //think this works without continue
-        continue;
-      }
       if( !(temp->getSynched()) ){
         COUT(5) << "Server: not sending gamestate" << std::endl;
         temp=temp->next();
+        if(!temp)
+          break;
         //think this works without continue
         continue;
@@ -320 +311 @@
   }
   
-  void Server::processChat( chat *data, int clientId){
-    char *message = new char [strlen(data->message)+10+1];
-    sprintf(message, "Player %d: %s", clientId, data->message);
-    COUT(1) << message << std::endl;
-    ENetPacket *pck = packet_gen.chatMessage(message);
-    connection->addPacketAll(pck);
-    delete[] data->message;
-    delete data;
-  }
+//   void Server::processChat( chat *data, int clientId){
+//     char *message = new char [strlen(data->message)+10+1];
+//     sprintf(message, "Player %d: %s", clientId, data->message);
+//     COUT(1) << message << std::endl;
+//     ENetPacket *pck = packet_gen.chatMessage(message);
+//     connection->addPacketAll(pck);
+//     delete[] data->message;
+//     delete data;
+//   }
   
   bool Server::addClient(ENetEvent *event){
-    ClientInformation *temp = clients->insertBack(new ClientInformation);
+    ClientInformation *temp = ClientInformation::insertBack(new ClientInformation);
     if(!temp){
       COUT(2) << "Server: could not add client" << std::endl;
       return false;
     }
-    if(temp->prev()->getHead()) { //not good if you use anything else than insertBack
+    if(temp->prev()->getBegin()) { //not good if you use anything else than insertBack
       temp->prev()->setID(0); //bugfix: not necessary but usefull
       temp->setID(1);
@@ -348 +339 @@
   
   bool Server::createClient(int clientID){
-    ClientInformation *temp = clients->findClient(clientID);
+    ClientInformation *temp = ClientInformation::findClient(clientID);
     if(!temp){
       COUT(2) << "Conn.Man. could not create client with id: " << clientID << std::endl;
@@ -376 +367 @@
     }
     orxonox::SpaceShip *no = dynamic_cast<orxonox::SpaceShip *>(id->fabricate());
+    no->classID = id->getNetworkID();
+    client->setShipID(no->objectID);
     no->setPosition(orxonox::Vector3(0,0,80));
     no->setScale(10);
@@ -388 +381 @@
     no->setRotDamp(1.0);
     no->setCamera("cam_"+client->getID());
-    no->classID = id->getNetworkID();
     no->create();
+    no->setBacksync(true);
     
-    client->setShipID(no->objectID);
     return true;
   }
@@ -401 +393 @@
     //boost::recursive_mutex::scoped_lock lock(head_->mutex_);
     orxonox::Iterator<orxonox::SpaceShip> it = orxonox::ObjectList<orxonox::SpaceShip>::start();
-    ClientInformation *client = clients->findClient(&event->peer->address);
+    ClientInformation *client = ClientInformation::findClient(&event->peer->address);
     if(!client)
       return false;
@@ -412 +404 @@
       ++it;
       delete  *temp;
-      return clients->removeClient(event->peer);
+      return ClientInformation::removeClient(event->peer);
     }
     return false;
@@ -418 +410 @@
 
   void Server::disconnectClient(int clientID){
-    ClientInformation *client = clients->findClient(clientID);
+    ClientInformation *client = ClientInformation::findClient(clientID);
     if(client)
       disconnectClient(client);

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

@@ -46 +46 @@
 #include <string>
 
+#include "Host.h"
 #include "PacketManager.h"
 
@@ -58 +59 @@
   * It implements all functions necessary for a Server
   */
-  class _NetworkExport Server : public PacketDecoder{
+  class _NetworkExport Server : public PacketDecoder, public Host{
   public:
-    static Server *createSingleton();
-    static Server *createSingleton(int port);
-    static Server *createSingleton(int port, std::string bindAddress);
-    static Server *createSingleton(int port, const char *bindAddress);
-    
-    static Server *getSingleton();
+    Server();
+    Server(int port);
+    Server(int port, std::string bindAddress);
+    Server(int port, const char *bindAddress);
     
     void open();
     void close();
-    bool sendChat(std::string msg);
-    bool sendChat(const char *msg);
+    bool processChat(packet::Chat *message, unsigned int clientID);
+    bool sendChat(packet::Chat *chat);
+    bool queuePacket(ENetPacket *packet, int clientID);
     void tick(float time);
   protected:
@@ -76 +76 @@
     void updateGamestate();
   private:
-    Server();
-    Server(int port);
-    Server(int port, std::string bindAddress);
-    Server(int port, const char *bindAddress);
-    
-    static Server *instance_;
+    int shipID(){return 0;}
+    int playerID(){return 0;}
     
     bool addClient(ENetEvent *event);
@@ -93 +89 @@
     bool processConnectRequest( connectRequest *con, int clientID );
     void processGamestate( GameStateCompressed *data, int clientID);
-    void processChat( chat *data, int clientId);
+    //void processChat( chat *data, int clientId);
     ConnectionManager *connection;
     GameStateManager *gamestates;
     PacketGenerator packet_gen;
 
-    ClientInformation *clients;
+    
     float timeSinceLastUpdate_;
   };