Changeset 9433 in orxonox.OLD

Timestamp:

Jul 24, 2006, 4:36:28 PM (18 years ago)

Author:

patrick

Message:

new approach: the reconnection is handled from a different point in the network process

Location:

branches/proxy/src/lib/network

Files:

• network_stream.cc (modified) (7 diffs)
• network_stream.h (modified) (1 diff)

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

@@ -120 +120 @@
   this->pInfo->lastRecvedState = 0;
 
+  this->bRedirect = false;
 
   this->currentState = 0;
@@ -328 +329 @@
       PRINTF(1)("lost connection to server\n");
     }
-  }
-
-  cleanUpOldSyncList();
-  handleHandshakes();
+    // check if there is a redirection command
+    if( this->bRedirect)
+    {
+      this->handleReconnect( 0);
+    }
+  }
+
+  this->cleanUpOldSyncList();
+  this->handleHandshakes();
 
   // update the network monitor
@@ -338 +344 @@
   // order of up/downstream is important!!!!
   // don't change it
-  handleDownstream( tick );
-  handleUpstream( tick );
+  this->handleDownstream( tick );
+  this->handleUpstream( tick );
 }
 
@@ -519 +525 @@
         if ( it->second.handshake->ok() )
         {
-          // the server gave it free for deletion
+          // the counter part didn't mark it free for deletion yet
           if ( !it->second.handshake->allowDel() )
           {
@@ -538 +544 @@
 
               // now check if the server accepted the connection
+              if( it->second.handshake->redirect() )
+              {
+                this->bRedirect = true;
+              }
 
               // create the new network game manager and init it
@@ -627 +637 @@
   PRINTF(0)("Client is redirected to the other proxy servers\n");
   PRINTF(0)("  user id: %i\n", userId);
-  PRINTF(0)("  connecting to: %s\n", pInfo->handshake->getProxy1Address().ipString().c_str());
+  PRINTF(0)("  connecting to: %s\n", this->networkMonitor->getFirstChoiceProxy()->ip.ipString().c_str());
   PRINTF(0)("===============================================\n");
 
@@ -671 +681 @@
 
 
-//   for ( SynchronizeableList::iterator it2 = synchronizeables.begin(); it2 != synchronizeables.end(); it2++ )  {
-//     (*it2)->cleanUpUser( userId );
-//   }
+  for ( SynchronizeableList::iterator it2 = synchronizeables.begin(); it2 != synchronizeables.end(); it2++ )  {
+    (*it2)->cleanUpUser( userId );
+  }
 //
 // //   NetworkGameManager::getInstance()->signalLeftPlayer(userId);

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

@@ -115 +115 @@
     int                        dictServer;                  //!< the zip dict for the server
     int                        dictClient;                  //!< the zip dict for the client
+
+    bool                       bRedirect;                   //!< true if the master server sent a redirect command
 };
 #endif /* _NETWORK_STREAM */