Changeset 9321 in orxonox.OLD

Timestamp:

Jul 18, 2006, 11:30:12 AM (18 years ago)

Author:

bensch

Message:

more elaborate IP

Location:

branches/proxy/src/lib/network

Files:

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

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

@@ -1 +1 @@
 /**
  * @file ip.cc
- * @brief A IP class, that handles all about time.
+ * @brief A IP class, that handles IP names and resolution.
  *
  * code taken from audiere.
@@ -7 +7 @@
 
 #include "ip.h"
+
+#include <iostream>
+
 #include "multi_type.h"
 #include "substring.h"
@@ -16 +19 @@
 {
   this->_ip = 0;
-  this->_port = 0;
+  this->_port = IP::_defaultPort;
 }
 
@@ -29 +32 @@
 {
   this->_ip = ip;
-  this->_port = port;
-}
-
+  if (port != -1)
+    this->_port = port;
+  else
+    this->_port = IP::_defaultPort;
+}
+
+
+/**
+ * @brief constructor from a String
+ * @param ip the IP as a String.
+ * @param resolve if true, the IP is resolved via DNS,
+ * @return self
+ */
+IP::IP(const std::string& ip, bool resolve)
+{
+  *this = IP::stringToIP(ip, IP::_defaultPort, resolve);
+}
 
 /**
@@ -65 +82 @@
 IP::IP(const IP& ip)
 {
-  this->_ip = ip.ip();
-  this->_port = ip.port();
+  *this = ip;
 }
 
@@ -88 +104 @@
 bool IP::operator==(const IP& ip)
 {
-  return (this->_ip == ip.ip() && this->_port == ip.port());
+  return (this->_ip == ip.ip() &&
+          this->_port == ip.port());
 }
 
@@ -160 +177 @@
 std::string IP::ipString() const
 {
-  return IP::ipToString(this->_ip);
+  return IP::ipToString(this->_ip, this->_port);
 }
 
@@ -172 +189 @@
 {
   int ip = SDLNet_Read32 (ipaddr.host);
-  return ipToString(ip, ipaddr.port);
+  return IP::ipToString(ip, ipaddr.port);
 }
 
@@ -193 +210 @@
 
   if (port != -1)
-    addr += MultiType(port).getString();
+    addr += ":" + MultiType(port).getString();
   return addr;
 }
 
+
+/// default port definition.
+short IP::_defaultPort = 80;
+
+/**
+ * @brief if no IP is supplied this port is used, so that IP can be resolved usefully.
+ * @param defaultPort The default port.
+ */
+void IP::setDefaultPort(short defaultPort)
+{
+  IP::_defaultPort = defaultPort;
+}
+
+
+/**
+ * @brief print out the IP in a nice fashion
+ */
+void IP::debug() const
+{
+  std::cout << "IP is " << this->ipString() << std::endl;
+}

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

@@ -22 +22 @@
     /// CONSTRUCTORS
     IP();
+    IP(int ip, int port);
+    IP(const std::string& ip, bool resolve = true);
     IP(const std::string& ip, int port = -1, bool resolve = true);
-    IP(int ip, int port);
     IP(const IPaddress& ip);
     IP(const IP& ip);
@@ -31 +32 @@
     bool operator==(const IP& ip);
 
-    /// RETRIEAL
+    /// RETRIVEAL
     /** @returns the IP */
     int ip() const { return this->_ip; };
@@ -40 +41 @@
     std::string ipString() const;
 
+    void debug() const;
+
   public:
-
     /// SETUP
     static IP stringToIP(const std::string& ip, int port = -1, bool resolve = true);
-
 
     static std::string ipToString(const IPaddress& ipaddr);
     static std::string ipToString(int ip, int port = -1);
 
+
+    static void setDefaultPort(short defaultPort);
+    static short defaultPort(short defaultPort) { return IP::_defaultPort; };
+
   private:
-    int           _ip;    //!< The IP in int form.
-    short         _port;  //!< The Port number of the IP
+    int           _ip;           //!< The IP in int form.
+    short         _port;         //!< The Port number of the IP
 
+
+    static short  _defaultPort;  //!< Default Port
 };