Changeset 9294 in orxonox.OLD

Timestamp:

Jul 14, 2006, 1:58:16 PM (18 years ago)

Author:

patrick

Message:

synchronizeble var ip address finished

File:

• branches/proxy/src/lib/network/synchronizeable_var/synchronizeable_ip.cc (modified) (3 diffs)

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

@@ -47 +47 @@
   int res;
 
-//   res = Converter::floatToByteArray( vPtrIn->x, buf + n, maxLength - n );
-//   assert( res > 0 );
-//   n += res;
-//
-//   res = Converter::floatToByteArray( vPtrIn->y, buf + n, maxLength - n );
-//   assert( res > 0 );
-//   n += res;
-//
-//   res = Converter::floatToByteArray( vPtrIn->z, buf + n, maxLength - n );
-//   assert( res > 0 );
-//   n += res;
-//
-//   assert( 3*FLOATSIZE == n );
+  res = Converter::intToByteArray( (int)vPtrIn->host, buf, maxLength );
+  assert(res > 0);
+  n += res;
+
+  res = Converter::intToByteArray( (int)vPtrIn->port, buf, maxLength);
+  assert(res > 0);
+  n += res;
+
+  assert( 2 * INTSIZE == n);
 
   return n;
@@ -72 +68 @@
 int SynchronizeableIP::readFromBuf( byte * buf, int maxLength )
 {
-  assert( maxLength >= 3*FLOATSIZE );
+  assert( maxLength >= 2 * INTSIZE);
 
-  float x,y,z;
+  int host, port;
 
   int res;
   int n = 0;
 
-//   Vector oldVec = *vPtrOut;
-//
-//   res = Converter::byteArrayToFloat( buf + n, &x );
-//   assert( res > 0 );
-//   n += res;
-//
-//   res = Converter::byteArrayToFloat( buf + n, &y );
-//   assert( res > 0 );
-//   n += res;
-//
-//   res = Converter::byteArrayToFloat( buf + n, &z );
-//   assert( res > 0 );
-//   n += res;
-//
-//   *vPtrOut = Vector( x, y, z );
-//
-//   setHasChanged( !(*vPtrOut == oldVec) );
-//
-//   assert( n == 3*FLOATSIZE );
+  IPaddress oldIP = *vPtrOut;
+  IPaddress newIP;
+
+  res = Converter::byteArrayToInt( buf + n, &host);
+  assert( res > 0);
+  n += res;
+
+
+  res = Converter::byteArrayToInt( buf + n, &port);
+  assert( res > 0);
+  n += res;
+
+  newIP.host = host;
+  newIP.port = port;
+
+  setHasChanged( (newIP.host != oldIP.host || newIP.port != oldIP.port) );
+
+  assert( n == 2 * INTSIZE);
+
   return n;
 }
@@ -107 +103 @@
 void SynchronizeableIP::SynchronizeableIP::debug( )
 {
-//   printf( "SYNCHRONIZEABLE_VAR: %s IN: (%f, %f, %f) OUT: (%f %f %f)\n", name.c_str(), vPtrIn->x, vPtrIn->y, vPtrIn->z, vPtrOut->x, vPtrOut->y, vPtrOut->z );
+  printf("SYNCHRONIZEABLE_VAR: %s IN: %i, %i OUT: %i, %i\n", name.c_str(), vPtrIn->host, vPtrIn->port, vPtrOut->host, vPtrOut->port);
 }