Changeset 446

Timestamp:

Dec 9, 2007, 8:44:04 PM (16 years ago)

Author:

scheusso

Message:

corrected clientinformation::removeClient(enet event)

Location:

code/branches/FICN/src/network

Files:

• ClientInformation.cc (modified) (2 diffs)
• ConnectionManager.cc (modified) (2 diffs)
• dummyclient2.cc (modified) (1 diff)
• dummyclient3.cc (modified) (1 diff)
• dummyserver3.cc (modified) (1 diff)

code/branches/FICN/src/network/ClientInformation.cc

@@ -143 +143 @@
 bool ClientInformation::removeClient(ENetPeer *peer){
   ClientInformation *temp = this;
-  while(temp!=0 && (temp->getPeer()->address.host!=peer->address.host || temp->getPeer()->address.port!=peer->address.port))
+  while(temp!=0){
+    if(!temp->head)
+      if(temp->getPeer()->address.host==peer->address.host && temp->getPeer()->address.port==peer->address.port)
+        break;
     temp = temp->next();
+  }
   if(temp==0)
     return false;
@@ -159 +163 @@
 ClientInformation *ClientInformation::findClient(int clientID, bool look_backwards){
   ClientInformation *temp = this;
-  while(temp!=0 && temp->getID()!=clientID)
+  while(temp!=0 && temp->getID()!=clientID){
+    if (temp->head)
+      continue;
     temp = temp->next();
+  }
   // returns 0 if nothing has been found
   return temp;

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

@@ -55 +55 @@
   ENetPacket *ConnectionManager::getPacket(int &clientID){
     ENetAddress address;
-    ENetPacket *packet=getPacket(address);std::cout << "searching clientid " << head_->getID() << std::endl;
+    ENetPacket *packet=getPacket(address);
     ClientInformation *temp =head_->findClient(&address);
-    std::cout << "searching clientid " << temp << std::endl;
     clientID=temp->getID();
     return packet;
@@ -141 +140 @@
         break;
       case ENET_EVENT_TYPE_RECEIVE:
+        std::cout << "received data" << std::endl;
         processData(&event);
         break;

code/branches/FICN/src/network/dummyclient2.cc

@@ -49 +49 @@
 //    usleep(1000000);
   }
-
+  usleep(1000000);
         // now disconnect
   if(client.closeConnection())

code/branches/FICN/src/network/dummyclient3.cc

@@ -26 +26 @@
           std::getline( std::cin, str );
           client.sendChat( str );
+          std::cout << "send message" << std::endl;
   }
 }

code/branches/FICN/src/network/dummyserver3.cc

@@ -37 +37 @@
 
 void dummyserver3::tick(){
-  Server::processQueue();
+  processQueue();
 }