move sockaddr wrapper to public API

src/util.cpp

@@ -5,6 +5,8 @@
  */
 
 #include <iomanip>
+#include <cstring>
+#include <sstream>
 
 #include <ctype.h>
 
@@ -59,6 +61,142 @@ std::ostream& operator<<(std::ostream& strm, const Escaper& esc)
 }
 
 
+} // namespace detail
+
+SockAddr::SockAddr(int af)
+{
+    memset(&store, 0, sizeof(store));
+    store.sa.sa_family = af;
+    if(af!=AF_INET
+#ifdef AF_INET6
+            && af!=AF_INET6
+#endif
+            && af!=AF_UNSPEC)
+        throw std::invalid_argument("Unsupported address family");
+}
+
+unsigned short SockAddr::port() const
+{
+    switch(store.sa.sa_family) {
+    case AF_INET: return ntohs(store.in.sin_port);
+#ifdef AF_INET6
+    case AF_INET6:return ntohs(store.in6.sin6_port);
+#endif
+    default: return 0;
+    }
+}
+
+void SockAddr::setPort(unsigned short port)
+{
+    switch(store.sa.sa_family) {
+    case AF_INET: store.in.sin_port = htons(port); break;
+#ifdef AF_INET6
+    case AF_INET6:store.in6.sin6_port = htons(port); break;
+#endif
+    default:
+        throw std::logic_error("SockAddr: set family before port");
+    }
+}
+
+void SockAddr::setAddress(const char *name)
+{
+    SockAddr temp;
+    int templen = sizeof(temp.store);
+    if(evutil_parse_sockaddr_port(name, &temp->sa, &templen))
+        throw std::runtime_error(std::string("Unable to parse as IP addresss: ")+name);
+    (*this) = temp;
+}
+
+bool SockAddr::isLO() const
+{
+    switch(store.sa.sa_family) {
+    case AF_INET: return store.in.sin_addr.s_addr==htonl(INADDR_LOOPBACK);
+#ifdef AF_INET6
+    case AF_INET6: return IN6_IS_ADDR_LOOPBACK(&store.in6.sin6_addr);
+#endif
+    default: return false;
+    }
+}
+
+std::string SockAddr::tostring() const
+{
+    std::ostringstream strm;
+    strm<<(*this);
+    return strm.str();
+}
+
+SockAddr SockAddr::any(int af, unsigned port)
+{
+    SockAddr ret(af);
+    switch(af) {
+    case AF_INET:
+        ret->in.sin_addr.s_addr = htonl(INADDR_ANY);
+        ret->in.sin_port = htons(port);
+        break;
+#ifdef AF_INET6
+    case AF_INET6:
+        ret->in6.sin6_addr = IN6ADDR_ANY_INIT;
+        ret->in6.sin6_port = htons(port);
+        break;
+#endif
+    default:
+        throw std::invalid_argument("Unsupported address family");
+    }
+    return ret;
+}
+
+SockAddr SockAddr::loopback(int af, unsigned port)
+{
+    SockAddr ret(af);
+    switch(af) {
+    case AF_INET:
+        ret->in.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
+        ret->in.sin_port = htons(port);
+        break;
+#ifdef AF_INET6
+    case AF_INET6:
+        ret->in6.sin6_addr = IN6ADDR_LOOPBACK_INIT;
+        ret->in6.sin6_port = htons(port);
+        break;
+#endif
+    default:
+        throw std::invalid_argument("Unsupported address family");
+    }
+    return ret;
+}
+
+std::ostream& operator<<(std::ostream& strm, const SockAddr& addr)
+{
+    switch(addr->sa.sa_family) {
+    case AF_INET: {
+        char buf[INET_ADDRSTRLEN+1];
+        if(evutil_inet_ntop(AF_INET, &addr->in.sin_addr, buf, sizeof(buf))) {
+            buf[sizeof(buf)-1] = '\0'; // paranoia
+        } else {
+            strm<<"<\?\?\?>";
+        }
+        strm<<buf<<':'<<ntohs(addr->in.sin_port);
+        break;
+    }
+#ifdef AF_INET6
+    case AF_INET6: {
+            char buf[INET6_ADDRSTRLEN+1];
+            if(evutil_inet_ntop(AF_INET6, &addr->in6.sin6_addr, buf, sizeof(buf))) {
+                buf[sizeof(buf)-1] = '\0'; // paranoia
+            } else {
+                strm<<"<\?\?\?>";
+            }
+            strm<<buf<<':'<<ntohs(addr->in6.sin6_port);
+            break;
+    }
+#endif
+    case AF_UNSPEC:
+        strm<<"<>";
+        break;
+    default:
+        strm<<"<\?\?\?>";
+    }
+    return strm;
 }
 
 }