Add an overload for resolve that takes host and service separately

[libs/net.git] / source / inet.h

diff --git a/source/inet.h b/source/inet.h
index a65813bbd6af8698ed728fbd3dd2b998c685cc1c..639e64cbb1eca5ec8c9fc2e0d5247c91600adf38 100644 (file)
--- a/source/inet.h
+++ b/source/inet.h
@@ -1,11 +1,6 @@
 #ifndef MSP_NET_INET_H_
 #define MSP_NET_INET_H_
 
-#ifdef WIN32
-#include <winsock2.h>
-#else
-#include <netinet/in.h>
-#endif
 #include "sockaddr.h"
 
 namespace Msp {
@@ -17,25 +12,20 @@ Address class for IPv4 sockets.
 class InetAddr: public SockAddr
 {
 private:
-#ifdef WIN32
-       typedef u_long in_addr_t;
-       typedef u_short in_port_t;
-#endif
-
-       in_addr_t addr;
-       in_port_t port;
+       unsigned char addr[4];
+       unsigned port;
 
 public:
        InetAddr();
-       InetAddr(const sockaddr_in &);
-       InetAddr(in_addr_t, in_port_t);
-
-       Family get_family() const { return INET; }
-       in_addr_t get_addr() const { return ntohl(addr); }
-       in_port_t get_port() const { return ntohs(port); }
-       std::string str() const;
-       virtual unsigned fill_sockaddr(sockaddr &) const;
+       InetAddr(const SysAddr &);
+
        virtual InetAddr *copy() const { return new InetAddr(*this); }
+
+       virtual SysAddr to_sys() const;
+
+       virtual Family get_family() const { return INET; }
+       unsigned get_port() const { return port; }
+       virtual std::string str() const;
 };
 
 } // namespace Net