Changeset 9262 in orxonox.OLD

Timestamp:

Jul 12, 2006, 6:30:54 PM (18 years ago)

Author:

patrick

Message:

starting to extend the handshake to synchronize proxy server addresses

Location:

branches/proxy/src/lib/network

Files:

• handshake.cc (modified) (4 diffs)
• handshake.h (modified) (2 diffs)
• netdefs.h (modified) (1 diff)

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

@@ -81 +81 @@
   for ( std::list<int>::iterator it = id.begin(); it != id.end(); it++ )
   {
+    // orxonox id handler
     if ( *it == orxId_handler )
     {
@@ -93 +94 @@
     }
 
+    // orxonox version handler
     if ( *it == version_handler )
     {
@@ -105 +107 @@
     }
 
+    // cancel
     if ( *it == candel_id )
     {
@@ -112 +115 @@
   }
 
-  if (
-      remoteState.orxId == _ORXONOX_ID &&
-      remoteState.version == _ORXONOX_VERSION
-     )
+  // handshake completed
+  if ( remoteState.orxId == _ORXONOX_ID &&
+       remoteState.version == _ORXONOX_VERSION )
+  {
     localState.completed = 1;
+  }
 }
 

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

@@ -10 +10 @@
 #include "synchronizeable.h"
 
-#define _ORXONOX_ID 0xF91337A0
-
-#define _ORXONOX_VERSION 1
 
 struct HandshakeState {
@@ -80 +77 @@
     int                msgManId_handler;                      //!< message manager handler
     int                hostId_handler;                        //!< host id handler
+    int                serverAddressHandler;                  //!< server address handler
 
     int                completed_handler;                     //!< handshake completion handler

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

@@ -33 +33 @@
 
 
+/* maximal connectinons for the server*/
 #define MAX_CONNECTIONS 1000
 
+/* network polling frequency */
 #define NETWORK_FREQUENCY 66
+
+
+/* handshake settings */
+#define _ORXONOX_ID 0xF91337A0
+#define _ORXONOX_VERSION 1