Changeset 9601 in orxonox.OLD for branches/proxy/src/lib/network/network_stream.cc

Timestamp:

Jul 29, 2006, 10:09:02 AM (18 years ago)

Author:

patrick

Message:

forced reconnections are now registrated and handled

File:

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

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

@@ -717 +717 @@
   PeerInfo* pInfo = &this->peers[userId];
 
+  IP proxyIP;
+  if( this->networkMonitor->isForcedReconnection())
+    proxyIP = this->networkMonitor->getForcedReconnectionIP();
+  else
+    proxyIP = pInfo->handshake->getProxy1Address();
+
   PRINTF(0)("===============================================\n");
   PRINTF(0)("Client is redirected to the other proxy servers\n");
   PRINTF(0)("  user id: %i\n", userId);
-  PRINTF(0)("  connecting to: %s\n", this->networkMonitor->getFirstChoiceProxy()->ip.ipString().c_str());
+  PRINTF(0)("  connecting to: %s\n", proxyIP.ipString().c_str());
   PRINTF(0)("===============================================\n");
 
@@ -726 +732 @@
   pInfo->lastAckedState = 0;
   pInfo->lastRecvedState = 0;
-
-  // temp save the ip address here
-  IP proxyIP = pInfo->handshake->getProxy1Address();
 
   // disconnect from the current server and reconnect to proxy server
@@ -748 +751 @@
 void NetworkStream::reconnectToServer(IP address)
 {
-
+  this->networkMonitor->setForcedReconnection(address);
+  this->handleReconnect( NET_ID_MASTER_SERVER);
 }
 
@@ -759 +763 @@
 void NetworkStream::softReconnectToServer(IP address)
 {
-
+  this->networkMonitor->setForcedReconnection(address);
+  this->handleReconnect( NET_ID_MASTER_SERVER);
 }