Changeset 9334 in orxonox.OLD for branches/proxy/src/lib/network/synchronizeable_var

Timestamp:

Jul 19, 2006, 10:29:14 PM (19 years ago)

Author:

patrick

Message:

work of the day in one commit:D

• switched whole network framework to ip sturcture
• extended ip structrue a little bit
• reimplemented the disconnection/reconnection algorithm
• synchronizeable ip bug discovered and solved

Location:

branches/proxy/src/lib/network/synchronizeable_var

Files:

• synchronizeable_ip.cc (modified) (6 diffs)
• synchronizeable_ip.h (modified) (2 diffs)

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

@@ -16 +16 @@
 #include "synchronizeable_ip.h"
 #include "converter.h"
-
+// #include "ip.h"
 
 /**
@@ -22 +22 @@
  * @todo this constructor is not jet implemented - do it
 */
-SynchronizeableIP::SynchronizeableIP( IPaddress * ptrIn, IPaddress * ptrOut, std::string name, int permission, int priority) : SynchronizeableVar( ptrIn, ptrOut, name, 2*INTSIZE, permission, priority )
+SynchronizeableIP::SynchronizeableIP( IP * ptrIn, IP * ptrOut, std::string name, int permission, int priority) : SynchronizeableVar( ptrIn, ptrOut, name, 2*INTSIZE, permission, priority )
 {
   this->vPtrIn = ptrIn;
@@ -47 +47 @@
   int res;
 
-  res = Converter::intToByteArray( (int)vPtrIn->host, buf, maxLength );
+  res = Converter::intToByteArray( (int)vPtrIn->ip(), buf, maxLength );
   assert(res > 0);
   n += res;
 
-  res = Converter::intToByteArray( (int)vPtrIn->port, buf, maxLength);
+  res = Converter::intToByteArray( (int)vPtrIn->port(), buf, maxLength);
   assert(res > 0);
   n += res;
@@ -75 +75 @@
   int n = 0;
 
-  IPaddress oldIP = *vPtrOut;
-  IPaddress newIP;
+  IP oldIP = *vPtrOut;
 
   res = Converter::byteArrayToInt( buf + n, &host);
@@ -87 +86 @@
   n += res;
 
-  newIP.host = host;
-  newIP.port = port;
+  *this->vPtrOut = IP(host, port);
 
-  setHasChanged( (newIP.host != oldIP.host || newIP.port != oldIP.port) );
+  setHasChanged( *this->vPtrOut != oldIP);
 
   assert( n == 2 * INTSIZE);
@@ -103 +101 @@
 void SynchronizeableIP::SynchronizeableIP::debug( )
 {
-  printf("SYNCHRONIZEABLE_VAR: %s IN: %i, %i OUT: %i, %i\n", name.c_str(), vPtrIn->host, vPtrIn->port, vPtrOut->host, vPtrOut->port);
+  printf("SYNCHRONIZEABLE_VAR: %s IN: %i, %i OUT: %i, %i\n", name.c_str(), vPtrIn->ip(), vPtrIn->port(), vPtrOut->ip(), vPtrOut->port());
 }
 

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

@@ -12 +12 @@
 
 #include "netdefs.h"
+#include "ip.h"
 
 class SynchronizeableIP : public SynchronizeableVar {
 
   public:
-    SynchronizeableIP( IPaddress *ptrIn, IPaddress * ptrOut, std::string name, int permission = PERMISSION_MASTER_SERVER, int priority = 0 );
+    SynchronizeableIP( IP *ptrIn, IP * ptrOut, std::string name, int permission = PERMISSION_MASTER_SERVER, int priority = 0 );
     virtual ~SynchronizeableIP();
 
@@ -32 +33 @@
 
   private:
-    IPaddress * vPtrIn;       //!< pointer to data (read)
-    IPaddress * vPtrOut;      //!< pointer to data (write)
+    IP * vPtrIn;       //!< pointer to data (read)
+    IP * vPtrOut;      //!< pointer to data (write)
 
 };