Changeset 9420 in orxonox.OLD

Timestamp:

Jul 24, 2006, 1:42:23 PM (18 years ago)

Author:

patrick

Message:

reconnection setup switch

File:

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

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

@@ -535 +535 @@
                 this->handleReconnect( it->second.userId);
 
-              PRINTF(0)("redirection: %i\n\n\n", it->second.handshake->redirect());
-
               // create the new network game manager and init it
               this->networkGameManager = NetworkGameManager::getInstance();
@@ -606 +604 @@
 void NetworkStream::handleReconnect(int userId)
 {
+
+  PeerInfo* pInfo = &this->peers[userId];
+
   PRINTF(0)("===============================================\n");
   PRINTF(0)("Client is redirected to the other proxy servers\n");
+  PRINTF(0)("  connecting to: %s\n", pInfo->handshake->getProxy1Address().ipString().c_str());
   PRINTF(0)("===============================================\n");
-
-  return;
-
-  PeerInfo* pInfo = &this->peers[userId];
 
   // reject the server
@@ -620 +618 @@
   pInfo->lastAckedState = 0;
   pInfo->lastRecvedState = 0;
+
+  // temp save the ip address here
+  IP proxyIP = pInfo->handshake->getProxy1Address();
+
   // not sure if this works as expected
   if( pInfo->handshake)
@@ -625 +627 @@
 
   // disconnect from the current server and reconnect to proxy server
-  pInfo->socket->reconnectToServer( pInfo->handshake->getProxy1Address().ipString(), pInfo->handshake->getProxy1Address().port());
+  pInfo->socket->reconnectToServer( proxyIP.ipString(), proxyIP.port());
 
   // and restart the handshake