From 606dd03e9b0d4cf65ef56e52fab063e3ed5ef797 Mon Sep 17 00:00:00 2001 From: KJ Tsanaktsidis Date: Fri, 15 Mar 2024 00:27:05 +0800 Subject: =?UTF-8?q?[Bug=20#20208]=20Revert=20"Set=20AI=5FADDRCONFIG=20when?= =?UTF-8?q?=20making=20getaddrinfo(3)=20calls=20for=20outgoi=E2=80=A6=20(#?= =?UTF-8?q?9791)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Revert "Set AI_ADDRCONFIG when making getaddrinfo(3) calls for outgoing conns" This reverts commit 673ed41c81cf5a6951bcb2c3dec82d7bd6ea7440. --- ext/socket/extconf.rb | 2 -- ext/socket/ipsocket.c | 11 ++--------- 2 files changed, 2 insertions(+), 11 deletions(-) (limited to 'ext') 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); /* -- cgit v1.2.3