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

Timestamp:

Oct 12, 2008, 7:40:47 PM (16 years ago)

Author:

scheusso

Message:

merged network branch back to trunk

File:

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

code/trunk/src/network/ConnectionManager.cc

@@ -81 +81 @@
   boost::recursive_mutex ConnectionManager::enet_mutex;
 
-//   ConnectionManager::ConnectionManager(ClientInformation *head) : receiverThread_(0) {
-//     assert(instance_==0);
-//     instance_=this;
-//     quit=false;
-//     bindAddress.host = ENET_HOST_ANY;
-//     bindAddress.port = NETWORK_PORT;
-//   }
-
   ConnectionManager::ConnectionManager(int port){
     assert(instance_==0);
@@ -114 +106 @@
 
   ConnectionManager::~ConnectionManager(){
-    instance_=0;
     if(!quit)
       quitListener();
-  }
-
-  /*ENetPacket *ConnectionManager::getPacket(ENetAddress &address) {
-    if(!buffer.isEmpty())
-      return buffer.pop(address);
-    else
-      return NULL;
-  }*/
-/**
-This function only pops the first element in PacketBuffer (first in first out)
-used by processQueue in Server.cc
-*/
-  /*ENetPacket *ConnectionManager::getPacket(int &clientID) {
-    ENetAddress address;
-    ENetPacket *packet=getPacket(address);
-    ClientInformation *temp =head_->findClient(&address);
-    if(!temp)
-      return NULL;
-    clientID=temp->getID();
-    return packet;
-  }*/
+    instance_=0;
+  }
+
 
   ENetEvent *ConnectionManager::getEvent(){
@@ -164 +137 @@
   }
 
-//   bool ConnectionManager::addPacket(Packet::Packet *packet){
-//     ClientInformation *temp = instance_->head_->findClient(packet->getClientID());
-//     if(!temp){
-//       COUT(3) << "C.Man: addPacket findClient failed" << std::endl;
-//       return false;
-//     }
-//     ENetPacket *packet = new ENetPacket;
-//     //  TODO: finish implementation
-//   }
-//
 
   bool ConnectionManager::addPacket(ENetPacket *packet, ENetPeer *peer) {
@@ -373 +336 @@
     orxonox::ObjectList<orxonox::SpaceShip>::iterator it;
     for(it = orxonox::ObjectList<orxonox::SpaceShip>::begin(); it; ++it){
-      if(it->objectID!=id)
+      if(it->getObjectID()!=id)
         continue;
       delete *it;