From d49dd41c651f531241494ca9662e234c0667361c Mon Sep 17 00:00:00 2001
From: Danny Robson <danny@nerdcruft.net>
Date: Mon, 30 Jul 2012 16:33:12 +1000
Subject: [PATCH] Spacing and instantiation of templates

---
 net/address.cpp | 66 ++++++++++++++++++++++++++++++++++++-------------
 net/address.hpp | 23 ++++++-----------
 2 files changed, 56 insertions(+), 33 deletions(-)

diff --git a/net/address.cpp b/net/address.cpp
index 67f644c6..528a735b 100644
--- a/net/address.cpp
+++ b/net/address.cpp
@@ -23,6 +23,9 @@
 #include "../debug.hpp"
 #include "../endian.hpp"
 #include "../types.hpp"
+#include "../raii.hpp"
+
+#include <netdb.h>
 
 #ifdef __WIN32
 #else
@@ -50,6 +53,37 @@ const char* inet_ntop(int af, const void* src, char* dst, int size){
 #endif
 
 
+//-----------------------------------------------------------------------------
+template <domain D>
+typename address<D>::port_type
+address<D>::port (void) const 
+    { return m_port; }
+
+
+template <domain D>
+void
+address<D>::set_port (const port_type &_port)
+    { m_port = _port; }
+
+
+template <domain D>
+typename address<D>::ip_type
+address<D>::resolve (const std::string &str) {
+    addrinfo  hint;
+    memset (&hint, 0, sizeof (hint));
+    hint.ai_family = static_cast<int> (D);
+
+    addrinfo* resolved;
+    int err = getaddrinfo (str.c_str (), nullptr, nullptr, &resolved);
+    if (err)
+        net::error::throw_code ();
+
+    auto deletor = [] (addrinfo *a) { freeaddrinfo (a); };
+    std::unique_ptr<addrinfo, decltype(deletor)> raii(resolved, deletor);
+    return ip_type (reinterpret_cast<sockaddr_type*> (resolved->ai_addr)->sin_addr.s_addr);
+}
+
+
 //-----------------------------------------------------------------------------
 namespace net {
     template <>
@@ -63,9 +97,9 @@ namespace net {
 
 
     template <domain D>
-    address<D>::address (const std::string &_ip,
+    address<D>::address (const std::string &_addr,
                          port_type          _port):
-        m_ip   (_ip),
+        m_ip   (resolve (_addr)),
         m_mask (  0),
         m_port (_port)
     { ; }
@@ -115,25 +149,23 @@ net::operator<< (std::ostream &os, const address<net::domain::INET> &addr) {
 
 
 //-----------------------------------------------------------------------------
-template <>
-const address<domain::INET>
+template <> const address<domain::INET>
 address<domain::INET>::LOOPBACK  ("127.0.0.1", 0);
 
-
-template <>
-const address<domain::INET>
+template <> const address<domain::INET>
 address<domain::INET>::ANY       ("0.0.0.0", 0);
 
-
-template <>
-const address<domain::INET6>
-address<domain::INET6>::LOOPBACK ("::1", 0);
-
-
-template <>
-const address<domain::INET6>
-address<domain::INET6>::ANY      ("::0", 0);
+template typename address<domain::INET>::ip_type
+address<domain::INET>::resolve (const std::string &);
 
 template class address<domain::INET>;
-template class address<domain::INET6>;
+
+//-----------------------------------------------------------------------------
+//template <> const address<domain::INET6>
+//address<domain::INET6>::LOOPBACK ("::1", 0);
+//
+//template <> const address<domain::INET6>
+//address<domain::INET6>::ANY      ("::0", 0);
+//
+//template class address<domain::INET6>;
 
diff --git a/net/address.hpp b/net/address.hpp
index 0cd4569c..d7fd8bc0 100644
--- a/net/address.hpp
+++ b/net/address.hpp
@@ -75,26 +75,17 @@ namespace net {
             static const address<D> ANY;
 
             address (const sockaddr_type &);
-            address (const std::string&, 
-                     port_type);
+            address (const std::string &address, port_type);
 
-            port_type
-            port (void) const
-                { return m_port; }
+            port_type port (void) const;
+            void set_port (const port_type &);
 
-            void
-            set_port (const port_type &_port)
-                { m_port = _port; }
+            ip_type ip (void) const         { return m_ip; }
 
-            ip_type
-            ip (void) const
-                { return m_ip; }
+            sockaddr_type to_sockaddr (void) const;
+            std::string   to_string   (void) const;
 
-            sockaddr_type
-            to_sockaddr (void) const;
-
-            std::string
-            to_string (void) const;
+            static ip_type resolve (const std::string &);
 
             bool operator ==(const address<D> &rhs);
     };