TCP address related functionality moved to tcp_address_t

Signed-off-by: Martin Sustrik <sustrik@250bpm.com>

src/Makefile.am

@@ -63,6 +63,7 @@ libzmq_la_SOURCES = \
     stdint.hpp \
     stream_engine.hpp \
     sub.hpp \
+    tcp_address.hpp \
     tcp_connecter.hpp \
     tcp_listener.hpp \
     thread.hpp \
@@ -121,6 +122,7 @@ libzmq_la_SOURCES = \
     socket_base.cpp \
     stream_engine.cpp \
     sub.cpp \
+    tcp_address.cpp \
     tcp_connecter.cpp \
     tcp_listener.cpp \
     thread.cpp \

src/ip.hpp

@@ -21,43 +21,11 @@
 #ifndef __ZMQ_IP_HPP_INCLUDED__
 #define __ZMQ_IP_HPP_INCLUDED__
 
-#include "platform.hpp"
 #include "fd.hpp"
 
-#ifdef ZMQ_HAVE_WINDOWS
-#include "windows.hpp"
-#else
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <arpa/inet.h>
-#include <netinet/in.h>
-#include <netinet/tcp.h>
-#include <netdb.h>
-#endif
-
-//  Some platforms (notably Darwin/OSX and NetBSD) do not define all AI_
-//  flags for getaddrinfo(). This can be worked around safely by defining
-//  these to 0.
-#ifndef AI_ADDRCONFIG
-#define AI_ADDRCONFIG 0
-#endif
-#ifndef AI_NUMERICSERV
-#define AI_NUMERICSERV 0
-#endif
-
 namespace zmq
 {
 
-    //  Resolves network interface name in <nic-name>:<port> format. Symbol "*"
-    //  (asterisk) resolves to INADDR_ANY (all network interfaces).
-    int resolve_ip_interface (sockaddr_storage *addr_, socklen_t *addr_len_,
-        char const *interface_, bool ipv4only_);
-
-    //  This function resolves a string in <hostname>:<port-number> format.
-    //  Hostname can be either the name of the host or its IP address.
-    int resolve_ip_hostname (sockaddr_storage *addr_, socklen_t *addr_len_,
-        const char *hostname_, bool ipv4only_);
-
     //  Tunes the supplied TCP socket for the best latency.
     void tune_tcp_socket (fd_t s_);
 

src/tcp_address.hpp

+/*
+    Copyright (c) 2007-2011 iMatix Corporation
+    Copyright (c) 2007-2011 Other contributors as noted in the AUTHORS file
+
+    This file is part of 0MQ.
+
+    0MQ is free software; you can redistribute it and/or modify it under
+    the terms of the GNU Lesser General Public License as published by
+    the Free Software Foundation; either version 3 of the License, or
+    (at your option) any later version.
+
+    0MQ is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef __ZMQ_TCP_ADDRESS_HPP_INCLUDED__
+#define __ZMQ_TCP_ADDRESS_HPP_INCLUDED__
+
+#include "platform.hpp"
+
+#include <sys/socket.h>
+#include <netinet/in.h>
+
+namespace zmq
+{
+
+    class tcp_address_t
+    {
+    public:
+
+        tcp_address_t ();
+        ~tcp_address_t ();
+
+        //  This function translates textual TCP address into an address
+        //  strcuture. If 'local' is true, names are resolved as local interface
+        //  names. If it is false, names are resolved as remote hostnames.
+        //  If 'ipv4only' is true, the name will never resolve to IPv6 address.
+        int resolve (const char* name_, bool local_, bool ipv4only_);
+
+        sa_family_t family ();
+        sockaddr *addr ();
+        socklen_t addrlen ();
+
+    private:
+
+        int resolve_interface (char const *interface_, bool ipv4only_);
+        int resolve_hostname (const char *hostname_, bool ipv4only_);
+
+        union {
+            sockaddr generic;
+            sockaddr_in ipv4;
+            sockaddr_in6 ipv6;
+            char padding [1024];
+        } address;
+
+        tcp_address_t (const tcp_address_t&);
+        const tcp_address_t &operator = (const tcp_address_t&);
+    };
+    
+}
+
+#endif
+

src/tcp_connecter.cpp

@@ -56,9 +56,6 @@ zmq::tcp_connecter_t::tcp_connecter_t (class io_thread_t *io_thread_,
     session (session_),
     current_reconnect_ivl(options.reconnect_ivl)
 {
-    memset (&addr, 0, sizeof (addr));
-    addr_len = 0;
-
     //  TODO: set_addess should be called separately, so that the error
     //  can be propagated.
     int rc = set_address (address_);
@@ -179,8 +176,7 @@ int zmq::tcp_connecter_t::get_new_reconnect_ivl ()
 
 int zmq::tcp_connecter_t::set_address (const char *addr_)
 {
-    return resolve_ip_hostname (&addr, &addr_len, addr_,
-        options.ipv4only ? true : false);
+    return address.resolve (addr_, false, options.ipv4only ? true : false);
 }
 
 int zmq::tcp_connecter_t::open ()
@@ -188,7 +184,7 @@ int zmq::tcp_connecter_t::open ()
     zmq_assert (s == retired_fd);
 
     //  Create the socket.
-    s = socket (addr.ss_family, SOCK_STREAM, IPPROTO_TCP);
+    s = socket (address.family (), SOCK_STREAM, IPPROTO_TCP);
 #ifdef ZMQ_HAVE_WINDOWS
     if (s == INVALID_SOCKET) {
         wsa_error_to_errno ();
@@ -201,14 +197,14 @@ int zmq::tcp_connecter_t::open ()
 
     //  On some systems, IPv4 mapping in IPv6 sockets is disabled by default.
     //  Switch it on in such cases.
-    if (addr.ss_family == AF_INET6)
+    if (address.family () == AF_INET6)
         enable_ipv4_mapping (s);
 
     // Set the socket to non-blocking mode so that we get async connect().
     unblock_socket (s);
 
     //  Connect to the remote peer.
-    int rc = ::connect (s, (struct sockaddr*) &addr, addr_len);
+    int rc = ::connect (s, address.addr (), address.addrlen ());
 
     //  Connect was successfull immediately.
     if (rc == 0)

src/tcp_connecter.hpp

@@ -22,10 +22,10 @@
 #define __TCP_CONNECTER_HPP_INCLUDED__
 
 #include "fd.hpp"
-#include "ip.hpp"
 #include "own.hpp"
-#include "io_object.hpp"
 #include "stdint.hpp"
+#include "io_object.hpp"
+#include "tcp_address.hpp"
 
 namespace zmq
 {
@@ -81,8 +81,7 @@ namespace zmq
         fd_t connect ();
 
         //  Address to connect to.
-        sockaddr_storage addr;
-        socklen_t addr_len;
+        tcp_address_t address;
 
         //  Underlying socket.
         fd_t s;

src/tcp_listener.cpp

@@ -55,8 +55,6 @@ zmq::tcp_listener_t::tcp_listener_t (io_thread_t *io_thread_,
     s (retired_fd),
     socket (socket_)
 {
-    memset (&addr, 0, sizeof (addr));
-    addr_len = 0;
 }
 
 zmq::tcp_listener_t::~tcp_listener_t ()
@@ -122,26 +120,25 @@ void zmq::tcp_listener_t::close ()
 
 int zmq::tcp_listener_t::set_address (const char *addr_)
 {
-    //  Convert the interface into sockaddr_in structure.
-    int rc = resolve_ip_interface (&addr, &addr_len, addr_,
-        options.ipv4only ? true : false);
+    //  Convert the textual address into address structure.
+    int rc = address.resolve (addr_, true, options.ipv4only ? true : false);
     if (rc != 0)
         return -1;
 
     //  Create a listening socket.
-    s = ::socket (addr.ss_family, SOCK_STREAM, IPPROTO_TCP);
+    s = ::socket (address.family (), SOCK_STREAM, IPPROTO_TCP);
 #ifdef ZMQ_HAVE_WINDOWS
     if (s == INVALID_SOCKET)
         wsa_error_to_errno ();
 #endif
 
     //  IPv6 address family not supported, try automatic downgrade to IPv4.
-    if (addr.ss_family == AF_INET6 && errno == EAFNOSUPPORT &&
+    if (address.family () == AF_INET6 && errno == EAFNOSUPPORT &&
           !options.ipv4only) {
-        rc = resolve_ip_interface (&addr, &addr_len, addr_, true);
+        rc = address.resolve (addr_, true, true);
         if (rc != 0)
             return rc;
-        s = ::socket (addr.ss_family, SOCK_STREAM, IPPROTO_TCP);
+        s = ::socket (address.family (), SOCK_STREAM, IPPROTO_TCP);
     }
 
 #ifdef ZMQ_HAVE_WINDOWS
@@ -156,7 +153,7 @@ int zmq::tcp_listener_t::set_address (const char *addr_)
 
     //  On some systems, IPv4 mapping in IPv6 sockets is disabled by default.
     //  Switch it on in such cases.
-    if (addr.ss_family == AF_INET6)
+    if (address.family () == AF_INET6)
         enable_ipv4_mapping (s);
 
     //  Allow reusing of the address.
@@ -171,7 +168,7 @@ int zmq::tcp_listener_t::set_address (const char *addr_)
 #endif
 
     //  Bind the socket to the network interface and port.
-    rc = bind (s, (struct sockaddr*) &addr, addr_len);
+    rc = bind (s, address.addr (), address.addrlen ());
 #ifdef ZMQ_HAVE_WINDOWS
     if (rc == SOCKET_ERROR) {
         wsa_error_to_errno ();

src/tcp_listener.hpp

@@ -22,10 +22,10 @@
 #define __ZMQ_TCP_LISTENER_HPP_INCLUDED__
 
 #include "fd.hpp"
-#include "ip.hpp"
 #include "own.hpp"
-#include "io_object.hpp"
 #include "stdint.hpp"
+#include "io_object.hpp"
+#include "tcp_address.hpp"
 
 namespace zmq
 {
@@ -59,8 +59,7 @@ namespace zmq
         fd_t accept ();
 
         //  Address to listen on.
-        sockaddr_storage addr;
-        socklen_t addr_len;
+        tcp_address_t address;
 
         //  True, if the undelying file for UNIX domain socket exists.
         bool has_file;

src/vtcp_connecter.cpp

@@ -60,8 +60,6 @@ zmq::vtcp_connecter_t::vtcp_connecter_t (class io_thread_t *io_thread_,
     session (session_),
     current_reconnect_ivl(options.reconnect_ivl)
 {
-    memset (&addr, 0, sizeof (addr));
-    addr_len = 0;
     subport = 0;
 
     int rc = set_address (address_);
@@ -92,8 +90,7 @@ int zmq::vtcp_connecter_t::set_address (const char *addr_)
         addr_str += ":9220";
         std::string subport_str (delimiter + 1);
         subport = (vtcp_subport_t) atoi (subport_str.c_str ());
-        int rc = resolve_ip_hostname (&addr, &addr_len, addr_str.c_str (),
-            true);
+        int rc = address.resolve (addr_str.c_str (), false, true);
         if (rc != 0)
             return -1;
     }
@@ -101,8 +98,7 @@ int zmq::vtcp_connecter_t::set_address (const char *addr_)
         std::string addr_str (addr_, delimiter - addr_);
         std::string subport_str (delimiter + 1);
         subport = (vtcp_subport_t) atoi (subport_str.c_str ());
-        int rc = resolve_ip_hostname (&addr, &addr_len, addr_str.c_str (),
-            true);
+        int rc = address.resolve (addr_str.c_str (), false, true);
         if (rc != 0)
             return -1;
     }
@@ -207,7 +203,7 @@ int zmq::vtcp_connecter_t::open ()
     zmq_assert (s == retired_fd);
 
     //  Start the connection procedure.
-    sockaddr_in *paddr = (sockaddr_in*) &addr;
+    sockaddr_in *paddr = (sockaddr_in*) address.addr ();
     s = vtcp_connect (paddr->sin_addr.s_addr, ntohs (paddr->sin_port));
 
     //  Connect was successfull immediately.

src/vtcp_connecter.hpp

@@ -28,10 +28,10 @@
 #include <vtcp.h>
 
 #include "fd.hpp"
-#include "ip.hpp"
 #include "own.hpp"
-#include "io_object.hpp"
 #include "stdint.hpp"
+#include "io_object.hpp"
+#include "tcp_address.hpp"
 
 namespace zmq
 {
@@ -87,8 +87,7 @@ namespace zmq
         fd_t connect ();
 
         //  Address to connect to.
-        sockaddr_storage addr;
-        socklen_t addr_len;
+        tcp_address_t address;
         vtcp_subport_t subport;
 
         //  Underlying socket.