Changeset 9306 in orxonox.OLD

Timestamp:

Jul 17, 2006, 2:21:42 PM (18 years ago)

Author:

bensch

Message:

orxonox/proxy: ip class ok now

Location:

branches/proxy/src/lib/network

Files:

• Makefile.am (modified) (2 diffs)
• ip.cc (moved) (moved from branches/proxy/src/lib/util/ip.cc) (2 diffs)
• ip.h (moved) (moved from branches/proxy/src/lib/util/ip.h) (3 diffs)

branches/proxy/src/lib/network/Makefile.am

@@ -40 +40 @@
                       synchronizeable_var/synchronizeable_bool.cc \
                       synchronizeable_var/synchronizeable_uint.cc \
-                      synchronizeable_var/synchronizeable_ip.cc
+                      synchronizeable_var/synchronizeable_ip.cc \
+                      \
+                      ip.cc
 
 
@@ -82 +84 @@
                  synchronizeable_var/synchronizeable_bool.h \
                  synchronizeable_var/synchronizeable_uint.h \
-                 synchronizeable_var/synchronizeable_ip.h
+                 synchronizeable_var/synchronizeable_ip.h \
+                 \
+                 ip.h
 
 

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

@@ -8 +8 @@
 #include "ip.h"
 #include "multi_type.h"
+#include "substring.h"
 
 IP::IP()
-{}
+{
+  this->_ip = 0;
+  this->_port = 0;
+}
 
 
-IP::IP(int ip)
+IP::IP(int ip, int port)
 {
   this->_ip = ip;
-}
-
-IP::IP(const std::string& ip)
-{
-  this->_ip = IP::stringToIP(ip);
+  this->_port = port;
 }
 
 
 
+IP::IP(const std::string& ip)
+{
+  *this = IP::stringToIP(ip);
+}
 
-int IP::stringToIP(const std::string& ip)
+
+IP::IP(const IPaddress& ip)
 {
+  this->_ip = ip.host;
+  this->_port = ip.port;
+}
+
+
+IP::IP(const IP& ip)
+{
+  this->_ip = ip.ip();
+  this->_port = ip.port();
+}
+
+
+
+const IP& IP::operator=(const IP& ip)
+{
+  this->_ip = ip.ip();
+  this->_port = ip.port();
+  return *this;
+}
+
+
+
+bool IP::operator==(const IP& ip)
+{
+  return (this->_ip == ip.ip() && this->_port == ip.port());
+}
+
+
+/**
+ * @returns The retrieved 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]);
+  */
+}
+
+int IP::ipPart(unsigned int part) const
+{
+  switch (part)
+  {
+    case 0:
+      return  (_ip & 0xFF000000) >> 24;
+    case 1:
+      return  (_ip & 0x00FF0000) >> 16;
+    case 2:
+      return  (_ip & 0x0000FF00) >> 8;
+    case 3:
+      return  (_ip & 0x000000FF);
+    default:
+      return -1;
+  }
 
 }
+
+
+std::string IP::ipString() const
+{
+  return IP::ipToString(this->_ip);
+}
+
 
 std::string IP::ipToString(const IPaddress& ipaddr)
@@ -38 +117 @@
 
 
+
+
+
 std::string IP::ipToString(int ip)
 {
-  MultiType part0( (ip & 0xFF000000) >> 24);
-  MultiType part1( (ip & 0x00FF0000) >> 16);
-  MultiType part2( (ip & 0x0000FF00) >>  8);
-  MultiType part3( (ip & 0x000000FF) );
+  MultiType part0((int) (ip & 0xFF000000) >> 24);
+  MultiType part1((int) (ip & 0x00FF0000) >> 16);
+  MultiType part2((int) (ip & 0x0000FF00) >>  8);
+  MultiType part3((int) (ip & 0x000000FF) );
 
 
   return part0.getString() + "." + part1.getString() + "." +
-           part2.getString() + "." + part3.getString();
+         part2.getString() + "." + part3.getString();
 }
 

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

@@ -2 +2 @@
 /*!
  * @file ip.h
- * @brief Definition of Time Class.
  *
- * These are mainly Classes, that are used for wrapping around SDL_thread
+ * @brief the ip class is used to transform strings to ip's and backwards
+ * it can also be used to
+ *
  */
 
@@ -21 +22 @@
     IP();
     IP(const std::string& ip);
-    IP(int ip);
+    IP(int ip, int port);
+    IP(const IPaddress& ip);
+    IP(const IP& ip);
+
+    const IP& operator=(const IP& ip);
+    bool operator==(const IP& ip);
 
 
@@ -27 +33 @@
     short port() const { return this->_port; };
 
-    int ip(unsigned int part) const;
-    std::string& ipString() const;
+    int ipPart(unsigned int part) const;
+    std::string ipString() const;
 
 
 
   public:
-    static int stringToIP(const std::string& ip);
+    static IP stringToIP(const std::string& ip);
+
+
     static std::string ipToString(const IPaddress& ipaddr);
     static std::string ipToString(int ip);
 
   private:
-    int           _ip;  //!< the IP in int form.
-    short         _port;
+    int           _ip;    //!< The IP in int form.
+    short         _port;  //!< The Port number of the IP
 
 };