Changeset 9426 in orxonox.OLD for branches/proxy/src/lib/network/ip.cc

Timestamp:

Jul 24, 2006, 2:49:33 PM (18 years ago)

Author:

bensch

Message:

cleaner ip inclusion

File:

• branches/proxy/src/lib/network/ip.cc (modified) (2 diffs)

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

@@ -185 +185 @@
     IPaddress ipaddr;
 
-    SDLNet_ResolveHost(&ipaddr, NULL, 2000);
-
-    return IP(ipaddr.host, port);
+    SDLNet_ResolveHost(&ipaddr, ip.c_str(), port);
+
+    return IP(ipaddr);
   }
   else
@@ -255 +255 @@
 /**
  * @brief converts a IP into a String (without port).
- * @param ip the IP to put into the string.
+ * @param host the IP to put into the string.
  * @param port -1 if not wanted
  * @return the string of the ip.
  */
-std::string IP::ipToString(int ip, int port)
-{
-  MultiType part0((int) (ip & 0xFF000000) >> 24);
-  MultiType part1((int) (ip & 0x00FF0000) >> 16);
-  MultiType part2((int) (ip & 0x0000FF00) >>  8);
-  MultiType part3((int) (ip & 0x000000FF) );
+std::string IP::ipToString(int host, int port)
+{
+  MultiType part0((int) ((host & 0xFF000000) >> 24));
+  MultiType part1((int) ((host & 0x00FF0000) >> 16));
+  MultiType part2((int) ((host & 0x0000FF00) >>  8));
+  MultiType part3((int) ((host & 0x000000FF) ));
 
   std::string addr = part3.getString() + "." + part2.getString() + "." +