Changeset 1639 for code/trunk/src/network

Timestamp:

Jul 20, 2008, 7:57:16 PM (16 years ago)

Author:

rgrieder

Message:

merged nico's fixes for gcc 4.3 back to trunk.
I'm not going to delete branch yet.

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/network/GameStateManager.cc (modified) (14 diffs)
• src/network/PacketDecoder.cc (modified) (1 diff)
• src/network/Synchronisable.cc (modified) (9 diffs)

code/trunk/src/network/GameStateManager.cc

@@ -45 +45 @@
 #include <zlib.h>
 #include <assert.h>
+#include <string.h>
 
 #include "core/CoreIncludes.h"
@@ -70 +71 @@
     return;
   }
-  
+
   void GameStateManager::addGameState(GameStateCompressed *gs, int clientID){
     if(!gs)
@@ -83 +84 @@
     return;
   }
-  
+
   void GameStateManager::processGameStates(){
     std::map<int, GameStateCompressed*>::iterator it;
@@ -93 +94 @@
     gameStateQueue.clear();
   }
-  
-  
+
+
   /**
    * this function is used to keep the memory usage low
    * it tries to delete all the unused gamestates
-   * 
-   * 
+   *
+   *
    */
   void GameStateManager::cleanup(){
@@ -142 +143 @@
       GameState *server = reference;
       //COUT(4) << "client: " << client << " server: " << server << " gamestatemap: " << &gameStateMap << " size: " << server->size << std::endl;
-      COUT(4) << "client: " << (client!=0 ? client->id : (int)client) << " server: " << server->id << " gamestatemap: " << &gameStateMap << " size: " << server->size << std::endl;
+      //FIXME complains about precision loss on int conversion
+//       COUT(4) << "client: " << (client!=0 ? client->id : (int)client) << " server: " << server->id << " gamestatemap: " << &gameStateMap << " size: " << server->size << std::endl;
       if(client)
         return encode(client, server);
@@ -155 +157 @@
     }
   }
-  
+
   bool GameStateManager::pushGameState( GameStateCompressed *gs, int clientID ){
     GameState *ugs = decompress(gs);
@@ -308 +310 @@
     return true;
   }
-  
-  
+
+
   //##### ADDED FOR TESTING PURPOSE #####
   GameStateCompressed* GameStateManager::testCompress( GameState* g ) {
@@ -405 +407 @@
     switch ( retval ) {
       case Z_OK: COUT(5) << "G.St.Man: compress: successfully compressed" << std::endl; break;
-      case Z_MEM_ERROR: COUT(1) << "G.St.Man: compress: not enough memory available in gamestate.compress" << std::endl; 
+      case Z_MEM_ERROR: COUT(1) << "G.St.Man: compress: not enough memory available in gamestate.compress" << std::endl;
       return NULL;
       case Z_BUF_ERROR: COUT(2) << "G.St.Man: compress: not enough memory available in the buffer in gamestate.compress" << std::endl;
@@ -426 +428 @@
     return compressedGamestate;
   }
-  
+
   GameState *GameStateManager::decompress(GameStateCompressed *a) {
     //COUT(4) << "GameStateClient: uncompressing gamestate. id: " << a->id << ", baseid: " << a->base_id << ", normsize: " << a->normsize << ", compsize: " << a->compsize << std::endl;
@@ -464 +466 @@
     return gamestate;
   }
-  
+
 
   void GameStateManager::ackGameState(int clientID, int gamestateID) {
@@ -471 +473 @@
       return;
     int curid = temp->getGamestateID();
-    
+
     if(gamestateID == GAMESTATEID_INITIAL){
       temp->setGameStateID(GAMESTATEID_INITIAL);
@@ -481 +483 @@
     }
     if(curid > gamestateID)
-      // the network packets got messed up 
+      // the network packets got messed up
       return;
     COUT(4) << "acking gamestate " << gamestateID << " for clientid: " << clientID << " curid: " << curid << std::endl;
@@ -512 +514 @@
     return true;
   }
-  
+
   bool GameStateManager::checkAccess(int clientID, int objectID){
     // currently we only check, wheter the object is the clients spaceship
@@ -518 +520 @@
     return true; // TODO: change this
   }
-  
+
   void GameStateManager::removeClient(ClientInformation* client){
     if(!client)

code/trunk/src/network/PacketDecoder.cc

@@ -39 +39 @@
 
 #include <iostream>
+#include <string.h>
 
 #include "core/Debug.h"

code/trunk/src/network/Synchronisable.cc

@@ -43 +43 @@
 #include <string>
 #include <iostream>
+#include <string.h>
 
 #include "core/CoreIncludes.h"
@@ -49 +50 @@
 namespace network
 {
-  
-  
+
+
   int Synchronisable::state_=0x1; // detemines wheter we are server (default) or client
-  
+
   /**
   * Constructor:
@@ -72 +73 @@
         delete (*it)->callback;
   }
-  
+
   bool Synchronisable::create(){
     this->classID = this->getIdentifier()->getNetworkID();
@@ -78 +79 @@
     return true;
   }
-  
+
   void Synchronisable::setClient(bool b){
     if(b) // client
@@ -97 +98 @@
     temp->size = size;
     temp->var = var;
-    temp->mode = mode; 
+    temp->mode = mode;
     temp->type = t;
     temp->callback = cb;
-    COUT(5) << "Syncronisable::registering var with size: " << temp->size << " and type: " << temp->type << std::endl; 
+    COUT(5) << "Syncronisable::registering var with size: " << temp->size << " and type: " << temp->type << std::endl;
     // increase datasize
     datasize+=sizeof(int)+size;
@@ -187 +188 @@
       switch((*i)->type){
       case DATA:
-        std::memcpy( (void *)(retVal.data+n), (void*)((*i)->var), (*i)->size);
+        memcpy( (void *)(retVal.data+n), (void*)((*i)->var), (*i)->size);
         n+=(*i)->size;
         break;
@@ -194 +195 @@
         n+=sizeof(int);
         const char *data = ( ( *(std::string *) (*i)->var).c_str());
-        std::memcpy( retVal.data+n, (void*)data, (*i)->size);
+        memcpy( retVal.data+n, (void*)data, (*i)->size);
         COUT(5) << "synchronisable: char: " << (const char *)(retVal.data+n) << " data: " << data << " string: " << *(std::string *)((*i)->var) << std::endl;
         n+=(*i)->size;
@@ -278 +279 @@
     return tsize;
   }
-  
+
   void Synchronisable::setBacksync(bool sync){
     backsync_=sync;
@@ -286 +287 @@
     return backsync_;
   }
-  
+
 }