mirror of
https://github.com/curl/curl.git
synced 2026-04-12 00:11:42 +08:00
2b3dfb4ad4
- 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
128 lines
3.7 KiB
C
128 lines
3.7 KiB
C
/***************************************************************************
|
|
* _ _ ____ _
|
|
* Project ___| | | | _ \| |
|
|
* / __| | | | |_) | |
|
|
* | (__| |_| | _ <| |___
|
|
* \___|\___/|_| \_\_____|
|
|
*
|
|
* Copyright (C) Daniel Stenberg, <daniel@haxx.se>, et al.
|
|
*
|
|
* This software is licensed as described in the file COPYING, which
|
|
* you should have received as part of this distribution. The terms
|
|
* are also available at https://curl.se/docs/copyright.html.
|
|
*
|
|
* You may opt to use, copy, modify, merge, publish, distribute and/or sell
|
|
* copies of the Software, and permit persons to whom the Software is
|
|
* furnished to do so, under the terms of the COPYING file.
|
|
*
|
|
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
|
|
* KIND, either express or implied.
|
|
*
|
|
* SPDX-License-Identifier: curl
|
|
*
|
|
***************************************************************************/
|
|
#include "first.h"
|
|
|
|
#include "testtrace.h"
|
|
|
|
static const char *TEST_DATA_STRING = "Test data";
|
|
static int cb_count = 0;
|
|
|
|
static int resolver_alloc_cb_fail(void *resolver_state, void *reserved,
|
|
void *userdata)
|
|
{
|
|
(void)resolver_state;
|
|
(void)reserved;
|
|
|
|
cb_count++;
|
|
if(strcmp(userdata, TEST_DATA_STRING)) {
|
|
curl_mfprintf(stderr, "Invalid test data received");
|
|
exit(1);
|
|
}
|
|
|
|
return 1;
|
|
}
|
|
|
|
static int resolver_alloc_cb_pass(void *resolver_state, void *reserved,
|
|
void *userdata)
|
|
{
|
|
(void)resolver_state;
|
|
(void)reserved;
|
|
|
|
cb_count++;
|
|
if(strcmp(userdata, TEST_DATA_STRING)) {
|
|
curl_mfprintf(stderr, "Invalid test data received");
|
|
exit(1);
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
static CURLcode test_lib655(const char *URL)
|
|
{
|
|
CURL *curl;
|
|
CURLcode result = CURLE_OK;
|
|
|
|
debug_config.nohex = TRUE;
|
|
debug_config.tracetime = TRUE;
|
|
|
|
if(curl_global_init(CURL_GLOBAL_ALL) != CURLE_OK) {
|
|
curl_mfprintf(stderr, "curl_global_init() failed\n");
|
|
return TEST_ERR_MAJOR_BAD;
|
|
}
|
|
curl = curl_easy_init();
|
|
if(!curl) {
|
|
curl_mfprintf(stderr, "curl_easy_init() failed\n");
|
|
result = TEST_ERR_MAJOR_BAD;
|
|
goto test_cleanup;
|
|
}
|
|
|
|
/* Set the URL that is about to receive our first request. */
|
|
test_setopt(curl, CURLOPT_URL, URL);
|
|
test_setopt(curl, CURLOPT_DEBUGDATA, &debug_config);
|
|
test_setopt(curl, CURLOPT_DEBUGFUNCTION, libtest_debug_cb);
|
|
test_setopt(curl, CURLOPT_VERBOSE, 1L);
|
|
|
|
test_setopt(curl, CURLOPT_RESOLVER_START_DATA, TEST_DATA_STRING);
|
|
test_setopt(curl, CURLOPT_RESOLVER_START_FUNCTION, resolver_alloc_cb_fail);
|
|
|
|
/* this should fail */
|
|
result = curl_easy_perform(curl);
|
|
if(result != CURLE_ABORTED_BY_CALLBACK) {
|
|
curl_mfprintf(stderr, "curl_easy_perform should have returned "
|
|
"CURLE_ABORTED_BY_CALLBACK but instead returned error %d\n",
|
|
result);
|
|
if(result == CURLE_OK)
|
|
result = TEST_ERR_FAILURE;
|
|
goto test_cleanup;
|
|
}
|
|
|
|
/* Set the URL that receives our second request. */
|
|
test_setopt(curl, CURLOPT_URL, libtest_arg2);
|
|
test_setopt(curl, CURLOPT_DEBUGDATA, &debug_config);
|
|
test_setopt(curl, CURLOPT_DEBUGFUNCTION, libtest_debug_cb);
|
|
test_setopt(curl, CURLOPT_VERBOSE, 1L);
|
|
|
|
test_setopt(curl, CURLOPT_RESOLVER_START_FUNCTION, resolver_alloc_cb_pass);
|
|
|
|
/* this should succeed */
|
|
result = curl_easy_perform(curl);
|
|
if(result) {
|
|
curl_mfprintf(stderr, "curl_easy_perform failed.\n");
|
|
goto test_cleanup;
|
|
}
|
|
|
|
if(cb_count != 2) {
|
|
curl_mfprintf(stderr, "Unexpected number of callbacks: %d\n", cb_count);
|
|
result = TEST_ERR_FAILURE;
|
|
goto test_cleanup;
|
|
}
|
|
|
|
test_cleanup:
|
|
/* always cleanup */
|
|
curl_easy_cleanup(curl);
|
|
curl_global_cleanup();
|
|
|
|
return result;
|
|
}
|