Changeset 9440 in orxonox.OLD for branches

Timestamp:

Jul 24, 2006, 5:28:15 PM (18 years ago)

Author:

patrick

Message:

peers get deleted correctly now

File:

• branches/proxy/src/lib/network/network_stream.cc (modified) (4 diffs)

branches/proxy/src/lib/network/network_stream.cc

@@ -324 +324 @@
   {
     // check if the connection is ok else terminate and remove
-    if ( peers[0].socket && ( !peers[0].socket->isOk() || peers[0].connectionMonitor->hasTimedOut() ) )
+    if ( !peers.empty() && peers[0].socket && ( !peers[0].socket->isOk() || peers[0].connectionMonitor->hasTimedOut() ) )
     {
       this->handleDisconnect( 0);
@@ -333 +333 @@
     {
       this->handleReconnect( 0);
+    }
+
+    PRINTF(0)("node count: %i\n", peers.size());
+    for ( PeerList::iterator it = peers.begin(); it != peers.end(); it++ )
+    {
+      PRINTF(0)("still got peer: %s\n", it->second.ip.ipString().c_str());
     }
   }
@@ -637 +643 @@
 //   pInfo->socket->reconnectToServer( proxyIP.ipString(), proxyIP.port());
   this->handleDisconnect( userId);
-  this->connectToProxyServer(proxyIP.ipString(), 9999);
+//   this->connectToProxyServer(proxyIP.ipString(), 9999);
 #warning the ports are not yet integrated correctly in the ip class
 
@@ -673 +679 @@
   this->freeSocketSlots.push_back( userId );
 
-  peers.erase( userId );
+  PRINTF(0)("nodes: %i\n", peers.size());
+  peers.erase( userId);
+  PRINTF(0)("nodes: %i\n", peers.size());
 
 //   this->pInfo->userId = 0;