mirror of
https://github.com/curl/curl.git
synced 2026-04-14 22:31:41 +03:00
lib: make resolving HTTPS DNS records reliable:
- allow to specify when they are wanted on starting a resolve - match dns cache entries accordingly. An entry which never tried to get HTTPS-RRs is no answer for a resolve that wants it. - fix late arrivals of resolve answers to match the "async" records that started them - if it still exists. - provide for multiple "async" resolves in a transfer at the same time. We may need to resolve an IP interface while the main connection resolve has not finished yet. - allow lookup of HTTPS-RR information as soon as it is available, even if A/AAAA queries are still ongoing. For this, the "async" infrastructure is changed: - Defined bits for DNS queries `CURL_DNSQ_A`, `CURL_DNSQ_AAAA` and `CURL_DNSQ_HTTPS`. These replace `ip_version` which says nothing about HTTPS. Use them in dns cache entries for matching. - enhance the `async->id` to be a unique `uint32_t` for resolves inside one multi. This is weak, as the id may wrap around. However it is combined with the `mid` of the easy handle, making collisions highly unlikely. `data->state.async` is only accessed in few places where the mid/async-id match is performed. - vtls: for ECH supporting TLS backends (openssl, rustls, wolfssl), retrieve the HTTPS-RR information from the dns connection filter. Delay the connect if the HTTPS-RR is needed, but has not been resolved yet. The implementation of all this is complete for the threaded resolver. c-ares resolver and DoH do not take advantage of all new async features yet. To be done in separate PRs. Details: c-ares: cleanup settings and initialisation. Any ares channel is only being created on starting a resolve and propagating operations in setopt.c to the channel are not helpful. Changed threaded+ares pollset handling so that they do not overwrite each others `ASYNC_NAME` timeouts. Add trace name 'threads' for tracing thread queue and pool used by threaded resolver. Closes #21175
This commit is contained in:
parent
03a792b186
commit
2b3dfb4ad4
40 changed files with 1242 additions and 873 deletions
20
lib/ftp.c
20
lib/ftp.c
|
|
@ -1062,9 +1062,9 @@ static CURLcode ftp_port_resolve_host(struct Curl_easy *data,
|
|||
CURLcode result;
|
||||
|
||||
*resp = NULL;
|
||||
result = Curl_resolv_blocking(data, host, 0, conn->ip_version,
|
||||
Curl_conn_get_transport(data, conn),
|
||||
dns_entryp);
|
||||
result = Curl_resolv_blocking(
|
||||
data, Curl_resolv_dns_queries(data, conn->ip_version),
|
||||
host, 0, Curl_conn_get_transport(data, conn), dns_entryp);
|
||||
if(result)
|
||||
failf(data, "failed to resolve the address provided to PORT: %s", host);
|
||||
else {
|
||||
|
|
@ -2162,10 +2162,10 @@ static CURLcode ftp_state_pasv_resp(struct Curl_easy *data,
|
|||
if(result)
|
||||
goto error;
|
||||
|
||||
(void)Curl_resolv_blocking(data, host_name, ipquad.remote_port,
|
||||
is_ipv6 ? CURL_IPRESOLVE_V6 : CURL_IPRESOLVE_V4,
|
||||
Curl_conn_get_transport(data, conn),
|
||||
&dns);
|
||||
(void)Curl_resolv_blocking(
|
||||
data, is_ipv6 ? CURL_DNSQ_AAAA : CURL_DNSQ_A,
|
||||
host_name, ipquad.remote_port, Curl_conn_get_transport(data, conn),
|
||||
&dns);
|
||||
/* we connect to the proxy's port */
|
||||
connectport = (unsigned short)ipquad.remote_port;
|
||||
|
||||
|
|
@ -2189,9 +2189,9 @@ static CURLcode ftp_state_pasv_resp(struct Curl_easy *data,
|
|||
goto error;
|
||||
}
|
||||
|
||||
(void)Curl_resolv_blocking(data, newhost, newport, conn->ip_version,
|
||||
Curl_conn_get_transport(data, conn),
|
||||
&dns);
|
||||
(void)Curl_resolv_blocking(
|
||||
data, Curl_resolv_dns_queries(data, conn->ip_version),
|
||||
newhost, newport, Curl_conn_get_transport(data, conn), &dns);
|
||||
connectport = newport; /* we connect to the remote port */
|
||||
|
||||
if(!dns) {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue