Changeset 1261

Timestamp:

May 12, 2008, 11:44:01 PM (17 years ago)

Author:

scheusso

Message:

fixed a 'bug' in WE-Model-Spaceship

Location:

code/branches/network3

Files:

• TODO (added)
• cmake/FindBoost.cmake (modified) (1 diff)
• src/network/ClientConnection.cc (modified) (1 diff)
• src/network/ClientConnection.h (modified) (1 diff)
• src/network/ClientInformation.h (modified) (1 diff)
• src/network/ConnectionManager.cc (modified) (2 diffs)
• src/network/ConnectionManager.h (modified) (2 diffs)
• src/network/GameStateManager.cc (modified) (1 diff)
• src/network/GameStateManager.h (modified) (1 diff)
• src/network/Server.cc (modified) (3 diffs)
• src/network/Server.h (modified) (1 diff)
• src/orxonox/Main.cc (modified) (1 diff)
• src/orxonox/Orxonox.cc (modified) (1 diff)
• src/orxonox/objects/SpaceShip.cc (modified) (1 diff)
• src/orxonox/objects/WorldEntity.cc (modified) (2 diffs)
• src/orxonox/particle/ParticleInterface.cc (modified) (1 diff)

code/branches/network3/cmake/FindBoost.cmake

@@ -101 +101 @@
 # Add in some path suffixes. These will have to be updated whenever a new Boost version comes out.
 SET(SUFFIX_FOR_PATH
+ boost
  boost-1_34_1
  boost-1_34_0

code/branches/network3/src/network/ClientConnection.cc

@@ -112 +112 @@
     if(server==NULL)
       return false;
-    if(!packet){
-      COUT(4) << "Cl.con: addpacket: invalid packet" << std::endl;
+    if(packet==NULL){
+      COUT(3) << "Cl.con: addpacket: invalid packet" << std::endl;
       return false;
     }

code/branches/network3/src/network/ClientConnection.h

@@ -53 +53 @@
 #define NETWORK_PORT 55556
 #define NETWORK_CLIENT_MAX_CONNECTIONS 5
-#define NETWORK_CLIENT_TIMEOUT 10
+#define NETWORK_CLIENT_TIMEOUT 100
 #define NETWORK_SEND_WAIT 5
 #define NETWORK_CLIENT_CHANNELS 2

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

@@ -92 +92 @@
 
     bool head;
+    unsigned short failures_;
 
   private:

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

@@ -191 +191 @@
           //std::cout << "received data" << std::endl;
           COUT(5) << "Con.Man: receive event has occured" << std::endl;
-          processData(event);
+          // only add, if client has connected yet and not been disconnected
+          if(head_->findClient(&event->peer->address))
+            processData(event);
           break;
         case ENET_EVENT_TYPE_DISCONNECT:
@@ -354 +356 @@
   }
   
+  bool ConnectionManager::removeShip(ClientInformation *client){
+    int id=client->getShipID();
+    orxonox::Iterator<orxonox::SpaceShip> it;
+    for(it = orxonox::ObjectList<orxonox::SpaceShip>::start(); it; ++it){
+      if(it->objectID!=id)
+        continue;
+      delete *it;
+    }
+    return true;
+  }
+  
   bool ConnectionManager::sendWelcome(int clientID, int shipID, bool allowed){
     addPacket(packet_gen.generateWelcome(clientID, shipID, allowed),clientID);
     sendPackets();
     return true;
+  }
+  
+  void ConnectionManager::disconnectClient(ClientInformation *client){
+    enet_peer_disconnect(client->getPeer(), 0);
+    removeShip(client);
   }
   

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

@@ -86 +86 @@
     bool sendPackets();
     bool createClient(int clientID);
+    void disconnectClient(ClientInformation *client);
 
   private:
@@ -99 +100 @@
     ENetPeer *getClientPeer(int clientID);
     bool createShip(ClientInformation *client);
+    bool removeShip(ClientInformation *client);
     bool sendWelcome(int clientID, int shipID, bool allowed);
     bool addFakeConnectRequest(ENetEvent *ev);

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

@@ -449 +449 @@
     return true; // TODO: change this
   }
+  
+  void GameStateManager::removeClient(ClientInformation* client){
+    gameStateUsed[client->getGamestateID()]--;
+    head_->removeClient(client->getID());
+  }
 
 }

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

@@ -76 +76 @@
     bool pushGameState(GameStateCompressed *gs, int clientID);
     void ackGameState(int clientID, int gamestateID);
+    void removeClient(ClientInformation *client);
   private:
     void cleanup(); // "garbage handler"

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

