From cf6ba06cd445f1f4554701637d5bab581acfba98 Mon Sep 17 00:00:00 2001 From: dartraiden Date: Mon, 21 Apr 2025 09:33:29 +0300 Subject: libcurl: update to 8.13.0 --- libs/libcurl/src/httpsrr.c | 121 ++++++++++++++++++++++++++++++++++----------- 1 file changed, 92 insertions(+), 29 deletions(-) (limited to 'libs/libcurl/src/httpsrr.c') diff --git a/libs/libcurl/src/httpsrr.c b/libs/libcurl/src/httpsrr.c index 7c50536cc5..a948361ba4 100644 --- a/libs/libcurl/src/httpsrr.c +++ b/libs/libcurl/src/httpsrr.c @@ -31,6 +31,7 @@ #include "httpsrr.h" #include "connect.h" #include "sendf.h" +#include "strdup.h" /* The last 3 #include files should be in this order */ #include "curl_printf.h" @@ -91,44 +92,92 @@ err: return CURLE_BAD_CONTENT_ENCODING; } -#ifdef USE_ARES - -static void httpsrr_opt(struct Curl_easy *data, - const ares_dns_rr_t *rr, - ares_dns_rr_key_t key, size_t idx) +CURLcode Curl_httpsrr_set(struct Curl_easy *data, + struct Curl_https_rrinfo *hi, + uint16_t rrkey, const uint8_t *val, size_t vlen) { - size_t len = 0; - const unsigned char *val = NULL; - unsigned short code; - struct thread_data *res = data->state.async.tdata; - struct Curl_https_rrinfo *hi = &res->hinfo; - code = ares_dns_rr_get_opt(rr, key, idx, &val, &len); - - switch(code) { + switch(rrkey) { case HTTPS_RR_CODE_ALPN: /* str_list */ - Curl_httpsrr_decode_alpn(val, len, hi->alpns); - infof(data, "HTTPS RR ALPN: %u %u %u %u", - hi->alpns[0], hi->alpns[1], hi->alpns[2], hi->alpns[3]); + Curl_httpsrr_decode_alpn(val, vlen, hi->alpns); + CURL_TRC_DNS(data, "HTTPS RR ALPN: %u %u %u %u", + hi->alpns[0], hi->alpns[1], hi->alpns[2], hi->alpns[3]); break; case HTTPS_RR_CODE_NO_DEF_ALPN: - infof(data, "HTTPS RR no-def-alpn"); + hi->no_def_alpn = TRUE; + CURL_TRC_DNS(data, "HTTPS RR no-def-alpn"); break; case HTTPS_RR_CODE_IPV4: /* addr4 list */ - infof(data, "HTTPS RR IPv4"); + if(!vlen) + return CURLE_BAD_FUNCTION_ARGUMENT; + hi->ipv4hints = Curl_memdup(val, vlen); + if(!hi->ipv4hints) + return CURLE_OUT_OF_MEMORY; + hi->ipv4hints_len = vlen; + CURL_TRC_DNS(data, "HTTPS RR IPv4"); break; case HTTPS_RR_CODE_ECH: - infof(data, "HTTPS RR ECH"); + if(!vlen) + return CURLE_BAD_FUNCTION_ARGUMENT; + hi->echconfiglist = Curl_memdup(val, vlen); + if(!hi->echconfiglist) + return CURLE_OUT_OF_MEMORY; + hi->echconfiglist_len = vlen; + CURL_TRC_DNS(data, "HTTPS RR ECH"); break; case HTTPS_RR_CODE_IPV6: /* addr6 list */ - infof(data, "HTTPS RR IPv6"); + if(!vlen) + return CURLE_BAD_FUNCTION_ARGUMENT; + hi->ipv6hints = Curl_memdup(val, vlen); + if(!hi->ipv6hints) + return CURLE_OUT_OF_MEMORY; + hi->ipv6hints_len = vlen; + CURL_TRC_DNS(data, "HTTPS RR IPv6"); break; case HTTPS_RR_CODE_PORT: - infof(data, "HTTPS RR port"); + if(vlen != 2) + return CURLE_BAD_FUNCTION_ARGUMENT; + hi->port = (unsigned short)((val[0] << 8) | val[1]); + CURL_TRC_DNS(data, "HTTPS RR port %u", hi->port); break; default: - infof(data, "HTTPS RR unknown code"); + CURL_TRC_DNS(data, "HTTPS RR unknown code"); break; } + return CURLE_OK; +} + +struct Curl_https_rrinfo * +Curl_httpsrr_dup_move(struct Curl_https_rrinfo *rrinfo) +{ + struct Curl_https_rrinfo *dup = Curl_memdup(rrinfo, sizeof(*rrinfo)); + if(dup) + memset(rrinfo, 0, sizeof(*rrinfo)); + return dup; +} + +void Curl_httpsrr_cleanup(struct Curl_https_rrinfo *rrinfo) +{ + Curl_safefree(rrinfo->target); + Curl_safefree(rrinfo->echconfiglist); + Curl_safefree(rrinfo->ipv4hints); + Curl_safefree(rrinfo->ipv6hints); +} + + +#ifdef USE_ARES + +static CURLcode httpsrr_opt(struct Curl_easy *data, + const ares_dns_rr_t *rr, + ares_dns_rr_key_t key, size_t idx) +{ + size_t len = 0; + const unsigned char *val = NULL; + unsigned short code; + struct thread_data *res = &data->state.async.thdata; + struct Curl_https_rrinfo *hi = &res->hinfo; + + code = ares_dns_rr_get_opt(rr, key, idx, &val, &len); + return Curl_httpsrr_set(data, hi, code, val, len); } void Curl_dnsrec_done_cb(void *arg, ares_status_t status, @@ -136,17 +185,17 @@ void Curl_dnsrec_done_cb(void *arg, ares_status_t status, const ares_dns_record_t *dnsrec) { struct Curl_easy *data = arg; + CURLcode result = CURLE_OK; size_t i; -#ifdef CURLRES_ARES - struct thread_data *res = data->state.async.tdata; + struct thread_data *res = &data->state.async.thdata; res->num_pending--; -#endif (void)timeouts; if((ARES_SUCCESS != status) || !dnsrec) return; for(i = 0; i < ares_dns_record_rr_cnt(dnsrec, ARES_SECTION_ANSWER); i++) { + const char *target; size_t opt; const ares_dns_rr_t *rr = ares_dns_record_rr_get_const(dnsrec, ARES_SECTION_ANSWER, i); @@ -154,12 +203,26 @@ void Curl_dnsrec_done_cb(void *arg, ares_status_t status, continue; /* When SvcPriority is 0, the SVCB record is in AliasMode. Otherwise, it is in ServiceMode */ - infof(data, "HTTPS RR priority: %u", - ares_dns_rr_get_u16(rr, ARES_RR_HTTPS_PRIORITY)); + target = ares_dns_rr_get_str(rr, ARES_RR_HTTPS_TARGET); + if(target && target[0]) { + res->hinfo.target = strdup(target); + if(!res->hinfo.target) { + result = CURLE_OUT_OF_MEMORY; + goto out; + } + CURL_TRC_DNS(data, "HTTPS RR target: %s", res->hinfo.target); + } + CURL_TRC_DNS(data, "HTTPS RR priority: %u", + ares_dns_rr_get_u16(rr, ARES_RR_HTTPS_PRIORITY)); for(opt = 0; opt < ares_dns_rr_get_opt_cnt(rr, ARES_RR_HTTPS_PARAMS); - opt++) - httpsrr_opt(data, rr, ARES_RR_HTTPS_PARAMS, opt); + opt++) { + result = httpsrr_opt(data, rr, ARES_RR_HTTPS_PARAMS, opt); + if(result) + break; + } } +out: + res->result = result; } #endif /* USE_ARES */ -- cgit v1.2.3