Changeset 9446 in orxonox.OLD for branches/proxy

Timestamp:

Jul 25, 2006, 9:31:01 AM (18 years ago)

Author:

patrick

Message:

cleanup of the code

File:

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

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

@@ -185 +185 @@
 {
   int node = this->peers.size();
+  // this create the new node in the peers map
   this->peers[node].socket = new UdpSocket( host, port );
   this->peers[node].userId = 0;
@@ -331 +332 @@
       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());
-    }
   }
 
@@ -380 +375 @@
           clientId = it->first + 1;
     }
+    // this creates a new entry in the peers list
     peers[clientId].socket = tempNetworkSocket;
 
@@ -623 +619 @@
 
   // disconnect from the current server and reconnect to proxy server
-//   pInfo->socket->reconnectToServer( proxyIP.ipString(), proxyIP.port());
   this->handleDisconnect( userId);
   this->connectToProxyServer(proxyIP.ipString(), 9999);
-#warning the ports are not yet integrated correctly in the ip class
+  #warning the ports are not yet integrated correctly in the ip class
 
   // and restart the handshake
-//   this->startHandshake( userId);
+  this->startHandshake( userId);
 }
 
@@ -661 +656 @@
   this->freeSocketSlots.push_back( userId );
 
-  PRINTF(0)("nodes: %i\n", peers.size());
   peers.erase( userId);
-  PRINTF(0)("nodes: %i\n", peers.size());
-
-//   this->pInfo->userId = 0;
-//   this->pInfo->lastAckedState = 0;
-//   this->pInfo->lastRecvedState = 0;
-//   this->pInfo->connectionMonitor = NULL;
-//   this->pInfo->handshake = NULL;
-//   this->pInfo->socket = NULL;
-//   this->pInfo->nodeType = NET_CLIENT;
 }