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

Timestamp:

Jul 20, 2006, 3:49:57 PM (19 years ago)

Author:

patrick

Message:

network ip synchronization work

File:

• branches/proxy/src/lib/network/handshake.cc (modified) (5 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
-  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 ) );
+//   registerVar( new SynchronizeableIP( &this->proxy1, &this->proxy1, "proxy server 1", PERMISSION_ALL ) );
+//   registerVar( new SynchronizeableIP( &this->proxy2, &this->proxy2, "proxy server 2", PERMISSION_ALL ) );
+  registerVar( new SynchronizeableInt( this->proxy1.hostRef(), this->proxy1.hostRef(), "proxy server 1", PERMISSION_ALL));
+  registerVar( new SynchronizeableInt( this->proxy1.portRef(), this->proxy1.portRef(), "proxy server 1", PERMISSION_ALL));
+  registerVar( new SynchronizeableInt( this->proxy2.hostRef(), this->proxy2.hostRef(), "proxy server 2", PERMISSION_ALL));
+  registerVar( new SynchronizeableInt( this->proxy2.portRef(), this->proxy2.portRef(), "proxy server 2", PERMISSION_ALL));
 
   // init the local state
@@ -62 +66 @@
   localState.nodeType = nodeType;
   localState.canDel = 0;
-  localState.redirectProxy = 0;
-  localState.proxy1 = IP(0, 0);
-  localState.proxy2 = IP (0, 0);
 
 
@@ -78 +79 @@
   remoteState.nodeType = NET_CLIENT;
   remoteState.canDel = 0;
-  remoteState.redirectProxy = 0;
-  remoteState.proxy1 = IP(0, 0);
-  remoteState.proxy2 = IP(0, 0);
 
 
-  this->proxyAddressesSynched = 0;
+  this->proxyAddressesSynched = 2;
+  this->proxy1 = IP(0, 0);
+  this->proxy2 = IP(0, 0);
+  this->redirectProxy = 0;
 
 
@@ -151 +152 @@
     {
       this->proxyAddressesSynched++;
-      PRINTF(0)("got proxy1: %i, %i\n", this->remoteState.proxy1.host(), this->remoteState.proxy1.port());
+      PRINTF(0)("got proxy1: %i, %i\n", this->proxy1.host(), this->proxy1.port());
     }
 
@@ -158 +159 @@
     {
       this->proxyAddressesSynched++;
-      PRINTF(0)("got proxy2: %i, %i\n", this->remoteState.proxy2.host(), this->remoteState.proxy2.port());
+      PRINTF(0)("got proxy2: %i, %i\n", this->proxy2.host(), this->proxy2.port());
     }