Changeset 1245 for code/branches/network3/src/network/ConnectionManager.cc

Timestamp:

May 7, 2008, 4:39:42 PM (17 years ago)

Author:

scheusso

Message:

different enhancements in input/network handling and synchronisation

File:

• code/branches/network3/src/network/ConnectionManager.cc (modified) (7 diffs)

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

@@ -165 +165 @@
     enet_initialize();
     atexit(enet_deinitialize);
-    ENetEvent event;
+    ENetEvent *event = new ENetEvent;
     server = enet_host_create(&bindAddress, NETWORK_MAX_CONNECTIONS, 0, 0);
     if(server==NULL){
@@ -174 +174 @@
 
     while(!quit){
-      if(enet_host_service(server, &event, NETWORK_WAIT_TIMEOUT)<0){
+      if(enet_host_service(server, event, NETWORK_WAIT_TIMEOUT)<0){
         // we should never reach this point
         quit=true;
         // add some error handling here ========================
       }
-      switch(event.type){
+      switch(event->type){
         // log handling ================
         case ENET_EVENT_TYPE_CONNECT:
-          addClient(&event);
+          addClient(event);
           //this is a workaround to ensure thread safety
           /*if(!addFakeConnectRequest(&event))
@@ -191 +191 @@
           //std::cout << "received data" << std::endl;
           COUT(5) << "Con.Man: receive event has occured" << std::endl;
-          processData(&event);
+          processData(event);
           break;
         case ENET_EVENT_TYPE_DISCONNECT:
-          // add some error/log handling here
-          clientDisconnect(event.peer);
+          clientDisconnect(event->peer);
           break;
         case ENET_EVENT_TYPE_NONE:
           break;
       }
+//       usleep(1000);
+      //yield(); //TODO: find apropriate
     }
     disconnectClients();
@@ -246 +247 @@
   bool ConnectionManager::clientDisconnect(ENetPeer *peer) {
     COUT(4) << "removing client from list" << std::endl;
-    return head_->removeClient(peer);
+    return removeClient(head_->findClient(&(peer->address))->getID());
   }
 /**
@@ -311 +312 @@
     sendWelcome(temp->getID(), temp->getShipID(), true);
     return true;
+  }
+  
+  bool ConnectionManager::removeClient(int clientID){
+    orxonox::Iterator<orxonox::SpaceShip> it = orxonox::ObjectList<orxonox::SpaceShip>::start();
+    while(it){
+      if(it->objectID!=head_->findClient(clientID)->getShipID()){
+        ++it;
+        continue;
+      }
+      orxonox::Iterator<orxonox::SpaceShip> temp=it;
+      ++it;
+      delete  *temp;
+      return head_->removeClient(clientID);
+    }
+    return false;
   }
   
@@ -335 +351 @@
     
     client->setShipID(no->objectID);
-    no->getFocus();
     return true;
   }
@@ -342 +357 @@
     addPacket(packet_gen.generateWelcome(clientID, shipID, allowed),clientID);
     sendPackets();
+    return true;
   }