From 7778010d76e6da534307ca3f0a3506d3d7f0ec5d Mon Sep 17 00:00:00 2001 From: Martin Sustrik Date: Mon, 15 Feb 2010 19:58:47 +0100 Subject: care taken of the fact that AI_NUMERICSERV is not defined on OSX 10.5 --- src/ip.cpp | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'src/ip.cpp') diff --git a/src/ip.cpp b/src/ip.cpp index 595689f..0fb2adf 100644 --- a/src/ip.cpp +++ b/src/ip.cpp @@ -239,7 +239,11 @@ int zmq::resolve_ip_interface (sockaddr_storage* addr_, socklen_t *addr_len_, // 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 | AI_NUMERICSERV; +#if defined ZMQ_HAVE_OSX + req.ai_flags = AI_PASSIVE | AI_NUMERICHOST; +#else + req.ai_flags = AI_PASSIVE | AI_NUMERICHOST | AI_NUMERICSERV; +#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. @@ -289,6 +293,11 @@ int zmq::resolve_ip_hostname (sockaddr_storage *addr_, socklen_t *addr_len_, // Avoid named services due to unclear socktype, and don't pick IPv6 // addresses if we don't have a local IPv6 address configured. req.ai_flags = AI_NUMERICSERV | AI_ADDRCONFIG; +#if defined ZMQ_HAVE_OSX + req.ai_flags = AI_ADDRCONFIG; +#else + req.ai_flags = AI_NUMERICSERV | AI_ADDRCONFIG; +#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. -- cgit v1.2.3 From 5041b0bc0bce43e5b6d8b6c6264141d33f3c2a7c Mon Sep 17 00:00:00 2001 From: Martin Sustrik Date: Mon, 15 Feb 2010 20:35:00 +0100 Subject: fixing the previous commit :( --- src/ip.cpp | 1 - 1 file changed, 1 deletion(-) (limited to 'src/ip.cpp') diff --git a/src/ip.cpp b/src/ip.cpp index 0fb2adf..822e359 100644 --- a/src/ip.cpp +++ b/src/ip.cpp @@ -292,7 +292,6 @@ int zmq::resolve_ip_hostname (sockaddr_storage *addr_, socklen_t *addr_len_, // Avoid named services due to unclear socktype, and don't pick IPv6 // addresses if we don't have a local IPv6 address configured. - req.ai_flags = AI_NUMERICSERV | AI_ADDRCONFIG; #if defined ZMQ_HAVE_OSX req.ai_flags = AI_ADDRCONFIG; #else -- cgit v1.2.3