Changeset 9344 in orxonox.OLD for branches

Timestamp:

Jul 20, 2006, 11:29:35 AM (18 years ago)

Author:

patrick

Message:

changed interface of ip slighlu

Location:

branches/proxy/src/lib/network

Files:

• ip.cc (modified) (3 diffs)
• ip.h (modified) (1 diff)
• synchronizeable_var/synchronizeable_ip.cc (modified) (4 diffs)

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

@@ -106 +106 @@
 const IP& IP::operator=(const IP& ip)
 {
-  this->_ip = ip.ip();
+  this->_ip = ip.host();
   this->_port = ip.port();
   return *this;
@@ -132 +132 @@
 bool IP::operator==(const IP& ip)
 {
-  return (this->_ip == ip.ip() &&
+  return (this->_ip == ip.host() &&
           this->_port == ip.port());
 }
@@ -144 +144 @@
 bool IP::operator!=(const IP& ip)
 {
-  return (this->_ip != ip.ip() ||
+  return (this->_ip != ip.host() ||
       this->_port != ip.port());
 }

branches/proxy/src/lib/network/ip.h

@@ -35 +35 @@
     /// RETRIVEAL
     /** @returns the IP */
-    int ip() const { return this->_ip; };
+    int host() const { return this->_ip; };
     /** @returns the Port */
     short port() const { return this->_port; };

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

@@ -47 +47 @@
   int res;
 
-  res = Converter::intToByteArray( (int)vPtrIn->ip(), buf, maxLength );
+  res = Converter::intToByteArray( (int)vPtrIn->host(), buf, maxLength );
   assert(res > 0);
   n += res;
@@ -75 +75 @@
   int n = 0;
 
-  IP oldIP = *vPtrOut;
+  IP oldVal = *vPtrOut;
 
   res = Converter::byteArrayToInt( buf + n, &host);
@@ -88 +88 @@
   *this->vPtrOut = IP(host, port);
 
-  printf(" vtrp out old: %i, %i -- new: %i, %i\n", oldIP.ip(), oldIP.port(), this->vPtrOut->ip(), this->vPtrOut->port());
-  setHasChanged( *this->vPtrOut != oldIP);
+  printf(" vtrp out old: %i, %i -- new: %i, %i\n", oldVal.host(), oldVal.port(), this->vPtrOut->host(), this->vPtrOut->port());
+  setHasChanged( *this->vPtrOut != oldVal);
 
   assert( n == 2 * INTSIZE);
@@ -102 +102 @@
 void SynchronizeableIP::SynchronizeableIP::debug( )
 {
-  printf("SYNCHRONIZEABLE_VAR: %s IN: %i, %i OUT: %i, %i\n", name.c_str(), vPtrIn->ip(), vPtrIn->port(), vPtrOut->ip(), vPtrOut->port());
+  printf("SYNCHRONIZEABLE_VAR: %s IN: %i, %i OUT: %i, %i\n", name.c_str(), vPtrIn->host(), vPtrIn->port(), vPtrOut->host(), vPtrOut->port());
 }