diff options
| author | Raimo Niskanen <[email protected]> | 2010-12-03 17:55:58 +0100 |
|---|---|---|
| committer | Raimo Niskanen <[email protected]> | 2010-12-03 17:55:58 +0100 |
| commit | 0878f9b9daa32c5c0ec4fc3ca349bf5ba4455b8b (patch) | |
| tree | 0580fe7b6b6d80866f67679df9d5a6d5826e513b /erts/etc | |
| parent | 80d817c9a014d66e81cbb42c669cc8b3c7af8ef2 (diff) | |
| parent | 0d79832e450c49e51f5fd7149f5f72930ef1f966 (diff) | |
| download | otp-0878f9b9daa32c5c0ec4fc3ca349bf5ba4455b8b.tar.gz otp-0878f9b9daa32c5c0ec4fc3ca349bf5ba4455b8b.tar.bz2 otp-0878f9b9daa32c5c0ec4fc3ca349bf5ba4455b8b.zip | |
Merge branch 'pan/inet6_corrections/OTP-8969' into dev
* pan/inet6_corrections/OTP-8969:
Stop using uncertain flags for getaddrinfo()
Teach inet_test_lib to understand enetunreach
Make windows inet_gethost work for ipv6
Diffstat (limited to 'erts/etc')
| -rw-r--r-- | erts/etc/common/inet_gethost.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/erts/etc/common/inet_gethost.c b/erts/etc/common/inet_gethost.c index e095836258..8bd9368aa1 100644 --- a/erts/etc/common/inet_gethost.c +++ b/erts/etc/common/inet_gethost.c @@ -65,10 +65,8 @@ #include <stdlib.h> /* These are not used even if they would exist which they should not */ -#undef HAVE_GETADDRINFO #undef HAVE_GETIPNODEBYNAME #undef HAVE_GETHOSTBYNAME2 -#undef HAVE_GETNAMEINFO #undef HAVE_GETIPNODEBYADDR #else /* Unix */ @@ -1762,7 +1760,7 @@ static int worker_loop(void) struct addrinfo hints; memset(&hints, 0, sizeof(hints)); - hints.ai_flags = (AI_CANONNAME|AI_V4MAPPED|AI_ADDRCONFIG); + hints.ai_flags = AI_CANONNAME; hints.ai_socktype = SOCK_STREAM; hints.ai_family = AF_INET6; DEBUGF(5, ("Starting getaddrinfo(%s, ...)", data)); |