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

Timestamp:

Jul 21, 2006, 1:09:19 PM (18 years ago)

Author:

bensch

Message:

orxonox/proxy: better proxy-width approximation

Location:

branches/proxy/src/lib/network

Files:

• ip.cc (modified) (10 diffs)
• ip.h (modified) (3 diffs)

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

@@ -32 +32 @@
 IP::IP()
 {
-  this->_ip = 0;
+  this->_host = 0;
   this->_port = IP::_defaultPort;
 }
@@ -45 +45 @@
 IP::IP(int ip, int port)
 {
-  this->_ip = ip;
+  this->_host = ip;
   if (port != -1)
     this->_port = port;
@@ -84 +84 @@
 IP::IP(const IPaddress& ip)
 {
-  this->_ip = ip.host;
+  this->_host = ip.host;
   this->_port = ip.port;
 }
@@ -98 +98 @@
   *this = ip;
 }
+
+
+/**
+ * @brief constructs an IP out of the four pairs and a Port.
+ * @param first The first octal.
+ * @param second The second octal.
+ * @param third The third octal.
+ * @param fourth The fourth octal.
+ * @param port The Port.
+ * @return self.
+ */
+IP::IP(unsigned int first, unsigned int second, unsigned int third, unsigned int fourth, int port)
+{
+  this->_host = (first << 24) +
+                (second << 16) +
+                (third <<  8) +
+                fourth;
+  this->_port = port;
+}
+
 
 /**
@@ -106 +126 @@
 const IP& IP::operator=(const IP& ip)
 {
-  this->_ip = ip.host();
+  this->_host = ip.host();
   this->_port = ip.port();
   return *this;
@@ -119 +139 @@
 const IP& IP::operator=(const IPaddress& ip)
 {
-  this->_ip = ip.host;
+  this->_host = ip.host;
   this->_port = ip.port;
   return *this;
@@ -132 +152 @@
 bool IP::operator==(const IP& ip) const
 {
-  return (this->_ip == ip.host() &&
+  return (this->_host == ip.host() &&
           this->_port == ip.port());
 }
@@ -144 +164 @@
 bool IP::operator!=(const IP& ip) const
 {
-  return (this->_ip != ip.host() ||
-      this->_port != ip.port());
+  return (this->_host != ip.host() ||
+          this->_port != ip.port());
 }
 
@@ -199 +219 @@
   {
     case 0:
-      return  (_ip & 0xFF000000) >> 24;
+      return  (_host & 0xFF000000) >> 24;
     case 1:
-      return  (_ip & 0x00FF0000) >> 16;
+      return  (_host & 0x00FF0000) >> 16;
     case 2:
-      return  (_ip & 0x0000FF00) >> 8;
+      return  (_host & 0x0000FF00) >> 8;
     case 3:
-      return  (_ip & 0x000000FF);
+      return  (_host & 0x000000FF);
     default:
       return -1;
@@ -217 +237 @@
 std::string IP::ipString() const
 {
-  return IP::ipToString(this->_ip, this->_port);
+  return IP::ipToString(this->_host, this->_port);
 }
 

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

@@ -26 +26 @@
     IP(const IPaddress& ip);
     IP(const IP& ip);
+    IP(unsigned int first, unsigned int second, unsigned int third, unsigned int fourth, int port = IP::_defaultPort);
 
     /// OPERATORS
@@ -35 +36 @@
     /// RETRIVEAL
     /** @returns the IP */
-    int host() const { return this->_ip; };
-    int* hostRef()  { return &this->_ip; }
+    int host() const { return this->_host; };
+    int* hostRef()  { return &this->_host; }
     /** @returns the Port */
     int port() const { return this->_port; };
     int* portRef() { return &this->_port; };
 
-    inline IPaddress getSDLNotation() { IPaddress sdlIP; sdlIP.host = this->_ip; sdlIP.port = this->_port; return sdlIP; }
+    inline IPaddress getSDLNotation() { IPaddress sdlIP; sdlIP.host = this->_host; sdlIP.port = this->_port; return sdlIP; }
 
     int ipPart(unsigned int part) const;
@@ -59 +60 @@
 
   private:
-    int           _ip;           //!< The IP in int form.
-    int         _port;         //!< The Port number of the IP
+    int           _host;           //!< The IP in int form.
+    int           _port;         //!< The Port number of the IP
 
-    static int  _defaultPort;  //!< Default Port
+    static int    _defaultPort;  //!< Default Port
 };