Add an overload for resolve that takes host and service separately

[libs/net.git] / source / sockaddr.cpp

diff --git a/source/sockaddr.cpp b/source/sockaddr.cpp
index f95edd3f9558fde0a870ac743f73bee845fdcdd7..9b41f81b948492dc077920dbe83ea06a80ea8a67 100644 (file)
--- a/source/sockaddr.cpp
+++ b/source/sockaddr.cpp
@@ -1,27 +1,31 @@
-#include <msp/core/except.h>
+#include <stdexcept>
 #include "inet.h"
 #include "inet6.h"
+#include "sockaddr_private.h"
+
+using namespace std;
 
 namespace Msp {
 namespace Net {
 
-unsigned SockAddr::fill_sockaddr(sockaddr_storage &sa) const
-{
-       return fill_sockaddr(reinterpret_cast<sockaddr &>(sa));
-}
-
-SockAddr *SockAddr::create(const sockaddr_storage &sa)
+SockAddr *SockAddr::new_from_sys(const SysAddr &sa)
 {
-       switch(sa.ss_family)
+       switch(sa.addr.ss_family)
        {
        case AF_INET:
-               return new InetAddr(reinterpret_cast<const sockaddr_in &>(sa));
+               return new InetAddr(sa);
        case AF_INET6:
-               return new Inet6Addr(reinterpret_cast<const sockaddr_in6 &>(sa));
+               return new Inet6Addr(sa);
        default:
-               throw InvalidParameterValue("Unknown address family");
+               throw invalid_argument("SockAddr::create");
        }
 }
 
+SockAddr::SysAddr::SysAddr():
+       size(sizeof(sockaddr_storage))
+{
+       addr.ss_family = AF_UNSPEC;
+}
+
 } // namespace Net
 } // namespace Msp