diff options
| author | KJ Tsanaktsidis <kj@kjtsanaktsidis.id.au> | 2024-03-15 00:27:05 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-14 16:27:05 +0000 |
| commit | 606dd03e9b0d4cf65ef56e52fab063e3ed5ef797 (patch) | |
| tree | 0b040edf74a6b3b58c8b31c1435e2d4712241a77 /ext | |
| parent | 53f0c5a4e8834f11af0f903d2c59754d9be2a7f2 (diff) | |
[Bug #20208] Revert "Set AI_ADDRCONFIG when making getaddrinfo(3) calls for outgoi… (#9791)
Revert "Set AI_ADDRCONFIG when making getaddrinfo(3) calls for outgoing conns"
This reverts commit 673ed41c81cf5a6951bcb2c3dec82d7bd6ea7440.
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/socket/extconf.rb | 2 | ||||
| -rw-r--r-- | ext/socket/ipsocket.c | 11 |
2 files changed, 2 insertions, 11 deletions
diff --git a/ext/socket/extconf.rb b/ext/socket/extconf.rb index 4e8536fc60..d44ce31b0a 100644 --- a/ext/socket/extconf.rb +++ b/ext/socket/extconf.rb @@ -607,8 +607,6 @@ You can try --enable-wide-getaddrinfo. EOS end - have_const('AI_ADDRCONFIG', headers) - case with_config("lookup-order-hack", "UNSPEC") when "INET" $defs << "-DLOOKUP_ORDER_HACK_INET" diff --git a/ext/socket/ipsocket.c b/ext/socket/ipsocket.c index 0a693655b4..0c13620258 100644 --- a/ext/socket/ipsocket.c +++ b/ext/socket/ipsocket.c @@ -54,22 +54,15 @@ init_inetsock_internal(VALUE v) VALUE connect_timeout = arg->connect_timeout; struct timeval tv_storage; struct timeval *tv = NULL; - int remote_addrinfo_hints = 0; if (!NIL_P(connect_timeout)) { tv_storage = rb_time_interval(connect_timeout); tv = &tv_storage; } - if (type == INET_SERVER) { - remote_addrinfo_hints |= AI_PASSIVE; - } -#ifdef HAVE_CONST_AI_ADDRCONFIG - remote_addrinfo_hints |= AI_ADDRCONFIG; -#endif - arg->remote.res = rsock_addrinfo(arg->remote.host, arg->remote.serv, - family, SOCK_STREAM, remote_addrinfo_hints); + family, SOCK_STREAM, + (type == INET_SERVER) ? AI_PASSIVE : 0); /* |