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

Timestamp:

Jul 17, 2006, 10:15:33 AM (18 years ago)

Author:

patrick

Message:

work from this weekend in the train

• the ip should now synchronize over network in the handshake (always the favorite 2 proxy server ips)
• the network monitor now keeps track of all network nodes answers with proxy server lists if asked/needed
• it is untested

File:

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

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

@@ -25 +25 @@
 
 
-Handshake::Handshake( int nodeType, int clientId, int networkGameManagerId, int messageManagerId )
+ Handshake::Handshake( int nodeType, int clientId, int networkGameManagerId, int messageManagerId )
   : Synchronizeable()
 {
@@ -46 +46 @@
 
   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 ) );
@@ -61 +62 @@
   localState.canDel = 0;
   localState.redirectProxy = 0;
+  localState.proxy1.host = 0;
+  localState.proxy1.port = 0;
+  localState.proxy2.host = 0;
+  localState.proxy2.port = 0;
 
+
+  // init the remote state
   remoteState.completed = 0;
   remoteState.error = 0;
@@ -73 +80 @@
   remoteState.canDel = 0;
   remoteState.redirectProxy = 0;
+  remoteState.proxy1.host = 0;
+  remoteState.proxy1.port = 0;
+  remoteState.proxy2.host = 0;
+  remoteState.proxy2.port = 0;
 
   // activate the synchronization process