Changeset 9349 in orxonox.OLD

Timestamp:

Jul 20, 2006, 11:58:16 AM (18 years ago)

Author:

patrick

Message:

another ip sync bug discovered. but still not the one im looking for

Location:

branches/proxy/src/lib/network

Files:

• handshake.cc (modified) (1 diff)
• network_stream.cc (modified) (2 diffs)
• synchronizeable_var/synchronizeable_ip.cc (modified) (1 diff)

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

@@ -49 +49 @@
   // 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 ) );
+  registerVar( new SynchronizeableIP( &localState.proxy2, &remoteState.proxy2, "proxy server 2", PERMISSION_ALL ) );
 
   // init the local state

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

@@ -351 +351 @@
       peers[clientId].handshake->setProxy1Address( pi->ip);
       PRINTF(0)("proxy1 ip set to: %s\n", pi->ip.ipString().c_str());
+      PRINTF(0)(" proxy1 ip : %i, port: %i\n", pi->ip.host(), pi->ip.port());
     }
 
@@ -501 +502 @@
               this->networkMonitor->addNode(it->second.handshake->getProxy1Address(), NET_PROXY_SERVER_ACTIVE);
               PRINTF(0)("proxy1 ip read to: %s\n", it->second.handshake->getProxy1Address().ipString().c_str());
+              PRINTF(0)(" proxy1 ip : %i, port: %i\n", it->second.handshake->getProxy1Address().host(), it->second.handshake->getProxy1Address().port());
               // get proxy 2 address and add it
               this->networkMonitor->addNode(it->second.handshake->getProxy2Address(), NET_PROXY_SERVER_ACTIVE);

branches/proxy/src/lib/network/synchronizeable_var/synchronizeable_ip.cc

@@ -88 +88 @@
   *this->vPtrOut = IP(host, port);
 
-  printf(" vtrp out old: %i, %i -- new: %i, %i\n", oldVal.host(), oldVal.port(), this->vPtrOut->host(), this->vPtrOut->port());
+  printf(" %s old: %i, %i -- new: %i, %i\n", name.c_str(), oldVal.host(), oldVal.port(), this->vPtrOut->host(), this->vPtrOut->port());
   setHasChanged( *this->vPtrOut != oldVal);