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

Timestamp:

Jul 31, 2006, 3:34:56 AM (19 years ago)

Author:

patrick

Message:

tests in redirection forcing

File:

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

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

@@ -135 +135 @@
 
   this->currentState = 0;
+  this->redirectionUID = NET_ID_MASTER_SERVER;
 
   remainingBytesToWriteToDict = Preferences::getInstance()->getInt( "compression", "writedict", 0 );
@@ -376 +377 @@
     if( this->bRedirect)
     {
-      this->handleReconnect( NET_ID_MASTER_SERVER);
+      this->handleReconnect( this->redirectionUID);
     }
   }
@@ -815 +816 @@
 void NetworkStream::reconnectToServer(IP address)
 {
+  ///TODO make a redirection struct and push it to the network monitor
   this->networkMonitor->setForcedReconnection(address);
-  this->handleReconnect( NET_ID_MASTER_SERVER);
+
+  // reconnect (depending on how we are connected at the moment)
+  if ( peers.find( NET_ID_MASTER_SERVER) != peers.end() )
+    this->redirectionUID = NET_ID_MASTER_SERVER;
+  else if( peers.find( NET_ID_PROXY_SERVER_01) != peers.end() )
+    this->redirectionUID = NET_ID_PROXY_SERVER_01;
+
+  this->bRedirect = true;
 }