generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-11-07 05:58:45 +01:00
Code Issues Projects Releases Wiki Activity

Don't set the AI_V4MAPPED flag on FreeBSD

Browse Source 
The problem is that even though the AI_V4MAPPED flag is defined
on FreeBSD, the getaddrinfo function does not support it and
returns EAI_BADFLAGS.

The patch also sets the flag on Windows if it is defined there.
This is true for Windows Vista and later.

Fixes issue #331.
This commit is contained in:
Martin Hurton
2012-03-25 23:51:51 +02:00
parent 6d776d0865
commit c2e9997a3c
1 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/tcp_address.cpp
View File

@@ -277,11 +277,12 @@ int zmq::tcp_address_t::resolve_interface (char const *interface_,
// service-name irregularity due to indeterminate socktype. // service-name irregularity due to indeterminate socktype.
req.ai_flags = AI_PASSIVE | AI_NUMERICHOST; req.ai_flags = AI_PASSIVE | AI_NUMERICHOST;
#ifndef ZMQ_HAVE_WINDOWS #if defined AI_V4MAPPED && !defined ZMQ_HAVE_FREEBSD
// Windows by default maps IPv4 addresses into IPv6. In this API we only // In this API we only require IPv4-mapped addresses when
// require IPv4-mapped addresses when no native IPv6 interfaces are // no native IPv6 interfaces are available (~AI_ALL).
// available (~AI_ALL). This saves an additional DNS roundtrip for IPv4 // This saves an additional DNS roundtrip for IPv4 addresses.
// addresses. // Note: While the AI_V4MAPPED flag is defined on FreeBSD system,
// it is not supported here. See libzmq issue #331.
if (req.ai_family == AF_INET6) if (req.ai_family == AF_INET6)
req.ai_flags |= AI_V4MAPPED; req.ai_flags |= AI_V4MAPPED;
#endif #endif
@@ -323,10 +324,12 @@ int zmq::tcp_address_t::resolve_hostname (const char *hostname_, bool ipv4only_)
// doesn't really matter, since it's not included in the addr-output. // doesn't really matter, since it's not included in the addr-output.
req.ai_socktype = SOCK_STREAM; req.ai_socktype = SOCK_STREAM;
#ifndef ZMQ_HAVE_WINDOWS #if defined AI_V4MAPPED && !defined ZMQ_HAVE_FREEBSD
// Windows by default maps IPv4 addresses into IPv6. In this API we only // In this API we only require IPv4-mapped addresses when
// require IPv4-mapped addresses when no native IPv6 interfaces are // no native IPv6 interfaces are available.
// available. This saves an additional DNS roundtrip for IPv4 addresses. // This saves an additional DNS roundtrip for IPv4 addresses.
// Note: While the AI_V4MAPPED flag is defined on FreeBSD system,
// it is not supported here. See libzmq issue #331.
if (req.ai_family == AF_INET6) if (req.ai_family == AF_INET6)
req.ai_flags |= AI_V4MAPPED; req.ai_flags |= AI_V4MAPPED;
#endif #endif