Changeset 9347 in orxonox.OLD for branches/proxy/src/lib/network/handshake.cc

Timestamp:

Jul 20, 2006, 11:43:27 AM (19 years ago)

Author:

bensch

Message:

orxonox/proxy: merged the proxy.old back again, and it seems to work.

Merged with command
svn merge -r9247:HEAD ​https://svn.orxonox.net/orxonox/branches/proxy.old .

no conflicts

File:

• branches/proxy/src/lib/network/handshake.cc (modified) (10 diffs)

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

@@ -10 +10 @@
 
 ### File Specific:
-   main-programmer: christoph
-   co-programmer:
+   main-programmer: Christoph Renner (rennerc@ee.ethz.ch)
+   co-programmer: Patirck Boenzli (boenzlip@orxonox.ethz.ch)
 */
 
 
-/* this is for debug output. It just says, that all calls to PRINT() belong to the DEBUG_MODULE_NETWORK module
-   For more information refere to https://www.orxonox.net/cgi-bin/trac.cgi/wiki/DebugOutput
-*/
 #define DEBUG_MODULE_NETWORK
 
@@ -25 +22 @@
 #include "debug.h"
 
-Handshake::Handshake( bool server, int clientId, int networkGameManagerId, int messageManagerId )
+
+
+
+
+ Handshake::Handshake( int nodeType, int clientId, int networkGameManagerId, int messageManagerId )
   : Synchronizeable()
 {
@@ -31 +32 @@
   this->setClassID(CL_HANDSHAKE, "Handshake");
 
-  this->setIsServer(server);
-
+  // register all variable handlers
   orxId_handler = registerVarId( new SynchronizeableInt( &localState.orxId, &remoteState.orxId, "orxonoxId", PERMISSION_ALL ) );
   version_handler = registerVarId( new SynchronizeableInt( &localState.version, &remoteState.version, "version", PERMISSION_ALL ) );
@@ -42 +42 @@
   errorString_handler = registerVarId( new SynchronizeableString( &localState.errorString, &remoteState.errorString, "errorString", PERMISSION_ALL ) );
 
+  this->nodeTypeHandler = registerVarId( new SynchronizeableInt( &localState.nodeType, &remoteState.nodeType, "nodeType", PERMISSION_ALL ) );
+
   candel_id = registerVarId( new SynchronizeableInt( &localState.canDel, &remoteState.canDel, "canDel", PERMISSION_ALL ) );
-  
+
   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.proxy1, "proxy server 2", PERMISSION_ALL ) );
 
+  // init the local state
   localState.completed = 0;
   localState.error = 0;
@@ -54 +60 @@
   localState.orxId = _ORXONOX_ID;
   localState.version = _ORXONOX_VERSION;
+  localState.nodeType = nodeType;
   localState.canDel = 0;
+  localState.redirectProxy = 0;
+  localState.proxy1 = IP(0, 0);
+  localState.proxy2 = IP (0, 0);
 
+
+  // init the remote state
   remoteState.completed = 0;
   remoteState.error = 0;
@@ -64 +76 @@
   remoteState.orxId = 0;
   remoteState.version = 0;
+  remoteState.nodeType = NET_CLIENT;
   remoteState.canDel = 0;
+  remoteState.redirectProxy = 0;
+  remoteState.proxy1 = IP(0, 0);
+  remoteState.proxy2 = IP(0, 0);
 
+  // activate the synchronization process
   this->setSynchronized(true);
   PRINTF(0)("Handshake created clientId = %d\n", clientId);
 }
+
 
 /**
@@ -78 +96 @@
   for ( std::list<int>::iterator it = id.begin(); it != id.end(); it++ )
   {
-    if ( *it == orxId_handler )
+    // orxonox id handler
+    if ( *it == this->orxId_handler )
     {
       if ( remoteState.orxId != _ORXONOX_ID )
@@ -87 +106 @@
         continue;
       }
-
     }
 
-    if ( *it == version_handler )
+    // orxonox version handler
+    if ( *it == this->version_handler )
     {
       if ( remoteState.version != _ORXONOX_VERSION )
@@ -99 +118 @@
         continue;
       }
-
     }
 
+    // node type handler: for each node type there is a specific action to be taken
+    if ( *it == this->nodeTypeHandler)
+    {
+      if ( remoteState.nodeType == NET_MASTER_SERVER )
+      {
+        continue;
+      }
+      else if( remoteState.nodeType == NET_PROXY_SERVER_ACTIVE)
+      {
+        continue;
+      }
+      else if( remoteState.nodeType == NET_CLIENT)
+      {
+        continue;
+      }
+    }
+
+    // cancel
     if ( *it == candel_id )
     {
@@ -109 +145 @@
   }
 
-  if (
-      remoteState.orxId == _ORXONOX_ID &&
-      remoteState.version == _ORXONOX_VERSION
-     )
+  // handshake completed
+  if ( remoteState.orxId == _ORXONOX_ID &&
+       remoteState.version == _ORXONOX_VERSION )
+  {
     localState.completed = 1;
+  }
 }