Changeset 9310 in orxonox.OLD

Timestamp:

Jul 18, 2006, 1:30:58 AM (18 years ago)

Author:

bensch

Message:

ip is ready for deplyment

Location:

branches/proxy/src/lib/network

Files:

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

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

@@ -37 +37 @@
  * @brief constructor from a String
  * @param ip the IP as a String.
- * @return self
- */
-IP::IP(const std::string& ip)
-{
-  *this = IP::stringToIP(ip);
+ * @param port The port to be resolved.
+ * @param resolve if true, the IP is resolved via DNS,
+ * @return self
+ */
+IP::IP(const std::string& ip, int port, bool resolve)
+{
+  *this = IP::stringToIP(ip, port, resolve);
 }
 
@@ -98 +100 @@
  * @brief converts a String into an IP Object.
  * @param ip The string holding an IP.
- * @return a constructed IP.
- */
-IP IP::stringToIP(const std::string& ip)
-{
-  IPaddress ipaddr;
-
-  SDLNet_ResolveHost(&ipaddr, NULL, 2000);
-
-  return IP(ipaddr);
-
-  /*
-  SubString addr(ip, '.');
-  if(ip.size() != 4 )
-    return -1;
-
-  MultiType part0(ip[0]);
-  MultiType part1(ip[1]);
-  MultiType part2(ip[2]);
-  MultiType part3(ip[3]);
-  */
+ * @param port The port to be resolved.
+ * @param resolve if true, the IP is resolved via DNS,
+ * otherwise (resolve == false) the IP is being transformed
+ * from a String (xxx.xxx.xxx.xxx) to an integer.
+ *
+ * @return A newly constructed IP.
+ */
+IP IP::stringToIP(const std::string& ip, int port, bool resolve)
+{
+  if (resolve)
+  {
+    IPaddress ipaddr;
+
+    SDLNet_ResolveHost(&ipaddr, NULL, 2000);
+
+    return IP(ipaddr.host, port);
+  }
+  else
+  {
+    SubString ipaddr(ip, '.');
+    if(ip.size() != 4 )
+      return IP();
+
+    MultiType part0(ipaddr[0]);
+    MultiType part1(ipaddr[1]);
+    MultiType part2(ipaddr[2]);
+    MultiType part3(ipaddr[3]);
+
+    int addr = (part0.getInt() << 24) +
+               (part1.getInt() << 16) +
+               (part2.getInt() <<  8) +
+               part3.getInt();
+    return IP(addr, port);
+  }
 }
 
@@ -170 +186 @@
 
 /**
- * converts a IP into a String (without port).
+ * @brief converts a IP into a String (without port).
  * @param ip the IP to put into the string.
  * @param port -1 if not wanted

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

@@ -21 +21 @@
   public:
     IP();
-    IP(const std::string& ip);
+    IP(const std::string& ip, int port = -1, bool resolve = true);
     IP(int ip, int port);
     IP(const IPaddress& ip);
@@ -30 +30 @@
 
 
+    /** @returns the IP */
     int ip() const { return this->_ip; };
+    /** @returns the Port */
     short port() const { return this->_port; };
 
@@ -36 +38 @@
     std::string ipString() const;
 
-
-
   public:
-    static IP stringToIP(const std::string& ip);
+    static IP stringToIP(const std::string& ip, int port = -1, bool resolve = true);