Changeset 1360 for code/trunk/src/network/ConnectionManager.cc

Timestamp:

May 22, 2008, 2:02:06 PM (16 years ago)

Author:

rgrieder

Message:

merged merge branch back to trunk

File:

• code/trunk/src/network/ConnectionManager.cc (modified) (16 diffs)

code/trunk/src/network/ConnectionManager.cc

@@ -101 +101 @@
     ENetPacket *packet=getPacket(address);
     ClientInformation *temp =head_->findClient(&address);
+    if(!temp)
+      return NULL;
     clientID=temp->getID();
     return packet;
@@ -124 +126 @@
 
   bool ConnectionManager::addPacket(ENetPacket *packet, ENetPeer *peer) {
-    if(enet_peer_send(peer, (enet_uint8)head_->findClient(&(peer->address))->getID() , packet)!=0)
+    ClientInformation *temp = head_->findClient(&(peer->address));
+    if(!temp)
+      return false;
+    if(enet_peer_send(peer, (enet_uint8)temp->getID() , packet)!=0)
       return false;
     return true;
@@ -130 +135 @@
 
   bool ConnectionManager::addPacket(ENetPacket *packet, int clientID) {
-    if(enet_peer_send(head_->findClient(clientID)->getPeer(), (enet_uint8)clientID, packet)!=0)
+    ClientInformation *temp = head_->findClient(clientID);
+    if(!temp)
+      return false;
+    if(enet_peer_send(temp->getPeer(), (enet_uint8)clientID, packet)!=0)
       return false;
     return true;
@@ -185 +193 @@
           addClient(event);
           //this is a workaround to ensure thread safety
-          /*if(!addFakeConnectRequest(&event))
-            COUT(3) << "Problem pushing fakeconnectRequest to queue" << std::endl;*/
           COUT(5) << "Con.Man: connection event has occured" << std::endl;
           break;
@@ -195 +201 @@
           if(head_->findClient(&event->peer->address))
             processData(event);
+          else
+            COUT(3) << "received a packet from a client we don't know" << std::endl;
           break;
         case ENET_EVENT_TYPE_DISCONNECT:
@@ -200 +208 @@
           break;
         case ENET_EVENT_TYPE_NONE:
+          receiverThread_->yield();
           break;
       }
@@ -233 +242 @@
       case ENET_EVENT_TYPE_DISCONNECT:
         COUT(4) << "disconnecting all clients" << std::endl;
-        delete head_->findClient(&(event.peer->address));
+        if(head_->findClient(&(event.peer->address)))
+          delete head_->findClient(&(event.peer->address));
         //maybe needs bugfix: might also be a reason for the server to crash
         temp = temp->next();
@@ -259 +269 @@
   bool ConnectionManager::addClient(ENetEvent *event) {
     ClientInformation *temp = head_->insertBack(new ClientInformation);
-    if(temp->prev()->head) { //not good if you use anything else than insertBack
+    if(!temp){
+      COUT(2) << "Conn.Man. could not add client" << std::endl;
+      return false;
+    }
+    if(temp->prev()->getHead()) { //not good if you use anything else than insertBack
       temp->prev()->setID(0); //bugfix: not necessary but usefull
       temp->setID(1);
@@ -266 +280 @@
       temp->setID(temp->prev()->getID()+1);
     temp->setPeer(event->peer);
-    COUT(4) << "Con.Man: added client id: " << temp->getID() << std::endl;
+    COUT(3) << "Con.Man: added client id: " << temp->getID() << std::endl;
     return true;
   }
@@ -283 +297 @@
 
   void ConnectionManager::syncClassid(int clientID) {
-    unsigned int network_id=0;
+    unsigned int network_id=0, failures=0;
     std::string classname;
     orxonox::Identifier *id;
@@ -293 +307 @@
       classname = id->getName();
       network_id = id->getNetworkID();
+      if(network_id==0)
+        COUT(3) << "we got a null class id: " << id->getName() << std::endl;
       COUT(4) << "Con.Man:syncClassid:\tnetwork_id: " << network_id << ", classname: " << classname << std::endl;
 
-      addPacket(packet_gen.clid( (int)network_id, classname ), clientID);
-
+      while(!addPacket(packet_gen.clid( (int)network_id, classname ), clientID) && failures < 10){
+        failures++;
+      }
       ++it;
     }
@@ -305 +322 @@
   bool ConnectionManager::createClient(int clientID){
     ClientInformation *temp = head_->findClient(clientID);
+    if(!temp){
+      COUT(2) << "Conn.Man. could not create client with id: " << clientID << std::endl;
+      return false;
+    }
     COUT(4) << "Con.Man: creating client id: " << temp->getID() << std::endl;
     syncClassid(temp->getID());
     COUT(4) << "creating spaceship for clientid: " << temp->getID() << std::endl;
     // TODO: this is only a hack, untill we have a possibility to define default player-join actions
-    createShip(temp);
-    COUT(4) << "created spaceship" << std::endl;
+    if(!createShip(temp))
+      COUT(2) << "Con.Man. could not create ship for clientid: " << clientID << std::endl;
+    else
+      COUT(3) << "created spaceship" << std::endl;
     temp->setSynched(true);
-    COUT(4) << "sending welcome" << std::endl;
+    COUT(3) << "sending welcome" << std::endl;
     sendWelcome(temp->getID(), temp->getShipID(), true);
     return true;
@@ -319 +342 @@
   bool ConnectionManager::removeClient(int clientID){
     orxonox::Iterator<orxonox::SpaceShip> it = orxonox::ObjectList<orxonox::SpaceShip>::start();
+    ClientInformation *client = head_->findClient(clientID);
+    if(!client)
+      return false;
     while(it){
-      if(it->objectID!=head_->findClient(clientID)->getShipID()){
+      if(it->objectID!=client->getShipID()){
         ++it;
         continue;
@@ -333 +359 @@
   
   bool ConnectionManager::createShip(ClientInformation *client){
+    if(!client)
+      return false;
     orxonox::Identifier* id = ID("SpaceShip");
     if(!id){
@@ -351 +379 @@
     no->setRotDamp(1.0);
     no->setCamera("cam_"+client->getID());
+    no->classID = id->getNetworkID();
     no->create();
     
@@ -369 +398 @@
   
   bool ConnectionManager::sendWelcome(int clientID, int shipID, bool allowed){
-    addPacket(packet_gen.generateWelcome(clientID, shipID, allowed),clientID);
-    sendPackets();
-    return true;
+    if(addPacket(packet_gen.generateWelcome(clientID, shipID, allowed),clientID)){
+      sendPackets();
+      return true;
+    }else
+      return false;
   }