Changeset 9638 in orxonox.OLD for branches/proxy

Timestamp:

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

Author:

patrick

Message:

tests in redirection forcing

Location:

branches/proxy/src/lib/network

Files:

• network_manager.cc (modified) (1 diff)
• network_stream.cc (modified) (3 diffs)
• network_stream.h (modified) (1 diff)
• proxy/proxy_control.cc (modified) (4 diffs)

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

@@ -173 +173 @@
   // and start the handshake
   this->networkStream->startHandshake();
+  // create the proxy control
+  ProxyControl::getInstance();
 
   PRINTF(0)("Created Network Client\n");

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;
 }
 

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

@@ -133 +133 @@
 
     bool                       bRedirect;                   //!< true if the master server sent a redirect command
+    int                        redirectionUID;              //!< uid of the redir host
 };
 #endif /* _NETWORK_STREAM */

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

@@ -47 +47 @@
 {
   this->setClassID( CL_PROXY_CONTROL, "ProxyControl" );
+
+  this->setSynchronized(false);
 
   MessageManager::getInstance()->registerMessageHandler( MSGID_PROXY_NEWCLIENT, messageHandlerNewClient, NULL );
@@ -319 +321 @@
 
   PRINTF(0)("Sending reconnection command to: %i\n", userId);
-  MessageManager::getInstance()->sendMessage( MSGID_PROXY_COMMAND, data, 3*INTSIZE, RT_ALL_ME, NET_UNASSIGNED, MP_HIGHBANDWIDTH );
+  MessageManager::getInstance()->sendMessage( MSGID_PROXY_COMMAND, data, 3*INTSIZE, RT_USER, userId, MP_HIGHBANDWIDTH );
 }
 
@@ -360 +362 @@
       assert( Converter::byteArrayToInt( data + INTSIZE, &ipHost) == INTSIZE );
 
+      PRINTF(0)("Got reconnection command from %i: reconnect!\n", senderId);
       // handle it
-      if( SharedNetworkData::getInstance()->getHostID() == userId &&
-         (SharedNetworkData::getInstance()->isMasterServer() || SharedNetworkData::getInstance()->isProxyServerActive()))
+      if( SharedNetworkData::getInstance()->getHostID() == userId)
       {
         NetworkManager::getInstance()->reconnectToServer(IP(ipHost, 9999));
@@ -373 +375 @@
 
 
-  // part for the master server
-  if( SharedNetworkData::getInstance()->isMasterServer())
-  {
-    // we now create the new player ship and stuff...
-//     NetworkGameManager::getInstance()->signalLeftPlayer(leaveClientId);
-  }
-  else if(SharedNetworkData::getInstance()->isProxyServerActive())
-  {
-
-  }
 
   return true;