Changeset 9365 in orxonox.OLD

Timestamp:

Jul 20, 2006, 6:20:20 PM (18 years ago)

Author:

patrick

Message:

ip synchronization now seems to work smoothly on my system here. but not on the laptop

Location:

branches/proxy/src

Files:

• lib/network/handshake.cc (modified) (2 diffs)
• lib/network/synchronizeable_var/synchronizeable_ip.cc (modified) (1 diff)
• world_entities/spawning_point.cc (modified) (1 diff)

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
-//   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));
+  registerVar( new SynchronizeableIP( &this->proxy1, &this->proxy1, "proxy server 1", PERMISSION_MASTER_SERVER ) );
+  registerVar( new SynchronizeableIP( &this->proxy2, &this->proxy2, "proxy server 2", PERMISSION_MASTER_SERVER ) );
+
 
   // init the local state
@@ -147 +144 @@
       PRINTF(0)("handshake finished candel changed\n");
     }
-
-//     // the first proxy server synched
-//     if( *it == this->proxy1Handler)
-//     {
-//       this->proxyAddressesSynched++;
-//       PRINTF(0)("got proxy1: %i, %i\n", this->proxy1.host(), this->proxy1.port());
-//     }
-//
-//     // the last proxy server synched
-//     if( *it == this->proxy2Handler)
-//     {
-//       this->proxyAddressesSynched++;
-//       PRINTF(0)("got proxy2: %i, %i\n", this->proxy2.host(), this->proxy2.port());
-//     }
-
   }
 

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

@@ -92 +92 @@
   this->setHasChanged( *this->vPtrOut != oldVal);
 
-//   assert( n == 2 * INTSIZE);
+  assert( n == 2 * INTSIZE);
 
   return n;

branches/proxy/src/world_entities/spawning_point.cc

@@ -203 +203 @@
 void SpawningPoint::sendRespawnMessage( int uniqueId )
 {
+#warning this bye array is not been deleted according to valginrd
   byte * buf = new byte[2*INTSIZE];