Changeset 1747 for code/trunk/src/network

Timestamp:

Sep 9, 2008, 4:25:52 AM (16 years ago)

Author:

landauf

Message:

merged core3 back to trunk

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/network/ClientConnection.cc (modified) (2 diffs)
• src/network/ConnectionManager.cc (modified) (13 diffs)
• src/network/GamestateClient.cc (modified) (3 diffs)
• src/network/GamestateClient.h (modified) (4 diffs)
• src/network/Server.cc (modified) (14 diffs)
• src/network/Synchronisable.h (modified) (1 diff)
• src/network/packet/Gamestate.cc (modified) (6 diffs)
• src/network/packet/Gamestate.h (modified) (4 diffs)

code/trunk/src/network/ClientConnection.cc

@@ -45 +45 @@
 
 #include "util/Sleep.h"
-#include "core/Debug.h"
+#include "util/Debug.h"
 
 namespace network
@@ -91 +91 @@
     return getPacket(address);
   }*/
-  
+
   ENetEvent *ClientConnection::getEvent(){
     if(!buffer.isEmpty())

code/trunk/src/network/ConnectionManager.cc

@@ -45 +45 @@
 #include "core/CoreIncludes.h"
 #include "core/BaseObject.h"
+#include "core/Iterator.h"
 #include "objects/SpaceShip.h"
 #include "util/Math.h"
@@ -66 +67 @@
 {
   //boost::thread_group network_threads;
-  
+
   ConnectionManager *ConnectionManager::instance_=0;
-  
+
   ConnectionManager::ConnectionManager():receiverThread_(0){
     assert(instance_==0);
@@ -77 +78 @@
   }
   boost::recursive_mutex ConnectionManager::enet_mutex;
-  
+
 //   ConnectionManager::ConnectionManager(ClientInformation *head) : receiverThread_(0) {
 //     assert(instance_==0);
@@ -85 +86 @@
 //     bindAddress.port = NETWORK_PORT;
 //   }
-  
+
   ConnectionManager::ConnectionManager(int port){
     assert(instance_==0);
@@ -109 +110 @@
     bindAddress.port = NETWORK_PORT;
   }
-  
+
   ConnectionManager::~ConnectionManager(){
     instance_=0;
@@ -135 +136 @@
     return packet;
   }*/
-  
+
   ENetEvent *ConnectionManager::getEvent(){
     if(!buffer.isEmpty())
@@ -160 +161 @@
     return true;
   }
-  
+
 //   bool ConnectionManager::addPacket(Packet::Packet *packet){
 //     ClientInformation *temp = instance_->head_->findClient(packet->getClientID());
@@ -170 +171 @@
 //     //  TODO: finish implementation
 //   }
-//   
-  
+//
+
   bool ConnectionManager::addPacket(ENetPacket *packet, ENetPeer *peer) {
     boost::recursive_mutex::scoped_lock lock(instance_->enet_mutex);
@@ -276 +277 @@
     }
   }
-  
+
   //### added some bugfixes here, but we cannot test them because
   //### the server crashes everytime because of some gamestates
@@ -335 +336 @@
 
   /**
-   * 
-   * @param clientID 
+   *
+   * @param clientID
    */
   void ConnectionManager::syncClassid(unsigned int clientID) {
@@ -364 +365 @@
   }
 
-  
-  
+
+
   bool ConnectionManager::removeShip(ClientInformation *client){
     unsigned int id=client->getShipID();
-    orxonox::Iterator<orxonox::SpaceShip> it;
-    for(it = orxonox::ObjectList<orxonox::SpaceShip>::start(); it; ++it){
+    orxonox::ObjectList<orxonox::SpaceShip>::iterator it;
+    for(it = orxonox::ObjectList<orxonox::SpaceShip>::begin(); it; ++it){
       if(it->objectID!=id)
         continue;
@@ -376 +377 @@
     return true;
   }
-  
-  
+
+
   void ConnectionManager::disconnectClient(ClientInformation *client){
     {
@@ -386 +387 @@
     removeShip(client);
   }
-  
+
 
 }

code/trunk/src/network/GamestateClient.cc

@@ -33 +33 @@
 #include "core/CoreIncludes.h"
 #include "core/BaseObject.h"
+#include "core/Iterator.h"
 #include "Synchronisable.h"
 
@@ -68 +69 @@
     return true;
   }
-  
+
   int GamestateClient::processGamestates(){
     if(tempGamestate_==NULL)
@@ -89 +90 @@
   * @return iterator pointing to the next object in the list
   */
-  void GamestateClient::removeObject(orxonox::Iterator<Synchronisable> &it) {
-    orxonox::Iterator<Synchronisable> temp=it;
+  void GamestateClient::removeObject(orxonox::ObjectList<Synchronisable>::iterator &it) {
+    orxonox::ObjectList<Synchronisable>::iterator temp=it;
     ++it;
     delete  *temp;

code/trunk/src/network/GamestateClient.h

@@ -42 +42 @@
 
 #include <map>
-// 
+//
 #include "NetworkPrereqs.h"
 #include "core/CorePrereqs.h"
@@ -58 +58 @@
     GamestateClient();
     ~GamestateClient();
-    
+
     bool add(packet::Gamestate *gs, int clientID);
     bool ack(int gamestateID, int clientID);
-    
+
     int processGamestates();
     packet::Gamestate *getGamestate();
@@ -67 +67 @@
   private:
     bool processGamestate(packet::Gamestate *gs);
-    void removeObject(orxonox::Iterator<Synchronisable> &it);
+    void removeObject(orxonox::ObjectListIterator<Synchronisable> &it);
     void printGamestateMap();
     bool saveShipCache();
@@ -78 +78 @@
     orxonox::SpaceShip *myShip_;
     unsigned char *shipCache_;
-    
+
   };
 

code/trunk/src/network/Server.cc

@@ -50 +50 @@
 #include "objects/SpaceShip.h"
 #include "core/ConsoleCommand.h"
+#include "core/Iterator.h"
 #include "packet/Chat.h"
 #include "packet/Packet.h"
@@ -58 +59 @@
   #define MAX_FAILURES 20;
   #define NETWORK_FREQUENCY 30
-  
+
   /**
   * Constructor for default values (bindaddress is set to ENET_HOST_ANY
@@ -68 +69 @@
     gamestates_ = new GamestateManager();
   }
-  
+
   Server::Server(int port){
     timeSinceLastUpdate_=0;
@@ -123 +124 @@
     return message->process();
   }
-  
+
   /**
   * This function sends out a message to all clients
@@ -175 +176 @@
     return;
   }
-  
+
   bool Server::queuePacket(ENetPacket *packet, int clientID){
     return connection->addPacket(packet, clientID);
@@ -230 +231 @@
     return p->process();
   }
-  
+
   /**
   * sends the gamestate
@@ -261 +262 @@
       assert(gs->compressData());
       if ( !gs->send() ){
-        COUT(3) << "Server: packet with client id (cid): " << cid << " not sended: " << temp->getFailures() << std::endl; 
+        COUT(3) << "Server: packet with client id (cid): " << cid << " not sended: " << temp->getFailures() << std::endl;
         temp->addFailure();
       }else
@@ -276 +277 @@
     return true;
   }
-  
+
 //   void Server::processChat( chat *data, int clientId){
 //     char *message = new char [strlen(data->message)+10+1];
@@ -286 +287 @@
 //     delete data;
 //   }
-  
+
   bool Server::addClient(ENetEvent *event){
     ClientInformation *temp = ClientInformation::insertBack(new ClientInformation);
@@ -303 +304 @@
     return createClient(temp->getID());
   }
-  
+
   bool Server::createClient(int clientID){
     ClientInformation *temp = ClientInformation::findClient(clientID);
@@ -325 +326 @@
     return true;
   }
-  
+
   bool Server::createShip(ClientInformation *client){
     if(!client)
@@ -351 +352 @@
     no->create();
     no->setBacksync(true);
-    
+
     return true;
   }
-  
+
   bool Server::disconnectClient(ENetEvent *event){
     COUT(4) << "removing client from list" << std::endl;
     //return removeClient(head_->findClient(&(peer->address))->getID());
-    
+
     //boost::recursive_mutex::scoped_lock lock(head_->mutex_);
-    orxonox::Iterator<orxonox::SpaceShip> it = orxonox::ObjectList<orxonox::SpaceShip>::start();
+    orxonox::ObjectList<orxonox::SpaceShip>::iterator it = orxonox::ObjectList<orxonox::SpaceShip>::begin();
     ClientInformation *client = ClientInformation::findClient(&event->peer->address);
     if(!client)
@@ -369 +370 @@
         continue;
       }
-      orxonox::Iterator<orxonox::SpaceShip> temp=it;
+      orxonox::ObjectList<orxonox::SpaceShip>::iterator temp=it;
       ++it;
       delete  *temp;
@@ -386 +387 @@
     gamestates_->removeClient(client);
   }
-  
+
 }

code/trunk/src/network/Synchronisable.h

@@ -92 +92 @@
     Synchronisable();
   private:
-    /*  bool removeObject(Iterator<Synchronisable> it);*/
+    /*  bool removeObject(ObjectList<Synchronisable>::iterator it);*/
 
     std::list<synchronisableVariable *> *syncList;

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

@@ -30 +30 @@
 #include "network/ClientInformation.h"
 #include "network/GamestateHandler.h"
+#include "core/Iterator.h"
 
 #include <zlib.h>
@@ -79 +80 @@
   unsigned char *mem=data_;
   mem+=sizeof(GamestateHeader);
-  orxonox::Iterator<Synchronisable> it;
-  for(it = orxonox::ObjectList<Synchronisable>::start(); it; ++it){
+  orxonox::ObjectList<Synchronisable>::iterator it;
+  for(it = orxonox::ObjectList<Synchronisable>::begin(); it; ++it){
     tempsize=it->getSize2(mode);
 
@@ -86 +87 @@
       // start allocate additional memory
       COUT(3) << "G.St.Man: need additional memory" << std::endl;
-      orxonox::Iterator<Synchronisable> temp = it;
+      orxonox::ObjectList<Synchronisable>::iterator temp = it;
       int addsize=tempsize;
       while(++temp)
@@ -124 +125 @@
   unsigned char *mem=data_+sizeof(GamestateHeader);
     // get the start of the Synchronisable list
-  orxonox::Iterator<Synchronisable> it=orxonox::ObjectList<Synchronisable>::start();
+  orxonox::ObjectList<Synchronisable>::iterator it=orxonox::ObjectList<Synchronisable>::begin();
 
   while(mem < data_+sizeof(GamestateHeader)+HEADER->normsize){
@@ -318 +319 @@
   int size=0;
     // get the start of the Synchronisable list
-  orxonox::Iterator<Synchronisable> it;
+  orxonox::ObjectList<Synchronisable>::iterator it;
     // get total size of gamestate
-  for(it = orxonox::ObjectList<Synchronisable>::start(); it; ++it)
+  for(it = orxonox::ObjectList<Synchronisable>::begin(); it; ++it)
     size+=it->getSize2(mode); // size of the actual data of the synchronisable
 //  size+=sizeof(GamestateHeader);
@@ -331 +332 @@
  * @return iterator pointing to the next object in the list
  */
-  void Gamestate::removeObject(orxonox::Iterator<Synchronisable> &it) {
-    orxonox::Iterator<Synchronisable> temp=it;
+  void Gamestate::removeObject(orxonox::ObjectList<Synchronisable>::iterator &it) {
+    orxonox::ObjectList<Synchronisable>::iterator temp=it;
     ++it;
     delete  *temp;

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

@@ -38 +38 @@
 
 namespace packet {
-  
+
 struct GamestateHeader{
   ENUM::Type packetType;
@@ -51 +51 @@
 
 /**
-        @author 
+        @author
 */
 class Gamestate: public Packet{
@@ -57 +57 @@
     Gamestate();
     Gamestate(unsigned char *data, int clientID);
-    
+
     ~Gamestate();
-    
+
     bool collectData(int id, int mode=0x0);
     bool spreadData(int mode=0x0);
@@ -69 +69 @@
     bool compressData();
     bool decompressData();
-    
+
     // Packet functions
     virtual unsigned int getSize() const;
     virtual bool process();
 
-    
+
   private:
     unsigned int calcGamestateSize(int mode=0x0);
-    void removeObject(orxonox::Iterator<Synchronisable> &it);
+    void removeObject(orxonox::ObjectListIterator<Synchronisable> &it);
 
-    
+
     //Bytestream *bs_;
     //GamestateHeader *header_;