mirror of
https://github.com/curl/curl.git
synced 2026-04-11 12:01: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
96 lines
3.1 KiB
C
96 lines
3.1 KiB
C
#ifndef HEADER_CURL_HTTPSRR_H
|
|
#define HEADER_CURL_HTTPSRR_H
|
|
/***************************************************************************
|
|
* _ _ ____ _
|
|
* 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 "curl_setup.h"
|
|
|
|
#ifdef USE_ARES
|
|
#include <ares.h>
|
|
#endif
|
|
|
|
#ifdef USE_HTTPSRR
|
|
|
|
#define CURL_MAXLEN_host_name 253
|
|
#define MAX_HTTPSRR_ALPNS 4
|
|
|
|
struct Curl_easy;
|
|
|
|
struct Curl_https_rrinfo {
|
|
char *rrname; /* if NULL, the same as the URL hostname */
|
|
/*
|
|
* Fields from HTTPS RR. The only mandatory fields are priority and target.
|
|
* See https://datatracker.ietf.org/doc/html/rfc9460#section-14.3.2
|
|
*/
|
|
char *target;
|
|
unsigned char *ipv4hints; /* keytag = 4 */
|
|
size_t ipv4hints_len;
|
|
unsigned char *echconfiglist; /* keytag = 5 */
|
|
size_t echconfiglist_len;
|
|
unsigned char *ipv6hints; /* keytag = 6 */
|
|
size_t ipv6hints_len;
|
|
unsigned char alpns[MAX_HTTPSRR_ALPNS]; /* keytag = 1 */
|
|
/* store parsed alpnid entries in the array, end with ALPN_none */
|
|
uint16_t port; /* -1 means not set */
|
|
uint16_t priority;
|
|
BIT(no_def_alpn); /* keytag = 2 */
|
|
BIT(mandatory); /* keytag = 0 */
|
|
BIT(port_set); /* port value has been assigned */
|
|
BIT(complete); /* values have been successfully assigned */
|
|
};
|
|
|
|
CURLcode Curl_httpsrr_set(struct Curl_https_rrinfo *hi,
|
|
uint16_t rrkey, const uint8_t *val, size_t vlen);
|
|
|
|
struct Curl_https_rrinfo *
|
|
Curl_httpsrr_dup_move(struct Curl_https_rrinfo *rrinfo);
|
|
|
|
void Curl_httpsrr_cleanup(struct Curl_https_rrinfo *rrinfo);
|
|
|
|
/*
|
|
* Code points for DNS wire format SvcParams as per RFC 9460
|
|
*/
|
|
#define HTTPS_RR_CODE_MANDATORY 0x00
|
|
#define HTTPS_RR_CODE_ALPN 0x01
|
|
#define HTTPS_RR_CODE_NO_DEF_ALPN 0x02
|
|
#define HTTPS_RR_CODE_PORT 0x03
|
|
#define HTTPS_RR_CODE_IPV4 0x04
|
|
#define HTTPS_RR_CODE_ECH 0x05
|
|
#define HTTPS_RR_CODE_IPV6 0x06
|
|
|
|
#ifdef USE_ARES
|
|
CURLcode Curl_httpsrr_from_ares(const ares_dns_record_t *dnsrec,
|
|
struct Curl_https_rrinfo *hinfo);
|
|
#endif /* USE_ARES */
|
|
|
|
#ifdef CURLVERBOSE
|
|
void Curl_httpsrr_trace(struct Curl_easy *data,
|
|
struct Curl_https_rrinfo *hi);
|
|
#else
|
|
#define Curl_httpsrr_trace(a,b) Curl_nop_stmt
|
|
#endif
|
|
|
|
#endif /* USE_HTTPSRR */
|
|
|
|
#endif /* HEADER_CURL_HTTPSRR_H */
|