From: Harry Sintonen Date: Wed, 11 Sep 2024 10:10:44 +0000 (+0300) Subject: lib: fix AF_INET6 use outside of USE_IPV6 X-Git-Tag: curl-8_10_1~45 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6a9f3764f1ae95e4f794e4c4d0f8f53f642a48eb;p=thirdparty%2Fcurl.git lib: fix AF_INET6 use outside of USE_IPV6 Closes #14858 --- diff --git a/lib/cf-socket.c b/lib/cf-socket.c index 729e38f889..e4d6a5b86d 100644 --- a/lib/cf-socket.c +++ b/lib/cf-socket.c @@ -1749,7 +1749,11 @@ static CURLcode cf_socket_query(struct Curl_cfilter *cf, return CURLE_OK; } case CF_QUERY_IP_INFO: +#ifdef USE_IPV6 *pres1 = (ctx->addr.family == AF_INET6)? TRUE : FALSE; +#else + *pres1 = FALSE; +#endif *(struct ip_quadruple *)pres2 = ctx->ip; return CURLE_OK; default: diff --git a/lib/connect.c b/lib/connect.c index fb785f2750..b9da7c1621 100644 --- a/lib/connect.c +++ b/lib/connect.c @@ -800,8 +800,10 @@ static CURLcode start_connect(struct Curl_cfilter *cf, } else { /* no user preference, we try ipv6 always first when available */ +#ifdef USE_IPV6 ai_family0 = AF_INET6; addr0 = addr_first_match(remotehost->addr, ai_family0); +#endif /* next candidate is ipv4 */ ai_family1 = AF_INET; addr1 = addr_first_match(remotehost->addr, ai_family1);