From d2347c9fdda8d21ede3f91ae8a4873ac04b498aa Mon Sep 17 00:00:00 2001 From: Martin Sustrik Date: Tue, 24 Apr 2012 11:25:26 +0200 Subject: tcp_address_t and ipc_address_t merged into a single class This patch is a preliminary work for mergine TCP and IPC connecters and listeners. The ultimated goal is to avoid code duplication occuring in these classes. Signed-off-by: Martin Sustrik --- builds/msvc/libxs/libxs.vcxproj | 6 +- builds/msvc/libxs/libxs.vcxproj.filters | 18 +- src/Makefile.am | 6 +- src/address.cpp | 450 ++++++++++++++++++++++++++++++++ src/address.hpp | 60 +++++ src/ipc_address.cpp | 60 ----- src/ipc_address.hpp | 62 ----- src/ipc_connecter.cpp | 4 +- src/ipc_connecter.hpp | 4 +- src/ipc_listener.cpp | 8 +- src/tcp_address.cpp | 442 ------------------------------- src/tcp_address.hpp | 78 ------ src/tcp_connecter.cpp | 22 +- src/tcp_connecter.hpp | 6 +- src/tcp_listener.cpp | 15 +- src/tcp_listener.hpp | 4 +- 16 files changed, 556 insertions(+), 689 deletions(-) create mode 100644 src/address.cpp create mode 100644 src/address.hpp delete mode 100644 src/ipc_address.cpp delete mode 100644 src/ipc_address.hpp delete mode 100644 src/tcp_address.cpp delete mode 100644 src/tcp_address.hpp diff --git a/builds/msvc/libxs/libxs.vcxproj b/builds/msvc/libxs/libxs.vcxproj index 229d7ec..4effff4 100644 --- a/builds/msvc/libxs/libxs.vcxproj +++ b/builds/msvc/libxs/libxs.vcxproj @@ -103,6 +103,7 @@ AllRules.ruleset + @@ -116,7 +117,6 @@ - @@ -151,7 +151,6 @@ - @@ -168,6 +167,7 @@ + @@ -188,7 +188,6 @@ - @@ -225,7 +224,6 @@ - diff --git a/builds/msvc/libxs/libxs.vcxproj.filters b/builds/msvc/libxs/libxs.vcxproj.filters index a1b80e3..85831bf 100644 --- a/builds/msvc/libxs/libxs.vcxproj.filters +++ b/builds/msvc/libxs/libxs.vcxproj.filters @@ -11,6 +11,9 @@ + + Source Files + Source Files @@ -44,9 +47,6 @@ Source Files - - Source Files - Source Files @@ -134,9 +134,6 @@ Source Files - - Source Files - Source Files @@ -193,6 +190,9 @@ Header Files + + Header Files + Header Files @@ -247,9 +247,6 @@ Header Files - - Header Files - Header Files @@ -349,9 +346,6 @@ Header Files - - Header Files - Header Files diff --git a/src/Makefile.am b/src/Makefile.am index 03b6381..033ba52 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -16,6 +16,7 @@ include_HEADERS = ../include/xs.h endif libxs_la_SOURCES = \ + address.hpp \ array.hpp \ atomic_counter.hpp \ atomic_ptr.hpp \ @@ -36,7 +37,6 @@ libxs_la_SOURCES = \ io_object.hpp \ io_thread.hpp \ ip.hpp \ - ipc_address.hpp \ ipc_connecter.hpp \ ipc_listener.hpp \ i_engine.hpp \ @@ -74,7 +74,6 @@ libxs_la_SOURCES = \ stream_engine.hpp \ sub.hpp \ surveyor.hpp \ - tcp_address.hpp \ tcp_connecter.hpp \ tcp_listener.hpp \ thread.hpp \ @@ -89,6 +88,7 @@ libxs_la_SOURCES = \ xsurveyor.hpp \ ypipe.hpp \ yqueue.hpp \ + address.cpp \ clock.cpp \ core.cpp \ ctx.cpp \ @@ -102,7 +102,6 @@ libxs_la_SOURCES = \ io_object.cpp \ io_thread.cpp \ ip.cpp \ - ipc_address.cpp \ ipc_connecter.cpp \ ipc_listener.cpp \ kqueue.cpp \ @@ -134,7 +133,6 @@ libxs_la_SOURCES = \ stream_engine.cpp \ sub.cpp \ surveyor.cpp \ - tcp_address.cpp \ tcp_connecter.cpp \ tcp_listener.cpp \ thread.cpp \ diff --git a/src/address.cpp b/src/address.cpp new file mode 100644 index 0000000..8fb40f0 --- /dev/null +++ b/src/address.cpp @@ -0,0 +1,450 @@ +/* + Copyright (c) 2009-2012 250bpm s.r.o. + Copyright (c) 2007-2009 iMatix Corporation + Copyright (c) 2007-2011 Other contributors as noted in the AUTHORS file + + This file is part of Crossroads I/O project. + + Crossroads I/O 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. + + Crossroads 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 . +*/ + +#include +#include + +#include "address.hpp" +#include "platform.hpp" +#include "stdint.hpp" +#include "err.hpp" +#include "ip.hpp" + +#ifdef XS_HAVE_WINDOWS +#include "windows.hpp" +#else +#include +#include +#include +#include +#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 + +#if defined XS_HAVE_SOLARIS + +#include +#include +#include +#include + +// On Solaris platform, network interface name can be queried by ioctl. +static int resolve_nic_name (xs::address_t *self_, const char *nic_, + bool ipv4only_) +{ + // TODO: Unused parameter, IPv6 support not implemented for Solaris. + (void) ipv4only_; + + // Create a socket. + int fd = open_socket (AF_INET, SOCK_DGRAM, 0); + xs_assert (fd != -1); + + // Retrieve number of interfaces. + lifnum ifn; + ifn.lifn_family = AF_INET; + ifn.lifn_flags = 0; + int rc = ioctl (fd, SIOCGLIFNUM, (char*) &ifn); + xs_assert (rc != -1); + + // Allocate memory to get interface names. + size_t ifr_size = sizeof (struct lifreq) * ifn.lifn_count; + char *ifr = (char*) malloc (ifr_size); + alloc_assert (ifr); + + // Retrieve interface names. + lifconf ifc; + ifc.lifc_family = AF_INET; + ifc.lifc_flags = 0; + ifc.lifc_len = ifr_size; + ifc.lifc_buf = ifr; + rc = ioctl (fd, SIOCGLIFCONF, (char*) &ifc); + xs_assert (rc != -1); + + // Find the interface with the specified name and AF_INET family. + bool found = false; + lifreq *ifrp = ifc.lifc_req; + for (int n = 0; n < (int) (ifc.lifc_len / sizeof (lifreq)); + n ++, ifrp ++) { + if (!strcmp (nic_, ifrp->lifr_name)) { + rc = ioctl (fd, SIOCGLIFADDR, (char*) ifrp); + xs_assert (rc != -1); + if (ifrp->lifr_addr.ss_family == AF_INET) { + *(sockaddr_in*) self_ = *(sockaddr_in*) &ifrp->lifr_addr; + found = true; + break; + } + } + } + + // Clean-up. + free (ifr); + close (fd); + + if (!found) { + errno = ENODEV; + return -1; + } + + return 0; +} + +#elif defined XS_HAVE_AIX || defined XS_HAVE_HPUX || defined XS_HAVE_ANDROID + +#include +#include +#include +#include + +static int resolve_nic_name (xs::address_t *self_, const char *nic_, + bool ipv4only_) +{ + // TODO: Unused parameter, IPv6 support not implemented for AIX or HP/UX. + (void) ipv4only_; + + // Create a socket. + int sd = open_socket (AF_INET, SOCK_DGRAM, 0); + xs_assert (sd != -1); + + struct ifreq ifr; + + // Copy interface name for ioctl get. + strncpy (ifr.ifr_name, nic_, sizeof (ifr.ifr_name)); + + // Fetch interface address. + int rc = ioctl (sd, SIOCGIFADDR, (caddr_t) &ifr, sizeof (struct ifreq)); + + // Clean up. + close (sd); + + if (rc == -1) { + errno = ENODEV; + return -1; + } + + ((sockaddr_in*) self_)->sin_addr = ((sockaddr_in*) &ifr.ifr_addr)->sin_addr; + + return 0; +} + +#elif ((defined XS_HAVE_LINUX || defined XS_HAVE_FREEBSD ||\ + defined XS_HAVE_OSX || defined XS_HAVE_OPENBSD ||\ + defined XS_HAVE_QNXNTO || defined XS_HAVE_NETBSD)\ + && defined XS_HAVE_IFADDRS) + +#include + +// On these platforms, network interface name can be queried +// using getifaddrs function. +static int resolve_nic_name (xs::address_t *self_, const char *nic_, + bool ipv4only_) +{ + // Get the addresses. + ifaddrs* ifa = NULL; + int rc = getifaddrs (&ifa); + errno_assert (rc == 0); + xs_assert (ifa != NULL); + + // Find the corresponding network interface. + bool found = false; + for (ifaddrs *ifp = ifa; ifp != NULL ;ifp = ifp->ifa_next) + { + if (ifp->ifa_addr == NULL) + continue; + + int family = ifp->ifa_addr->sa_family; + + if ((family == AF_INET + || (!ipv4only_ && family == AF_INET6)) + && !strcmp (nic_, ifp->ifa_name)) + { + memcpy (self_, ifp->ifa_addr, + (family == AF_INET) ? sizeof (struct sockaddr_in) + : sizeof (struct sockaddr_in6)); + found = true; + break; + } + } + + // Clean-up; + freeifaddrs (ifa); + + if (!found) { + errno = ENODEV; + return -1; + } + + return 0; +} + +#else + +// On other platforms we assume there are no sane interface names. +// This is true especially of Windows. +static int resolve_nic_name (xs::address_t *self_, const char *nic_, + bool ipv4only_) +{ + // All unused parameters. + (void) nic_; + (void) ipv4only_; + + errno = ENODEV; + return -1; +} + +#endif + +static int resolve_interface (xs::address_t *self_, char const *interface_, + bool ipv4only_) +{ + // Initialize temporary output pointers with storage address. + sockaddr_storage ss; + sockaddr *out_addr = (sockaddr *) &ss; + socklen_t out_addrlen; + + // Initialise IP-format family/port and populate temporary output pointers + // with the address. + if (ipv4only_) { + sockaddr_in ip4_addr; + memset (&ip4_addr, 0, sizeof (ip4_addr)); + ip4_addr.sin_family = AF_INET; + ip4_addr.sin_addr.s_addr = htonl (INADDR_ANY); + out_addrlen = (socklen_t) sizeof (ip4_addr); + memcpy (out_addr, &ip4_addr, out_addrlen); + } else { + sockaddr_in6 ip6_addr; + memset (&ip6_addr, 0, sizeof (ip6_addr)); + ip6_addr.sin6_family = AF_INET6; + memcpy (&ip6_addr.sin6_addr, &in6addr_any, sizeof (in6addr_any)); + out_addrlen = (socklen_t) sizeof (ip6_addr); + memcpy (out_addr, &ip6_addr, out_addrlen); + } + + // * resolves to INADDR_ANY or in6addr_any. + if (strcmp (interface_, "*") == 0) { + xs_assert (out_addrlen <= (socklen_t) sizeof (xs::address_t)); + memcpy (self_, out_addr, out_addrlen); + return 0; + } + + // Try to resolve the string as a NIC name. + int rc = resolve_nic_name (self_, interface_, ipv4only_); + if (rc != 0 && errno != ENODEV) + return rc; + if (rc == 0) + return 0; + + // There's no such interface name. Assume literal address. +#if defined XS_HAVE_OPENVMS && defined __ia64 + __addrinfo64 *res = NULL; + __addrinfo64 req; +#else + addrinfo *res = NULL; + addrinfo req; +#endif + memset (&req, 0, sizeof (req)); + + // Choose IPv4 or IPv6 protocol family. Note that IPv6 allows for + // IPv4-in-IPv6 addresses. + req.ai_family = ipv4only_ ? AF_INET : AF_INET6; + + // Arbitrary, not used in the output, but avoids duplicate results. + req.ai_socktype = SOCK_STREAM; + + // Restrict hostname/service to literals to avoid any DNS lookups or + // service-name irregularity due to indeterminate socktype. + req.ai_flags = AI_PASSIVE | AI_NUMERICHOST; + +#if defined AI_V4MAPPED && !defined XS_HAVE_WINDOWS && !defined XS_HAVE_FREEBSD + // On FreeBSD, AI_V4MAPPED isn't supported. + // Windows by default maps IPv4 addresses into IPv6. In this API we only + // require IPv4-mapped addresses when no native IPv6 interfaces are + // available (~AI_ALL). This saves an additional DNS roundtrip for IPv4 + // addresses. + if (req.ai_family == AF_INET6) + req.ai_flags |= AI_V4MAPPED; +#endif + + // Resolve the literal address. Some of the error info is lost in case + // of error, however, there's no way to report EAI errors via errno. + rc = getaddrinfo (interface_, NULL, &req, &res); + if (rc) { + errno = ENODEV; + return -1; + } + + // Use the first result. + xs_assert ((size_t) (res->ai_addrlen) <= sizeof (xs::address_t)); + memcpy (self_, res->ai_addr, res->ai_addrlen); + + // Cleanup getaddrinfo after copying the possibly referenced result. + if (res) + freeaddrinfo (res); + + return 0; +} + +static int resolve_hostname (xs::address_t *self_, const char *hostname_, + bool ipv4only_) +{ + // Set up the query. +#if defined XS_HAVE_OPENVMS && defined __ia64 && __INITIAL_POINTER_SIZE == 64 + __addrinfo64 req; +#else + addrinfo req; +#endif + memset (&req, 0, sizeof (req)); + + // Choose IPv4 or IPv6 protocol family. Note that IPv6 allows for + // IPv4-in-IPv6 addresses. + req.ai_family = ipv4only_ ? AF_INET : AF_INET6; + + // Need to choose one to avoid duplicate results from getaddrinfo() - this + // doesn't really matter, since it's not included in the addr-output. + req.ai_socktype = SOCK_STREAM; + +#if defined AI_V4MAPPED && !defined XS_HAVE_WINDOWS && !defined XS_HAVE_FREEBSD + // On FreeBSD, AI_V4MAPPED isn't supported. + // Windows by default maps IPv4 addresses into IPv6. In this API we only + // require IPv4-mapped addresses when no native IPv6 interfaces are + // available. This saves an additional DNS roundtrip for IPv4 addresses. + if (req.ai_family == AF_INET6) + req.ai_flags |= AI_V4MAPPED; +#endif + + // Resolve host name. Some of the error info is lost in case of error, + // however, there's no way to report EAI errors via errno. +#if defined XS_HAVE_OPENVMS && defined __ia64 && __INITIAL_POINTER_SIZE == 64 + __addrinfo64 *res; +#else + addrinfo *res; +#endif + int rc = getaddrinfo (hostname_, NULL, &req, &res); + if (rc) { + switch (rc) { + case EAI_MEMORY: + errno = ENOMEM; + break; + default: + errno = EINVAL; + break; + } + return -1; + } + + // Copy first result to output addr with hostname and service. + xs_assert ((size_t) (res->ai_addrlen) <= sizeof (xs::address_t)); + memcpy (self_, res->ai_addr, res->ai_addrlen); + + freeaddrinfo (res); + + return 0; +} + +int xs::address_resolve_tcp (address_t *self_, const char *name_, bool local_, + bool ipv4only_, bool ignore_port_) +{ + memset (self_, 0, sizeof (address_t)); + + // Find the ':' at end that separates address from the port number. + const char *delimiter = strrchr (name_, ':'); + std::string addr_str; + uint16_t port = 0; + + if (!ignore_port_) { + if (!delimiter) { + errno = EINVAL; + return -1; + } + + // Separate the address/port. + addr_str = std::string (name_, delimiter - name_); + + // Parse the port number (0 is not a valid port). + port = (uint16_t) atoi (delimiter+1); + if (port == 0) { + errno = EINVAL; + return -1; + } + } + else + addr_str = name_; + + // Remove square brackets around the address, if any. + if (addr_str.size () >= 2 && addr_str [0] == '[' && + addr_str [addr_str.size () - 1] == ']') + addr_str = addr_str.substr (1, addr_str.size () - 2); + + // Resolve the IP address. + int rc; + if (local_) + rc = resolve_interface (self_, addr_str.c_str (), ipv4only_); + else + rc = resolve_hostname (self_, addr_str.c_str (), ipv4only_); + if (rc != 0) + return -1; + + // Set the port into the address structure. + if (self_->ss_family == AF_INET6) + ((struct sockaddr_in6*) self_)->sin6_port = htons (port); + else + ((struct sockaddr_in* ) self_)->sin_port = htons (port); + + return 0; +} + + +int xs::address_resolve_ipc (address_t *self_, const char *name_) +{ +#if defined XS_HAVE_WINDOWS || defined XS_HAVE_OPENVMS + errno = ENOTSUP; + return -1; +#else + memset (self_, 0, sizeof (address_t)); + struct sockaddr_un *un = (struct sockaddr_un*) self_; + if (strlen (name_) >= sizeof (un->sun_path)) { + errno = ENAMETOOLONG; + return -1; + } + self_->ss_family = AF_UNIX; + strncpy (un->sun_path, name_, sizeof (un->sun_path)); + return 0; +#endif +} + +socklen_t xs::address_size (address_t *self_) +{ +#if !defined XS_HAVE_WINDOWS && !defined XS_HAVE_OPENVMS + if (self_->ss_family == AF_UNIX) + return (socklen_t) sizeof (struct sockaddr_un); +#endif + if (self_->ss_family == AF_INET6) + return (socklen_t) sizeof (struct sockaddr_in6); + if (self_->ss_family == AF_INET) + return (socklen_t) sizeof (struct sockaddr_in); + xs_assert (false); + return 0; +} + diff --git a/src/address.hpp b/src/address.hpp new file mode 100644 index 0000000..2d86a02 --- /dev/null +++ b/src/address.hpp @@ -0,0 +1,60 @@ +/* + Copyright (c) 2009-2012 250bpm s.r.o. + Copyright (c) 2007-2009 iMatix Corporation + Copyright (c) 2007-2011 Other contributors as noted in the AUTHORS file + + This file is part of Crossroads I/O project. + + Crossroads I/O 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. + + Crossroads 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 . +*/ + +#ifndef __XS_ADDRESS_HPP_INCLUDED__ +#define __XS_ADDRESS_HPP_INCLUDED__ + +#include "platform.hpp" + +#if defined XS_HAVE_WINDOWS +#include "windows.hpp" +#else +#include +#include +#include +#endif + +#if !defined XS_HAVE_WINDOWS && !defined XS_HAVE_OPENVMS +#include +#endif + +namespace xs +{ + + typedef struct sockaddr_storage 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 address_resolve_tcp (address_t *self_, const char *name_, bool local_, + bool ipv4only_, bool ignore_port_=false); + + // Resolves IPC (UNIX domain socket) address. + int address_resolve_ipc (address_t *self_, const char *name_); + + // Returns actual size of the address. + socklen_t address_size (address_t *self_); + +} + +#endif + diff --git a/src/ipc_address.cpp b/src/ipc_address.cpp deleted file mode 100644 index faea5db..0000000 --- a/src/ipc_address.cpp +++ /dev/null @@ -1,60 +0,0 @@ -/* - Copyright (c) 2012 250bpm s.r.o. - Copyright (c) 2011 Other contributors as noted in the AUTHORS file - - This file is part of Crossroads I/O project. - - Crossroads I/O 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. - - Crossroads 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 . -*/ - -#include "ipc_address.hpp" - -#if !defined XS_HAVE_WINDOWS && !defined XS_HAVE_OPENVMS - -#include "err.hpp" - -#include - -xs::ipc_address_t::ipc_address_t () -{ - memset (&address, 0, sizeof (address)); -} - -xs::ipc_address_t::~ipc_address_t () -{ -} - -int xs::ipc_address_t::resolve (const char *path_) -{ - if (strlen (path_) >= sizeof (address.sun_path)) { - errno = ENAMETOOLONG; - return -1; - } - - address.sun_family = AF_UNIX; - strncpy (address.sun_path, path_, sizeof (address.sun_path)); - return 0; -} - -sockaddr *xs::ipc_address_t::addr () -{ - return (sockaddr*) &address; -} - -socklen_t xs::ipc_address_t::addrlen () -{ - return (socklen_t) sizeof (address); -} - -#endif diff --git a/src/ipc_address.hpp b/src/ipc_address.hpp deleted file mode 100644 index 09b6eff..0000000 --- a/src/ipc_address.hpp +++ /dev/null @@ -1,62 +0,0 @@ -/* - Copyright (c) 2011-2012 250bpm s.r.o. - Copyright (c) 2011 Other contributors as noted in the AUTHORS file - - This file is part of Crossroads I/O project. - - Crossroads I/O 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. - - Crossroads 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 . -*/ - -#ifndef __XS_IPC_ADDRESS_HPP_INCLUDED__ -#define __XS_IPC_ADDRESS_HPP_INCLUDED__ - -#include "platform.hpp" - -#if !defined XS_HAVE_WINDOWS && !defined XS_HAVE_OPENVMS - -#include -#include -#include - -namespace xs -{ - - class ipc_address_t - { - public: - - ipc_address_t (); - ~ipc_address_t (); - - // This function sets up the address for UNIX domain transport. - int resolve (const char* path_); - - sockaddr *addr (); - socklen_t addrlen (); - - private: - - struct sockaddr_un address; - - ipc_address_t (const ipc_address_t&); - const ipc_address_t &operator = (const ipc_address_t&); - }; - -} - -#endif - -#endif - - diff --git a/src/ipc_connecter.cpp b/src/ipc_connecter.cpp index ab2d872..ec9c5b1 100644 --- a/src/ipc_connecter.cpp +++ b/src/ipc_connecter.cpp @@ -174,7 +174,7 @@ int xs::ipc_connecter_t::get_new_reconnect_ivl () int xs::ipc_connecter_t::set_address (const char *addr_) { - return address.resolve (addr_); + return address_resolve_ipc (&address, addr_); } int xs::ipc_connecter_t::open () @@ -190,7 +190,7 @@ int xs::ipc_connecter_t::open () unblock_socket (s); // Connect to the remote peer. - int rc = ::connect (s, address.addr (), address.addrlen ()); + int rc = ::connect (s, (const sockaddr*) &address, address_size (&address)); // Connect was successfull immediately. if (rc == 0) diff --git a/src/ipc_connecter.hpp b/src/ipc_connecter.hpp index 84c50fa..2a874bc 100644 --- a/src/ipc_connecter.hpp +++ b/src/ipc_connecter.hpp @@ -29,7 +29,7 @@ #include "own.hpp" #include "stdint.hpp" #include "io_object.hpp" -#include "ipc_address.hpp" +#include "address.hpp" namespace xs { @@ -88,7 +88,7 @@ namespace xs fd_t connect (); // Address to connect to. - ipc_address_t address; + address_t address; // Underlying socket. fd_t s; diff --git a/src/ipc_listener.cpp b/src/ipc_listener.cpp index 43f75c1..286c531 100644 --- a/src/ipc_listener.cpp +++ b/src/ipc_listener.cpp @@ -27,7 +27,7 @@ #include #include "stream_engine.hpp" -#include "ipc_address.hpp" +#include "address.hpp" #include "io_thread.hpp" #include "session_base.hpp" #include "config.hpp" @@ -103,8 +103,8 @@ int xs::ipc_listener_t::set_address (const char *addr_) filename.clear (); // Initialise the address structure. - ipc_address_t address; - int rc = address.resolve (addr_); + address_t address; + int rc = address_resolve_ipc (&address, addr_); if (rc != 0) return -1; @@ -114,7 +114,7 @@ int xs::ipc_listener_t::set_address (const char *addr_) return -1; // Bind the socket to the file path. - rc = bind (s, address.addr (), address.addrlen ()); + rc = bind (s, (const sockaddr*) &address, address_size (&address)); if (rc != 0) return -1; diff --git a/src/tcp_address.cpp b/src/tcp_address.cpp deleted file mode 100644 index 9132c37..0000000 --- a/src/tcp_address.cpp +++ /dev/null @@ -1,442 +0,0 @@ -/* - Copyright (c) 2009-2012 250bpm s.r.o. - Copyright (c) 2007-2009 iMatix Corporation - Copyright (c) 2007-2011 Other contributors as noted in the AUTHORS file - - This file is part of Crossroads I/O project. - - Crossroads I/O 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. - - Crossroads 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 . -*/ - -#include -#include - -#include "tcp_address.hpp" -#include "platform.hpp" -#include "stdint.hpp" -#include "err.hpp" -#include "ip.hpp" - -#ifdef XS_HAVE_WINDOWS -#include "windows.hpp" -#else -#include -#include -#include -#include -#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 - -#if defined XS_HAVE_SOLARIS - -#include -#include -#include -#include - -// On Solaris platform, network interface name can be queried by ioctl. -int xs::tcp_address_t::resolve_nic_name (const char *nic_, bool ipv4only_) -{ - // TODO: Unused parameter, IPv6 support not implemented for Solaris. - (void) ipv4only_; - - // Create a socket. - int fd = open_socket (AF_INET, SOCK_DGRAM, 0); - xs_assert (fd != -1); - - // Retrieve number of interfaces. - lifnum ifn; - ifn.lifn_family = AF_INET; - ifn.lifn_flags = 0; - int rc = ioctl (fd, SIOCGLIFNUM, (char*) &ifn); - xs_assert (rc != -1); - - // Allocate memory to get interface names. - size_t ifr_size = sizeof (struct lifreq) * ifn.lifn_count; - char *ifr = (char*) malloc (ifr_size); - alloc_assert (ifr); - - // Retrieve interface names. - lifconf ifc; - ifc.lifc_family = AF_INET; - ifc.lifc_flags = 0; - ifc.lifc_len = ifr_size; - ifc.lifc_buf = ifr; - rc = ioctl (fd, SIOCGLIFCONF, (char*) &ifc); - xs_assert (rc != -1); - - // Find the interface with the specified name and AF_INET family. - bool found = false; - lifreq *ifrp = ifc.lifc_req; - for (int n = 0; n < (int) (ifc.lifc_len / sizeof (lifreq)); - n ++, ifrp ++) { - if (!strcmp (nic_, ifrp->lifr_name)) { - rc = ioctl (fd, SIOCGLIFADDR, (char*) ifrp); - xs_assert (rc != -1); - if (ifrp->lifr_addr.ss_family == AF_INET) { - address.ipv4 = *(sockaddr_in*) &ifrp->lifr_addr; - found = true; - break; - } - } - } - - // Clean-up. - free (ifr); - close (fd); - - if (!found) { - errno = ENODEV; - return -1; - } - - return 0; -} - -#elif defined XS_HAVE_AIX || defined XS_HAVE_HPUX || defined XS_HAVE_ANDROID - -#include -#include -#include -#include - -int xs::tcp_address_t::resolve_nic_name (const char *nic_, bool ipv4only_) -{ - // TODO: Unused parameter, IPv6 support not implemented for AIX or HP/UX. - (void) ipv4only_; - - // Create a socket. - int sd = open_socket (AF_INET, SOCK_DGRAM, 0); - xs_assert (sd != -1); - - struct ifreq ifr; - - // Copy interface name for ioctl get. - strncpy (ifr.ifr_name, nic_, sizeof (ifr.ifr_name)); - - // Fetch interface address. - int rc = ioctl (sd, SIOCGIFADDR, (caddr_t) &ifr, sizeof (struct ifreq)); - - // Clean up. - close (sd); - - if (rc == -1) { - errno = ENODEV; - return -1; - } - - memcpy (&address.ipv4.sin_addr, &((sockaddr_in*) &ifr.ifr_addr)->sin_addr, - sizeof (in_addr)); - - return 0; -} - -#elif ((defined XS_HAVE_LINUX || defined XS_HAVE_FREEBSD ||\ - defined XS_HAVE_OSX || defined XS_HAVE_OPENBSD ||\ - defined XS_HAVE_QNXNTO || defined XS_HAVE_NETBSD)\ - && defined XS_HAVE_IFADDRS) - -#include - -// On these platforms, network interface name can be queried -// using getifaddrs function. -int xs::tcp_address_t::resolve_nic_name (const char *nic_, bool ipv4only_) -{ - // Get the addresses. - ifaddrs* ifa = NULL; - int rc = getifaddrs (&ifa); - errno_assert (rc == 0); - xs_assert (ifa != NULL); - - // Find the corresponding network interface. - bool found = false; - for (ifaddrs *ifp = ifa; ifp != NULL ;ifp = ifp->ifa_next) - { - if (ifp->ifa_addr == NULL) - continue; - - int family = ifp->ifa_addr->sa_family; - - if ((family == AF_INET - || (!ipv4only_ && family == AF_INET6)) - && !strcmp (nic_, ifp->ifa_name)) - { - memcpy (&address, ifp->ifa_addr, - (family == AF_INET) ? sizeof (struct sockaddr_in) - : sizeof (struct sockaddr_in6)); - found = true; - break; - } - } - - // Clean-up; - freeifaddrs (ifa); - - if (!found) { - errno = ENODEV; - return -1; - } - - return 0; -} - -#else - -// On other platforms we assume there are no sane interface names. -// This is true especially of Windows. -int xs::tcp_address_t::resolve_nic_name (const char *nic_, bool ipv4only_) -{ - // All unused parameters. - (void) nic_; - (void) ipv4only_; - - errno = ENODEV; - return -1; -} - -#endif - -int xs::tcp_address_t::resolve_interface (char const *interface_, - bool ipv4only_) -{ - // Initialize temporary output pointers with storage address. - sockaddr_storage ss; - sockaddr *out_addr = (sockaddr *) &ss; - socklen_t out_addrlen; - - // Initialise IP-format family/port and populate temporary output pointers - // with the address. - if (ipv4only_) { - sockaddr_in ip4_addr; - memset (&ip4_addr, 0, sizeof (ip4_addr)); - ip4_addr.sin_family = AF_INET; - ip4_addr.sin_addr.s_addr = htonl (INADDR_ANY); - out_addrlen = (socklen_t) sizeof (ip4_addr); - memcpy (out_addr, &ip4_addr, out_addrlen); - } else { - sockaddr_in6 ip6_addr; - memset (&ip6_addr, 0, sizeof (ip6_addr)); - ip6_addr.sin6_family = AF_INET6; - memcpy (&ip6_addr.sin6_addr, &in6addr_any, sizeof (in6addr_any)); - out_addrlen = (socklen_t) sizeof (ip6_addr); - memcpy (out_addr, &ip6_addr, out_addrlen); - } - - // * resolves to INADDR_ANY or in6addr_any. - if (strcmp (interface_, "*") == 0) { - xs_assert (out_addrlen <= (socklen_t) sizeof (address)); - memcpy (&address, out_addr, out_addrlen); - return 0; - } - - // Try to resolve the string as a NIC name. - int rc = resolve_nic_name (interface_, ipv4only_); - if (rc != 0 && errno != ENODEV) - return rc; - if (rc == 0) - return 0; - - // There's no such interface name. Assume literal address. -#if defined XS_HAVE_OPENVMS && defined __ia64 - __addrinfo64 *res = NULL; - __addrinfo64 req; -#else - addrinfo *res = NULL; - addrinfo req; -#endif - memset (&req, 0, sizeof (req)); - - // Choose IPv4 or IPv6 protocol family. Note that IPv6 allows for - // IPv4-in-IPv6 addresses. - req.ai_family = ipv4only_ ? AF_INET : AF_INET6; - - // Arbitrary, not used in the output, but avoids duplicate results. - req.ai_socktype = SOCK_STREAM; - - // Restrict hostname/service to literals to avoid any DNS lookups or - // service-name irregularity due to indeterminate socktype. - req.ai_flags = AI_PASSIVE | AI_NUMERICHOST; - -#if defined AI_V4MAPPED && !defined XS_HAVE_WINDOWS && !defined XS_HAVE_FREEBSD - // On FreeBSD, AI_V4MAPPED isn't supported. - // Windows by default maps IPv4 addresses into IPv6. In this API we only - // require IPv4-mapped addresses when no native IPv6 interfaces are - // available (~AI_ALL). This saves an additional DNS roundtrip for IPv4 - // addresses. - if (req.ai_family == AF_INET6) - req.ai_flags |= AI_V4MAPPED; -#endif - - // Resolve the literal address. Some of the error info is lost in case - // of error, however, there's no way to report EAI errors via errno. - rc = getaddrinfo (interface_, NULL, &req, &res); - if (rc) { - errno = ENODEV; - return -1; - } - - // Use the first result. - xs_assert ((size_t) (res->ai_addrlen) <= sizeof (address)); - memcpy (&address, res->ai_addr, res->ai_addrlen); - - // Cleanup getaddrinfo after copying the possibly referenced result. - if (res) - freeaddrinfo (res); - - return 0; -} - -int xs::tcp_address_t::resolve_hostname (const char *hostname_, bool ipv4only_) -{ - // Set up the query. -#if defined XS_HAVE_OPENVMS && defined __ia64 && __INITIAL_POINTER_SIZE == 64 - __addrinfo64 req; -#else - addrinfo req; -#endif - memset (&req, 0, sizeof (req)); - - // Choose IPv4 or IPv6 protocol family. Note that IPv6 allows for - // IPv4-in-IPv6 addresses. - req.ai_family = ipv4only_ ? AF_INET : AF_INET6; - - // Need to choose one to avoid duplicate results from getaddrinfo() - this - // doesn't really matter, since it's not included in the addr-output. - req.ai_socktype = SOCK_STREAM; - -#if defined AI_V4MAPPED && !defined XS_HAVE_WINDOWS && !defined XS_HAVE_FREEBSD - // On FreeBSD, AI_V4MAPPED isn't supported. - // Windows by default maps IPv4 addresses into IPv6. In this API we only - // require IPv4-mapped addresses when no native IPv6 interfaces are - // available. This saves an additional DNS roundtrip for IPv4 addresses. - if (req.ai_family == AF_INET6) - req.ai_flags |= AI_V4MAPPED; -#endif - - // Resolve host name. Some of the error info is lost in case of error, - // however, there's no way to report EAI errors via errno. -#if defined XS_HAVE_OPENVMS && defined __ia64 && __INITIAL_POINTER_SIZE == 64 - __addrinfo64 *res; -#else - addrinfo *res; -#endif - int rc = getaddrinfo (hostname_, NULL, &req, &res); - if (rc) { - switch (rc) { - case EAI_MEMORY: - errno = ENOMEM; - break; - default: - errno = EINVAL; - break; - } - return -1; - } - - // Copy first result to output addr with hostname and service. - xs_assert ((size_t) (res->ai_addrlen) <= sizeof (address)); - memcpy (&address, res->ai_addr, res->ai_addrlen); - - freeaddrinfo (res); - - return 0; -} - -xs::tcp_address_t::tcp_address_t () -{ - memset (&address, 0, sizeof (address)); -} - -xs::tcp_address_t::~tcp_address_t () -{ -} - -int xs::tcp_address_t::resolve (const char *name_, bool local_, bool ipv4only_, - bool ignore_port_) -{ - // Find the ':' at end that separates address from the port number. - const char *delimiter = strrchr (name_, ':'); - std::string addr_str; - uint16_t port = 0; - - if (!ignore_port_) { - if (!delimiter) { - errno = EINVAL; - return -1; - } - - // Separate the address/port. - addr_str = std::string (name_, delimiter - name_); - - // Parse the port number (0 is not a valid port). - port = (uint16_t) atoi (delimiter+1); - if (port == 0) { - errno = EINVAL; - return -1; - } - } - else - addr_str = name_; - - // Remove square brackets around the address, if any. - if (addr_str.size () >= 2 && addr_str [0] == '[' && - addr_str [addr_str.size () - 1] == ']') - addr_str = addr_str.substr (1, addr_str.size () - 2); - - // Resolve the IP address. - int rc; - if (local_) - rc = resolve_interface (addr_str.c_str (), ipv4only_); - else - rc = resolve_hostname (addr_str.c_str (), ipv4only_); - if (rc != 0) - return -1; - - // Set the port into the address structure. - if (address.generic.sa_family == AF_INET6) - address.ipv6.sin6_port = htons (port); - else - address.ipv4.sin_port = htons (port); - - return 0; -} - -sockaddr *xs::tcp_address_t::addr () -{ - return &address.generic; -} - -socklen_t xs::tcp_address_t::addrlen () -{ - if (address.generic.sa_family == AF_INET6) - return (socklen_t) sizeof (address.ipv6); - else - return (socklen_t) sizeof (address.ipv4); -} - -#if defined XS_HAVE_WINDOWS -unsigned short xs::tcp_address_t::family () -#else -sa_family_t xs::tcp_address_t::family () -#endif -{ - return address.generic.sa_family; -} - diff --git a/src/tcp_address.hpp b/src/tcp_address.hpp deleted file mode 100644 index 0a12ff3..0000000 --- a/src/tcp_address.hpp +++ /dev/null @@ -1,78 +0,0 @@ -/* - Copyright (c) 2009-2012 250bpm s.r.o. - Copyright (c) 2007-2009 iMatix Corporation - Copyright (c) 2007-2011 Other contributors as noted in the AUTHORS file - - This file is part of Crossroads I/O project. - - Crossroads I/O 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. - - Crossroads 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 . -*/ - -#ifndef __XS_TCP_ADDRESS_HPP_INCLUDED__ -#define __XS_TCP_ADDRESS_HPP_INCLUDED__ - -#include "platform.hpp" - -#if defined XS_HAVE_WINDOWS -#include "windows.hpp" -#else -#include -#include -#endif - -namespace xs -{ - - 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_, - bool ignore_port_=false); - -#if defined XS_HAVE_WINDOWS - unsigned short family (); -#else - sa_family_t family (); -#endif - sockaddr *addr (); - socklen_t addrlen (); - - private: - - int resolve_nic_name (const char *nic_, bool ipv4only_); - int resolve_interface (const char *interface_, bool ipv4only_); - int resolve_hostname (const char *hostname_, bool ipv4only_); - - union { - sockaddr generic; - sockaddr_in ipv4; - sockaddr_in6 ipv6; - } address; - - tcp_address_t (const tcp_address_t&); - const tcp_address_t &operator = (const tcp_address_t&); - }; - -} - -#endif - diff --git a/src/tcp_connecter.cpp b/src/tcp_connecter.cpp index 2fbbff6..d1c04db 100644 --- a/src/tcp_connecter.cpp +++ b/src/tcp_connecter.cpp @@ -181,6 +181,8 @@ int xs::tcp_connecter_t::get_new_reconnect_ivl () int xs::tcp_connecter_t::set_address (const char *addr_) { + memset (&source_address, 0, sizeof (source_address)); + // Find the ';'. It separates source address address from a destination. const char *delimiter = strchr (addr_, ';'); @@ -188,7 +190,7 @@ int xs::tcp_connecter_t::set_address (const char *addr_) if (delimiter) { std::string saddr_str (addr_, delimiter - addr_); addr_str = delimiter + 1; - int rc = source_address.resolve (saddr_str.c_str(), true, + int rc = address_resolve_tcp (&source_address, saddr_str.c_str(), true, options.ipv4only ? true : false, true); if (rc != 0) return -1; @@ -196,33 +198,39 @@ int xs::tcp_connecter_t::set_address (const char *addr_) else addr_str = addr_; - return address.resolve (addr_str.c_str(), false, + return address_resolve_tcp (&address, addr_str.c_str(), false, options.ipv4only ? true : false); } int xs::tcp_connecter_t::open () { + int rc; + xs_assert (s == retired_fd); // Create the socket. - s = open_tcp_socket (address.family (), options.keepalive ? true : false); + s = open_tcp_socket (address.ss_family, options.keepalive ? true : false); if (s == -1) return -1; // On some systems, IPv4 mapping in IPv6 sockets is disabled by default. // Switch it on in such cases. - if (address.family () == AF_INET6) + if (address.ss_family == AF_INET6) enable_ipv4_mapping (s); // Set the socket to non-blocking mode so that we get async connect(). unblock_socket (s); // Set a source address for conversations. - if (source_address.family ()) - ::bind (s, source_address.addr (), source_address.addrlen ()); + if (source_address.ss_family) { + rc = ::bind (s, (const sockaddr*) &source_address, + address_size (&source_address)); + if (rc != 0) + return -1; + } // Connect to the remote peer. - int rc = ::connect (s, address.addr (), address.addrlen ()); + rc = ::connect (s, (const sockaddr*) &address, address_size (&address)); // Connect was successfull immediately. if (rc == 0) diff --git a/src/tcp_connecter.hpp b/src/tcp_connecter.hpp index 87b4604..26a0151 100644 --- a/src/tcp_connecter.hpp +++ b/src/tcp_connecter.hpp @@ -26,7 +26,7 @@ #include "own.hpp" #include "stdint.hpp" #include "io_object.hpp" -#include "tcp_address.hpp" +#include "address.hpp" namespace xs { @@ -82,10 +82,10 @@ namespace xs fd_t connect (); // Address to connect to. - tcp_address_t address; + address_t address; // Source address. - tcp_address_t source_address; + address_t source_address; // Underlying socket. fd_t s; diff --git a/src/tcp_listener.cpp b/src/tcp_listener.cpp index 22797e2..ccae1ae 100644 --- a/src/tcp_listener.cpp +++ b/src/tcp_listener.cpp @@ -119,20 +119,21 @@ void xs::tcp_listener_t::close () int xs::tcp_listener_t::set_address (const char *addr_) { // Convert the textual address into address structure. - int rc = address.resolve (addr_, true, options.ipv4only ? true : false); + int rc = address_resolve_tcp (&address, addr_, true, + options.ipv4only ? true : false); if (rc != 0) return -1; // Create a listening socket. - s = open_tcp_socket (address.family (), false); + s = open_tcp_socket (address.ss_family, false); // IPv6 address family not supported, try automatic downgrade to IPv4. - if (address.family () == AF_INET6 && errno == EAFNOSUPPORT && + if (address.ss_family == AF_INET6 && errno == EAFNOSUPPORT && !options.ipv4only) { - rc = address.resolve (addr_, true, true); + rc = address_resolve_tcp (&address, addr_, true, true); if (rc != 0) return rc; - s = open_tcp_socket (address.family (), false); + s = open_tcp_socket (address.ss_family, false); } if (s == retired_fd) @@ -140,7 +141,7 @@ int xs::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 (address.family () == AF_INET6) + if (address.ss_family == AF_INET6) enable_ipv4_mapping (s); // Allow reusing of the address. @@ -155,7 +156,7 @@ int xs::tcp_listener_t::set_address (const char *addr_) #endif // Bind the socket to the network interface and port. - rc = bind (s, address.addr (), address.addrlen ()); + rc = bind (s, (const sockaddr*) &address, address_size (&address)); #ifdef XS_HAVE_WINDOWS if (rc == SOCKET_ERROR) { wsa_error_to_errno (); diff --git a/src/tcp_listener.hpp b/src/tcp_listener.hpp index 4ac6657..a5023ee 100644 --- a/src/tcp_listener.hpp +++ b/src/tcp_listener.hpp @@ -26,7 +26,7 @@ #include "own.hpp" #include "stdint.hpp" #include "io_object.hpp" -#include "tcp_address.hpp" +#include "address.hpp" namespace xs { @@ -63,7 +63,7 @@ namespace xs fd_t accept (); // Address to listen on. - tcp_address_t address; + address_t address; // True, if the undelying file for UNIX domain socket exists. bool has_file; -- cgit v1.2.3