romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-08-26 16:23:32 +03:00
Code Issues Projects Releases Packages Wiki Activity

resolve: make forced IPv4 resolve only use A queries

Browse source 
This protects IPv4-only transfers from undesired bad IPv6-related side
effects and make IPv4 transfers in dual-stack libcurl behave the same
way as in IPv4 single-stack libcurl.

Closes #9540
This commit is contained in:
Dmitry Karpov 2022-09-19 13:59:35 -07:00 • committed by Daniel Stenberg
parent ae9e713c4e
commit 1902e8fc51
No known key found for this signature in database
GPG key ID: 5CC908FDB71E12C2
5 changed files with 29 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

23
lib/hostip.c
View file

@ -297,6 +297,29 @@ static struct Curl_dns_entry *fetch_addr(struct Curl_easy *data,
}
}
/* See if the returned entry matches the required resolve mode */
if(dns && data->conn->ip_version != CURL_IPRESOLVE_WHATEVER) {
int pf = PF_INET;
bool found = false;
struct Curl_addrinfo *addr = dns->addr;
if(data->conn->ip_version == CURL_IPRESOLVE_V6)
pf = PF_INET6;
while(addr) {
if(addr->ai_family == pf) {
found = true;
break;
}
addr = addr->ai_next;
}
if(!found) {
infof(data, "Hostname in DNS cache doesn't have needed family, zapped");
dns = NULL; /* the memory deallocation is being handled by the hash */
Curl_hash_delete(data->dns.hostcache, entry_id, entry_len + 1);
}
}
return dns;
}