@@ -53 +53 @@
 namespace network
 {
+  
+  
+#define MAX_FAILURES 20;
+  
+  
   /**
   * Constructor for default values (bindaddress is set to ENET_HOST_ANY
@@ -205 +210 @@
       }
       //std::cout << "adding gamestate" << std::endl;
-      if ( !(connection->addPacket(packet_gen.gstate(gs), cid)) )
-        COUT(4) << "Server: packet with client id (cid): " << cid << " not sended" << std::endl; 
+      if ( !(connection->addPacket(packet_gen.gstate(gs), cid)) ){
+        COUT(3) << "Server: packet with client id (cid): " << cid << " not sended: " << temp->failures_ << std::endl; 
+        temp->failures_++;
+        if(temp->failures_ > 20 )
+          disconnectClient(temp);
       //std::cout << "added gamestate" << std::endl;
+      }
       added=true;
       temp=temp->next();
@@ -240 +249 @@
     if(!gamestates->pushGameState(data, clientID))
         COUT(3) << "Could not push gamestate\t\t\t\t=====" << std::endl;
-  }
-
+    else
+        clients->findClient(clientID)->failures_=0;
+  }
+
+  void Server::disconnectClient(int clientID){
+    ClientInformation *client = clients->findClient(clientID);
+    disconnectClient(client);
+  }
+  void Server::disconnectClient( ClientInformation *client){
+    connection->disconnectClient(client);
+    gamestates->removeClient(client);
+  }
+  
 }

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

@@ -71 +71 @@
     void updateGamestate();
   private:
+    void disconnectClient(int clientID);
+    void disconnectClient( ClientInformation *client);
     bool sendGameState();
     void processAck( ack *data, int clientID);

code/branches/network3/src/orxonox/Main.cc

@@ -75 +75 @@
 {
   try {
-    //SignalHandler::getInstance()->doCatch(argv[0], "orxonox.log");
+    SignalHandler::getInstance()->doCatch(argv[0], "orxonox.log");
     Orxonox* orx = Orxonox::getSingleton();
 

code/branches/network3/src/orxonox/Orxonox.cc

@@ -494 +494 @@
       ogreRoot._fireFrameEnded(evt);
           }
+    if(mode_==CLIENT)
+      network::Client::getSingleton()->closeConnection();
+    else if(mode_==SERVER)
+      server_g->close();
   }
 

code/branches/network3/src/orxonox/objects/SpaceShip.cc

@@ -113 +113 @@
     SpaceShip::~SpaceShip()
     {
-        if (this->tt_)
+        if (this->tt_){
             delete this->tt_;
+        }
     }
 

code/branches/network3/src/orxonox/objects/WorldEntity.cc

@@ -75 +75 @@
     WorldEntity::~WorldEntity()
     {
+      // just to make sure we clean out all scene nodes
+      this->getNode()->removeAndDestroyAllChildren();
     }
 
@@ -207 +209 @@
       registerVar( (void*) &(this->getOrientation().z), sizeof(this->getOrientation().z), network::DATA, 0x3);
       // register velocity_
-      registerVar( (void*) &(this->getVelocity().x), sizeof(this->getVelocity().x), network::DATA, 0x3);
-      registerVar( (void*) &(this->getVelocity().y), sizeof(this->getVelocity().y), network::DATA, 0x3);
-      registerVar( (void*) &(this->getVelocity().z), sizeof(this->getVelocity().z), network::DATA, 0x3);
-      // register rotationAxis/rate
-      registerVar( (void*) &(this->getRotationRate()), sizeof(this->getRotationRate()), network::DATA, 0x3);
-      registerVar( (void*) &(this->getRotationAxis().x), sizeof(this->getRotationAxis().x), network::DATA, 0x3);
-      registerVar( (void*) &(this->getRotationAxis().y), sizeof(this->getRotationAxis().y), network::DATA, 0x3);
-      registerVar( (void*) &(this->getRotationAxis().z), sizeof(this->getRotationAxis().z), network::DATA, 0x3);
+//       registerVar( (void*) &(this->getVelocity().x), sizeof(this->getVelocity().x), network::DATA, 0x3);
+//       registerVar( (void*) &(this->getVelocity().y), sizeof(this->getVelocity().y), network::DATA, 0x3);
+//       registerVar( (void*) &(this->getVelocity().z), sizeof(this->getVelocity().z), network::DATA, 0x3);
+//       // register rotationAxis/rate
+//       registerVar( (void*) &(this->getRotationRate()), sizeof(this->getRotationRate()), network::DATA, 0x3);
+//       registerVar( (void*) &(this->getRotationAxis().x), sizeof(this->getRotationAxis().x), network::DATA, 0x3);
+//       registerVar( (void*) &(this->getRotationAxis().y), sizeof(this->getRotationAxis().y), network::DATA, 0x3);
+//       registerVar( (void*) &(this->getRotationAxis().z), sizeof(this->getRotationAxis().z), network::DATA, 0x3);
       // register scale of node
       registerVar( (void*) &(this->getScale().x), sizeof(this->getScale().x), network::DATA, 0x3);

code/branches/network3/src/orxonox/particle/ParticleInterface.cc

@@ -63 +63 @@
   ParticleInterface::~ParticleInterface(void)
   {
+    while(particleSystem_->getNumEmitters()>0)
+      particleSystem_->removeEmitter(particleSystem_->getNumEmitters()-1);
     sceneManager_->destroyParticleSystem(particleSystem_);
   }