generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-10-15 23:20:09 +02:00
Code Issues Projects Releases Wiki Activity

Add IPv6 support to tcp_listener

Browse Source 
Signed-off-by: Steven McCoy <steven.mccoy@miru.hk>
Signed-off-by: Martin Sustrik <sustrik@250bpm.com>
This commit is contained in:
Steven McCoy
2011-08-15 08:56:00 +02:00
committed by Martin Sustrik
parent 3c3c0bfd1f
commit 57440b86e2
4 changed files with 43 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/ip.cpp
View File

@@ -457,4 +457,21 @@ void zmq::unblock_socket (fd_t s_)
#endif #endif
} }
void zmq::enable_ipv4_mapping (fd_t s_)
{
#ifdef IPV6_V6ONLY
#ifdef ZMQ_HAVE_WINDOWS
DWORD flag = 0;
#else
int flag = 0;
#endif
int rc = setsockopt (s_, IPPROTO_IPV6, IPV6_V6ONLY, (const char*) &flag,
sizeof (flag));
#ifdef ZMQ_HAVE_WINDOWS
wsa_assert (rc != SOCKET_ERROR);
#else
errno_assert (rc == 0);
#endif
#endif
}

3
src/ip.hpp
View File

@@ -68,6 +68,9 @@ namespace zmq
// Sets the socket into non-blocking mode. // Sets the socket into non-blocking mode.
void unblock_socket (fd_t s_); void unblock_socket (fd_t s_);
// Enable IPv4-mapping of addresses in case it is disabled by default.
void enable_ipv4_mapping (fd_t s_);
} }
#endif #endif

21
src/tcp_connecter.cpp
View File

@@ -199,23 +199,10 @@ int zmq::tcp_connecter_t::open ()
return -1; return -1;
#endif #endif
// Enable IPv4-mapping of addresses in case it is disabled by default. // On some systems, IPv4 mapping in IPv6 sockets is disabled by default.
#ifdef IPV6_V6ONLY // Switch it on in such cases.
if (addr.ss_family == AF_INET6) { if (addr.ss_family == AF_INET6)
#ifdef ZMQ_HAVE_WINDOWS enable_ipv4_mapping (s);
DWORD flag = 0;
#else
int flag = 0;
#endif
int rc = setsockopt (s, IPPROTO_IPV6, IPV6_V6ONLY,
(const char*) &flag, sizeof (flag));
#ifdef ZMQ_HAVE_WINDOWS
wsa_assert (rc != SOCKET_ERROR);
#else
errno_assert (rc == 0);
#endif
}
#endif
// Set the socket to non-blocking mode so that we get async connect(). // Set the socket to non-blocking mode so that we get async connect().
unblock_socket (s); unblock_socket (s);

19
src/tcp_listener.cpp
View File

@@ -130,6 +130,20 @@ int zmq::tcp_listener_t::set_address (const char *addr_)
// Create a listening socket. // Create a listening socket.
s = ::socket (addr.ss_family, SOCK_STREAM, IPPROTO_TCP); s = ::socket (addr.ss_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 &&
!options.ipv4only) {
rc = resolve_ip_interface (&addr, &addr_len, addr_, true);
if (rc != 0)
return rc;
s = ::socket (addr.ss_family, SOCK_STREAM, IPPROTO_TCP);
}
#ifdef ZMQ_HAVE_WINDOWS #ifdef ZMQ_HAVE_WINDOWS
if (s == INVALID_SOCKET) { if (s == INVALID_SOCKET) {
wsa_error_to_errno (); wsa_error_to_errno ();
@@ -140,6 +154,11 @@ int zmq::tcp_listener_t::set_address (const char *addr_)
return -1; return -1;
#endif #endif
// On some systems, IPv4 mapping in IPv6 sockets is disabled by default.
// Switch it on in such cases.
if (addr.ss_family == AF_INET6)
enable_ipv4_mapping (s);
// Allow reusing of the address. // Allow reusing of the address.
int flag = 1; int flag = 1;
#ifdef ZMQ_HAVE_WINDOWS #ifdef ZMQ_HAVE_WINDOWS