Changeset 9350 in orxonox.OLD

Timestamp:

Jul 20, 2006, 12:06:49 PM (18 years ago)

Author:

patrick

Message:

handshake now waits for ip list sync

Location:

branches/proxy/src/lib/network

Files:

• handshake.cc (modified) (3 diffs)
• handshake.h (modified) (2 diffs)

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

@@ -48 +48 @@
   registerVar( new SynchronizeableString( &localState.preferedNickName, &remoteState.preferedNickName, "preferedNickName", PERMISSION_ALL ) );
   // now synchronize only two of the available proxy server addresses
-  registerVar( new SynchronizeableIP( &localState.proxy1, &remoteState.proxy1, "proxy server 1", PERMISSION_ALL ) );
-  registerVar( new SynchronizeableIP( &localState.proxy2, &remoteState.proxy2, "proxy server 2", PERMISSION_ALL ) );
+  proxy1Handler = registerVarId( new SynchronizeableIP( &localState.proxy1, &remoteState.proxy1, "proxy server 1", PERMISSION_ALL ) );
+  proxy2Handler = registerVarId( new SynchronizeableIP( &localState.proxy2, &remoteState.proxy2, "proxy server 2", PERMISSION_ALL ) );
 
   // init the local state
@@ -81 +81 @@
   remoteState.proxy1 = IP(0, 0);
   remoteState.proxy2 = IP(0, 0);
+
+
+  this->proxyAddressesSynched = 0;
+
 
   // activate the synchronization process
@@ -143 +147 @@
     }
 
+    // the first proxy server synched
+    if( *it == this->proxy1Handler)
+    {
+      this->proxyAddressesSynched++;
+    }
+
+    // the last proxy server synched
+    if( *it == this->proxy2Handler)
+    {
+      this->proxyAddressesSynched++;
+    }
+
   }
 
   // handshake completed
   if ( remoteState.orxId == _ORXONOX_ID &&
-       remoteState.version == _ORXONOX_VERSION )
+       remoteState.version == _ORXONOX_VERSION &&
+       this->proxyAddressesSynched  == 2)
   {
     localState.completed = 1;

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

@@ -109 +109 @@
     int                hostId_handler;                        //!< host id handler
     int                nodeTypeHandler;                       //!< node type handler
+    int                proxy1Handler;                         //!< handler for the proxy
+    int                proxy2Handler;                         //!< handler for the proxy
 
     int                completed_handler;                     //!< handshake completion handler
@@ -116 +118 @@
     int                nodeType;                              //!, the type of the network node
 
+    int                proxyAddressesSynched;                 //!< number of addresses synched
+
 };