69a224d6b4
Stefan Eissing
2026-08-05
Subject
vdns: directory for all DNS related sources
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
lib/Makefile.inc +26 -20lib/amigaos.c +1 -1lib/cf-https-connect.c +3 -3lib/cf-ip-happy.c +1 -1lib/connect.c +1 -1lib/connect.h +1 -1lib/curl_trc.c +1 -1lib/easy.c +1 -1lib/ftp.c +1 -1lib/http.c +0 -1lib/imap.c +0 -1lib/multihandle.h +1 -1lib/pop3.c +0 -1lib/request.c +0 -1lib/setopt.c +0 -1lib/smtp.c +0 -1lib/socks.c +1 -1lib/transfer.c +0 -2lib/url.c +0 -1lib/urldata.h +2 -2lib/asyn-ares.c → lib/vdns/asyn-ares.c +2 -2lib/asyn-base.c → lib/vdns/asyn-base.c +2 -2lib/asyn-thrdd.c → lib/vdns/asyn-thrdd.c +2 -2lib/asyn.h → lib/vdns/asyn.h +1 -1lib/cf-dns.c → lib/vdns/cf-dns.c +3 -3? +0 -0lib/dnscache.c → lib/vdns/dnscache.c +3 -3? +0 -0lib/doh.c → lib/vdns/doh.c +2 -2? +0 -0lib/hostip.c → lib/vdns/hostip.c +4 -4? +0 -0lib/hostip4.c → lib/vdns/hostip4.c +1 -1lib/hostip6.c → lib/vdns/hostip6.c +1 -1lib/httpsrr.c → lib/vdns/httpsrr.c +1 -1? +0 -0lib/vquic/cf-ngtcp2-cmn.c +1 -1lib/vquic/cf-ngtcp2.c +1 -1lib/vquic/cf-quiche.c +1 -1lib/vquic/vquic.c +1 -1lib/vssh/libssh.c +0 -1lib/vssh/libssh2.c +0 -1lib/vtls/hostcheck.c +1 -1lib/vtls/openssl.c +2 -2lib/vtls/rustls.c +2 -2lib/vtls/vtls.c +1 -1lib/vtls/wolfssl.c +2 -2projects/Windows/generate.bat +4 -0projects/Windows/tmpl/libcurl.vcxproj +2 -0src/curlinfo.c +1 -1tests/unit/unit1305.c +1 -1tests/unit/unit1650.c +1 -1tests/unit/unit1655.c +1 -1tests/unit/unit1658.c +2 -2
lib/Makefile.inc+26 -20
| @@ -84,6 +84,26 @@ LIB_VAUTH_HFILES = \ | |
| vauth/digest.h \ | |
| vauth/vauth.h | |
| + | LIB_VDNS_CFILES = \ |
| + | vdns/asyn-ares.c \ |
| + | vdns/asyn-base.c \ |
| + | vdns/asyn-thrdd.c \ |
| + | vdns/cf-dns.c \ |
| + | vdns/dnscache.c \ |
| + | vdns/doh.c \ |
| + | vdns/hostip.c \ |
| + | vdns/hostip4.c \ |
| + | vdns/hostip6.c \ |
| + | vdns/httpsrr.c |
| + | |
| + | LIB_VDNS_HFILES = \ |
| + | vdns/asyn.h \ |
| + | vdns/cf-dns.h \ |
| + | vdns/dnscache.h \ |
| + | vdns/doh.h \ |
| + | vdns/hostip.h \ |
| + | vdns/httpsrr.h |
| + | |
| LIB_VTLS_CFILES = \ | |
| vtls/apple.c \ | |
| vtls/cipher_suite.c \ | |
| @@ -155,12 +175,8 @@ LIB_CFILES = \ | |
| altsvc.c \ | |
| amigaos.c \ | |
| api.c \ | |
| - | asyn-ares.c \ |
| - | asyn-base.c \ |
| - | asyn-thrdd.c \ |
| bufq.c \ | |
| bufref.c \ | |
| - | cf-dns.c \ |
| cf-h1-proxy.c \ | |
| cf-h2-proxy.c \ | |
| cf-haproxy.c \ | |
| @@ -195,8 +211,6 @@ LIB_CFILES = \ | |
| cw-out.c \ | |
| cw-pause.c \ | |
| dict.c \ | |
| - | dnscache.c \ |
| - | doh.c \ |
| dynhds.c \ | |
| easy.c \ | |
| easygetopt.c \ | |
| @@ -214,9 +228,6 @@ LIB_CFILES = \ | |
| hash.c \ | |
| headers.c \ | |
| hmac.c \ | |
| - | hostip.c \ |
| - | hostip4.c \ |
| - | hostip6.c \ |
| hsts.c \ | |
| http.c \ | |
| http1.c \ | |
| @@ -229,7 +240,6 @@ LIB_CFILES = \ | |
| http_negotiate.c \ | |
| http_ntlm.c \ | |
| http_proxy.c \ | |
| - | httpsrr.c \ |
| idn.c \ | |
| if2ip.c \ | |
| imap.c \ | |
| @@ -294,10 +304,8 @@ LIB_HFILES = \ | |
| amigaos.h \ | |
| api.h \ | |
| arpa_telnet.h \ | |
| - | asyn.h \ |
| bufq.h \ | |
| bufref.h \ | |
| - | cf-dns.h \ |
| cf-h1-proxy.h \ | |
| cf-h2-proxy.h \ | |
| cf-haproxy.h \ | |
| @@ -340,8 +348,6 @@ LIB_HFILES = \ | |
| cw-out.h \ | |
| cw-pause.h \ | |
| dict.h \ | |
| - | dnscache.h \ |
| - | doh.h \ |
| dynhds.h \ | |
| easy_lock.h \ | |
| easyif.h \ | |
| @@ -359,7 +365,6 @@ LIB_HFILES = \ | |
| gopher.h \ | |
| hash.h \ | |
| headers.h \ | |
| - | hostip.h \ |
| hsts.h \ | |
| http.h \ | |
| http1.h \ | |
| @@ -372,7 +377,6 @@ LIB_HFILES = \ | |
| http_negotiate.h \ | |
| http_ntlm.h \ | |
| http_proxy.h \ | |
| - | httpsrr.h \ |
| idn.h \ | |
| if2ip.h \ | |
| imap.h \ | |
| @@ -430,7 +434,9 @@ LIB_HFILES = \ | |
| LIB_RCFILES = libcurl.rc | |
| - | CSOURCES = $(LIB_CFILES) $(LIB_VAUTH_CFILES) $(LIB_VTLS_CFILES) \ |
| - | $(LIB_VQUIC_CFILES) $(LIB_VSSH_CFILES) $(LIB_CURLX_CFILES) |
| - | HHEADERS = $(LIB_HFILES) $(LIB_VAUTH_HFILES) $(LIB_VTLS_HFILES) \ |
| - | $(LIB_VQUIC_HFILES) $(LIB_VSSH_HFILES) $(LIB_CURLX_HFILES) |
| + | CSOURCES = $(LIB_CFILES) $(LIB_VAUTH_CFILES) $(LIB_VDNS_CFILES) \ |
| + | $(LIB_VTLS_CFILES) $(LIB_VQUIC_CFILES) $(LIB_VSSH_CFILES) \ |
| + | $(LIB_CURLX_CFILES) |
| + | HHEADERS = $(LIB_HFILES) $(LIB_VAUTH_HFILES) $(LIB_VDNS_HFILES) \ |
| + | $(LIB_VTLS_HFILES) $(LIB_VQUIC_HFILES) $(LIB_VSSH_HFILES) \ |
| + | $(LIB_CURLX_HFILES) |
lib/amigaos.c+1 -1
| @@ -25,7 +25,7 @@ | |
| #ifdef __AMIGA__ | |
| - | #include "hostip.h" |
| + | #include "vdns/hostip.h" |
| #include "curl_addrinfo.h" | |
| #include "amigaos.h" | |
lib/cf-https-connect.c+3 -3
| @@ -28,16 +28,16 @@ | |
| #include "urldata.h" | |
| #include "curl_trc.h" | |
| #include "cfilters.h" | |
| - | #include "cf-dns.h" |
| #include "cf-setup.h" | |
| #include "connect.h" | |
| - | #include "hostip.h" |
| - | #include "httpsrr.h" |
| #include "multiif.h" | |
| #include "cf-https-connect.h" | |
| #include "http2.h" | |
| #include "progress.h" | |
| #include "select.h" | |
| + | #include "vdns/cf-dns.h" |
| + | #include "vdns/hostip.h" |
| + | #include "vdns/httpsrr.h" |
| #include "vquic/vquic.h" | |
| typedef enum { | |
lib/cf-ip-happy.c+1 -1
| @@ -49,7 +49,6 @@ | |
| #include "urldata.h" | |
| #include "connect.h" | |
| #include "cfilters.h" | |
| - | #include "cf-dns.h" |
| #include "cf-ip-happy.h" | |
| #include "curl_addrinfo.h" | |
| #include "curl_trc.h" | |
| @@ -57,6 +56,7 @@ | |
| #include "progress.h" | |
| #include "select.h" | |
| #include "sockaddr.h" | |
| + | #include "vdns/cf-dns.h" |
| #include "vquic/vquic.h" /* for quic cfilters */ | |
lib/connect.c+1 -1
| @@ -28,7 +28,6 @@ | |
| #include "strerror.h" | |
| #include "cfilters.h" | |
| #include "connect.h" | |
| - | #include "cf-dns.h" |
| #include "cf-https-connect.h" | |
| #include "cf-setup.h" | |
| #include "multiif.h" | |
| @@ -36,6 +35,7 @@ | |
| #include "conncache.h" | |
| #include "multihandle.h" | |
| #include "select.h" | |
| + | #include "vdns/cf-dns.h" |
| #include "curlx/strparse.h" | |
| #if !defined(CURL_DISABLE_ALTSVC) || defined(USE_HTTPSRR) | |
lib/connect.h+1 -1
| @@ -25,7 +25,7 @@ | |
| ***************************************************************************/ | |
| #include "curl_setup.h" | |
| - | #include "hostip.h" |
| + | #include "vdns/hostip.h" |
| #include "curlx/timeval.h" | |
| struct Curl_peer; | |
lib/curl_trc.c+1 -1
| @@ -28,7 +28,6 @@ | |
| #include "cfilters.h" | |
| #include "multiif.h" | |
| - | #include "cf-dns.h" |
| #include "cf-recvbuf.h" | |
| #include "cf-socket.h" | |
| #include "cf-setup.h" | |
| @@ -42,6 +41,7 @@ | |
| #include "progress.h" | |
| #include "socks.h" | |
| #include "curlx/strparse.h" | |
| + | #include "vdns/cf-dns.h" |
| #include "vtls/vtls.h" | |
| #include "vquic/vquic.h" | |
| #include "curlx/strcopy.h" | |
lib/easy.c+1 -1
| @@ -46,12 +46,12 @@ | |
| #include "urldata.h" | |
| #include "api.h" | |
| #include "transfer.h" | |
| + | #include "vdns/hostip.h" |
| #include "vtls/vtls.h" | |
| #include "vtls/vtls_scache.h" | |
| #include "vquic/vquic.h" | |
| #include "url.h" | |
| #include "getinfo.h" | |
| - | #include "hostip.h" |
| #include "curlx/strdup.h" | |
| #include "easyif.h" | |
| #include "multiif.h" | |
lib/ftp.c+1 -1
| @@ -44,7 +44,6 @@ | |
| #include "curl_addrinfo.h" | |
| #include "curl_trc.h" | |
| #include "if2ip.h" | |
| - | #include "hostip.h" |
| #include "progress.h" | |
| #include "transfer.h" | |
| #include "escape.h" | |
| @@ -65,6 +64,7 @@ | |
| #include "multiif.h" | |
| #include "url.h" | |
| #include "http_proxy.h" | |
| + | #include "vdns/hostip.h" |
| #include "curlx/strdup.h" | |
| #include "curlx/strerr.h" | |
| #include "curlx/strparse.h" | |
lib/http.c+0 -1
| @@ -65,7 +65,6 @@ | |
| #include "url.h" | |
| #include "urlapi-int.h" | |
| #include "curl_share.h" | |
| - | #include "hostip.h" |
| #include "dynhds.h" | |
| #include "http.h" | |
| #include "headers.h" | |
lib/imap.c+0 -1
| @@ -57,7 +57,6 @@ | |
| #include "curlx/dynbuf.h" | |
| #include "sendf.h" | |
| #include "curl_trc.h" | |
| - | #include "hostip.h" |
| #include "progress.h" | |
| #include "transfer.h" | |
| #include "escape.h" | |
lib/multihandle.h+1 -1
| @@ -28,7 +28,6 @@ | |
| #include "hash.h" | |
| #include "conncache.h" | |
| #include "cshutdn.h" | |
| - | #include "dnscache.h" |
| #include "multi_ev.h" | |
| #include "multi_ntfy.h" | |
| #include "psl.h" | |
| @@ -36,6 +35,7 @@ | |
| #include "uint-bset.h" | |
| #include "uint-spbset.h" | |
| #include "uint-table.h" | |
| + | #include "vdns/dnscache.h" |
| struct connectdata; | |
| struct Curl_easy; | |
lib/pop3.c+0 -1
| @@ -58,7 +58,6 @@ | |
| #include "sendf.h" | |
| #include "curl_trc.h" | |
| - | #include "hostip.h" |
| #include "progress.h" | |
| #include "transfer.h" | |
| #include "escape.h" | |
lib/request.c+0 -1
| @@ -26,7 +26,6 @@ | |
| #include "urldata.h" | |
| #include "cfilters.h" | |
| #include "curlx/dynbuf.h" | |
| - | #include "doh.h" |
| #include "progress.h" | |
| #include "request.h" | |
| #include "sendf.h" | |
lib/setopt.c+0 -1
| @@ -41,7 +41,6 @@ | |
| #include "curl_share.h" | |
| #include "vtls/vtls.h" | |
| #include "curl_trc.h" | |
| - | #include "hostip.h" |
| #include "setopt.h" | |
| #include "altsvc.h" | |
| #include "hsts.h" | |
lib/smtp.c+0 -1
| @@ -60,7 +60,6 @@ | |
| #include "sendf.h" | |
| #include "curl_trc.h" | |
| - | #include "hostip.h" |
| #include "progress.h" | |
| #include "transfer.h" | |
| #include "escape.h" | |
lib/socks.c+1 -1
| @@ -38,9 +38,9 @@ | |
| #include "curl_trc.h" | |
| #include "select.h" | |
| #include "cfilters.h" | |
| - | #include "cf-dns.h" |
| #include "connect.h" | |
| #include "socks.h" | |
| + | #include "vdns/cf-dns.h" |
| #include "curlx/inet_pton.h" | |
| /* for the (SOCKS) connect state machine */ | |
lib/transfer.c+0 -2
| @@ -56,10 +56,8 @@ | |
| #include "urldata.h" | |
| - | #include "hostip.h" |
| #include "cfilters.h" | |
| #include "cw-out.h" | |
| - | #include "dnscache.h" |
| #include "transfer.h" | |
| #include "sendf.h" | |
| #include "curl_trc.h" | |
lib/url.c+0 -1
| @@ -70,7 +70,6 @@ | |
| #include "bufref.h" | |
| #include "vtls/vtls.h" | |
| #include "vssh/vssh.h" | |
| - | #include "hostip.h" |
| #include "transfer.h" | |
| #include "curl_addrinfo.h" | |
| #include "curl_trc.h" | |
lib/urldata.h+2 -2
| @@ -54,13 +54,11 @@ | |
| #include "curlx/timeval.h" | |
| #include "api.h" | |
| - | #include "asyn.h" |
| #include "cookie.h" | |
| #include "creds.h" | |
| #include "psl.h" | |
| #include "formdata.h" | |
| #include "http_chunks.h" /* for the structs and enum stuff */ | |
| - | #include "hostip.h" |
| #include "hash.h" | |
| #include "peer.h" | |
| #include "proxy.h" | |
| @@ -71,6 +69,8 @@ | |
| #include "request.h" | |
| #include "ratelimit.h" | |
| #include "netrc.h" | |
| + | #include "vdns/asyn.h" |
| + | #include "vdns/hostip.h" |
| #include "vtls/vtls_config.h" | |
| /* On error return, the value of `pnwritten` has no meaning */ | |
lib/asyn-ares.c → lib/vdns/asyn-ares.c+2 -2
| @@ -49,7 +49,6 @@ | |
| #include "cfilters.h" | |
| #include "curl_addrinfo.h" | |
| #include "curl_trc.h" | |
| - | #include "hostip.h" |
| #include "url.h" | |
| #include "multiif.h" | |
| #include "curlx/inet_pton.h" | |
| @@ -57,7 +56,8 @@ | |
| #include "select.h" | |
| #include "progress.h" | |
| #include "curlx/timediff.h" | |
| - | #include "httpsrr.h" |
| + | #include "vdns/hostip.h" |
| + | #include "vdns/httpsrr.h" |
| #include <ares.h> | |
| #if ARES_VERSION < 0x011000 | |
lib/asyn-base.c → lib/vdns/asyn-base.c+2 -2
| @@ -45,12 +45,12 @@ | |
| #include "connect.h" | |
| #include "curl_addrinfo.h" | |
| #include "curl_trc.h" | |
| - | #include "hostip.h" |
| - | #include "httpsrr.h" |
| #include "multiif.h" | |
| #include "progress.h" | |
| #include "select.h" | |
| #include "url.h" | |
| + | #include "vdns/hostip.h" |
| + | #include "vdns/httpsrr.h" |
| /*********************************************************************** | |
| * Only for builds using asynchronous name resolves | |
lib/asyn-thrdd.c → lib/vdns/asyn-thrdd.c+2 -2
| @@ -52,8 +52,6 @@ | |
| #include "cfilters.h" | |
| #include "curl_addrinfo.h" | |
| #include "curl_trc.h" | |
| - | #include "hostip.h" |
| - | #include "httpsrr.h" |
| #include "url.h" | |
| #include "multiif.h" | |
| #include "curl_threads.h" | |
| @@ -61,6 +59,8 @@ | |
| #include "rand.h" | |
| #include "select.h" | |
| #include "thrdqueue.h" | |
| + | #include "vdns/hostip.h" |
| + | #include "vdns/httpsrr.h" |
| #include "curlx/strparse.h" | |
| #include "curlx/wait.h" | |
lib/asyn.h → lib/vdns/asyn.h+1 -1
| @@ -26,7 +26,7 @@ | |
| #include "curl_setup.h" | |
| #if defined(USE_HTTPSRR) && defined(USE_ARES) | |
| - | #include "httpsrr.h" |
| + | #include "vdns/httpsrr.h" |
| #endif | |
| struct Curl_easy; | |
lib/cf-dns.c → lib/vdns/cf-dns.c+3 -3
| @@ -27,13 +27,13 @@ | |
| #include "curl_addrinfo.h" | |
| #include "cfilters.h" | |
| #include "connect.h" | |
| - | #include "dnscache.h" |
| - | #include "httpsrr.h" |
| #include "curl_trc.h" | |
| #include "multiif.h" | |
| #include "progress.h" | |
| #include "url.h" | |
| - | #include "cf-dns.h" |
| + | #include "vdns/cf-dns.h" |
| + | #include "vdns/dnscache.h" |
| + | #include "vdns/httpsrr.h" |
| struct cf_dns_ctx { | |
?+0 -0
lib/dnscache.c → lib/vdns/dnscache.c+3 -3
| @@ -44,13 +44,13 @@ | |
| #include "curl_addrinfo.h" | |
| #include "curl_share.h" | |
| #include "curl_trc.h" | |
| - | #include "dnscache.h" |
| #include "hash.h" | |
| - | #include "hostip.h" |
| - | #include "httpsrr.h" |
| #include "progress.h" | |
| #include "rand.h" | |
| #include "strcase.h" | |
| + | #include "vdns/dnscache.h" |
| + | #include "vdns/hostip.h" |
| + | #include "vdns/httpsrr.h" |
| #include "curlx/inet_ntop.h" | |
| #include "curlx/inet_pton.h" | |
| #include "curlx/strcopy.h" | |
?+0 -0
lib/doh.c → lib/vdns/doh.c+2 -2
| @@ -27,12 +27,12 @@ | |
| #include "urldata.h" | |
| #include "curl_addrinfo.h" | |
| - | #include "doh.h" |
| #include "curl_trc.h" | |
| - | #include "httpsrr.h" |
| #include "multiif.h" | |
| #include "url.h" | |
| #include "connect.h" | |
| + | #include "vdns/doh.h" |
| + | #include "vdns/httpsrr.h" |
| #include "curlx/strdup.h" | |
| #include "curlx/dynbuf.h" | |
| #include "escape.h" /* for Curl_hexencode() */ | |
?+0 -0
lib/hostip.c → lib/vdns/hostip.c+4 -4
| @@ -46,16 +46,16 @@ | |
| #include "urldata.h" | |
| #include "curl_addrinfo.h" | |
| #include "curl_trc.h" | |
| - | #include "dnscache.h" |
| - | #include "hostip.h" |
| - | #include "httpsrr.h" |
| #include "url.h" | |
| #include "multiif.h" | |
| #include "progress.h" | |
| - | #include "doh.h" |
| #include "select.h" | |
| #include "strcase.h" | |
| #include "easy_lock.h" | |
| + | #include "vdns/dnscache.h" |
| + | #include "vdns/doh.h" |
| + | #include "vdns/hostip.h" |
| + | #include "vdns/httpsrr.h" |
| #include "curlx/inet_ntop.h" | |
| #include "curlx/inet_pton.h" | |
| #include "curlx/strcopy.h" | |
?+0 -0
lib/hostip4.c → lib/vdns/hostip4.c+1 -1
| @@ -45,7 +45,7 @@ | |
| #include "urldata.h" | |
| #include "curl_addrinfo.h" | |
| #include "curl_trc.h" | |
| - | #include "hostip.h" |
| + | #include "vdns/hostip.h" |
| #include "url.h" | |
lib/hostip6.c → lib/vdns/hostip6.c+1 -1
| @@ -46,8 +46,8 @@ | |
| #include "cfilters.h" | |
| #include "curl_addrinfo.h" | |
| #include "curl_trc.h" | |
| - | #include "hostip.h" |
| #include "url.h" | |
| + | #include "vdns/hostip.h" |
| #include "curlx/inet_pton.h" | |
| #include "connect.h" | |
lib/httpsrr.c → lib/vdns/httpsrr.c+1 -1
| @@ -26,9 +26,9 @@ | |
| #ifdef USE_HTTPSRR | |
| #include "urldata.h" | |
| - | #include "httpsrr.h" |
| #include "connect.h" | |
| #include "curl_trc.h" | |
| + | #include "vdns/httpsrr.h" |
| #include "curlx/strdup.h" | |
| #include "curlx/inet_ntop.h" | |
?+0 -0
lib/vquic/cf-ngtcp2-cmn.c+1 -1
| @@ -54,7 +54,6 @@ | |
| #include "rand.h" | |
| #include "multiif.h" | |
| #include "cfilters.h" | |
| - | #include "cf-dns.h" |
| #include "cf-socket.h" | |
| #include "connect.h" | |
| #include "progress.h" | |
| @@ -65,6 +64,7 @@ | |
| #include "sockaddr.h" | |
| #include "transfer.h" | |
| #include "bufref.h" | |
| + | #include "vdns/cf-dns.h" |
| #include "vquic/vquic.h" | |
| #include "vquic/vquic_int.h" | |
| #include "vquic/vquic-tls.h" | |
lib/vquic/cf-ngtcp2.c+1 -1
| @@ -32,7 +32,6 @@ | |
| #include "rand.h" | |
| #include "multiif.h" | |
| #include "cfilters.h" | |
| - | #include "cf-dns.h" |
| #include "cf-socket.h" | |
| #include "connect.h" | |
| #include "progress.h" | |
| @@ -42,6 +41,7 @@ | |
| #include "select.h" | |
| #include "transfer.h" | |
| #include "bufref.h" | |
| + | #include "vdns/cf-dns.h" |
| #include "vquic/vquic.h" | |
| #include "vquic/vquic_int.h" | |
| #include "vquic/cf-ngtcp2-cmn.h" | |
lib/vquic/cf-quiche.c+1 -1
| @@ -32,7 +32,6 @@ | |
| #include "uint-hash.h" | |
| #include "urldata.h" | |
| #include "cfilters.h" | |
| - | #include "cf-dns.h" |
| #include "cf-socket.h" | |
| #include "curl_trc.h" | |
| #include "rand.h" | |
| @@ -43,6 +42,7 @@ | |
| #include "http.h" | |
| #include "http1.h" | |
| #include "sockaddr.h" | |
| + | #include "vdns/cf-dns.h" |
| #include "vquic/vquic.h" | |
| #include "vquic/vquic_int.h" | |
| #include "vquic/vquic-tls.h" | |
lib/vquic/vquic.c+1 -1
| @@ -48,7 +48,7 @@ | |
| #include "curlx/dynbuf.h" | |
| #include "curlx/fopen.h" | |
| #include "cfilters.h" | |
| - | #include "cf-dns.h" |
| + | #include "vdns/cf-dns.h" |
| #include "vquic/cf-ngtcp2.h" | |
| #include "vquic/cf-ngtcp2-cmn.h" | |
| #include "vquic/cf-ngtcp2-proxy.h" | |
lib/vssh/libssh.c+0 -1
| @@ -45,7 +45,6 @@ | |
| #include "urldata.h" | |
| #include "sendf.h" | |
| #include "curl_trc.h" | |
| - | #include "hostip.h" |
| #include "progress.h" | |
| #include "transfer.h" | |
| #include "vssh/ssh.h" | |
lib/vssh/libssh2.c+0 -1
| @@ -44,7 +44,6 @@ | |
| #include "urldata.h" | |
| #include "sendf.h" | |
| #include "curl_trc.h" | |
| - | #include "hostip.h" |
| #include "progress.h" | |
| #include "transfer.h" | |
| #include "vssh/ssh.h" | |
lib/vtls/hostcheck.c+1 -1
| @@ -34,8 +34,8 @@ | |
| #endif | |
| #include "curl_memrchr.h" | |
| + | #include "vdns/hostip.h" |
| #include "vtls/hostcheck.h" | |
| - | #include "hostip.h" |
| /* check the two input strings with given length, but do not | |
| assume they end in nul-bytes */ | |
lib/vtls/openssl.c+2 -2
| @@ -31,13 +31,11 @@ | |
| #include "urldata.h" | |
| #include "curl_trc.h" | |
| - | #include "httpsrr.h" |
| #include "formdata.h" /* for the boundary function */ | |
| #include "url.h" /* for the SSL config check function */ | |
| #include "curlx/inet_pton.h" | |
| #include "vtls/openssl.h" | |
| #include "connect.h" | |
| - | #include "cf-dns.h" |
| #include "progress.h" | |
| #include "vtls/vtls.h" | |
| #include "vtls/vtls_int.h" | |
| @@ -51,6 +49,8 @@ | |
| #include "curlx/strparse.h" | |
| #include "curlx/strcopy.h" | |
| #include "curlx/strdup.h" | |
| + | #include "vdns/cf-dns.h" |
| + | #include "vdns/httpsrr.h" |
| #include "vtls/apple.h" | |
| #ifdef USE_ECH | |
| #include "curlx/base64.h" | |
lib/vtls/rustls.c+2 -2
| @@ -32,9 +32,9 @@ | |
| #include "curlx/fopen.h" | |
| #include "curlx/strerr.h" | |
| #include "urldata.h" | |
| - | #include "cf-dns.h" |
| #include "curl_trc.h" | |
| - | #include "httpsrr.h" |
| + | #include "vdns/cf-dns.h" |
| + | #include "vdns/httpsrr.h" |
| #include "vtls/vtls.h" | |
| #include "vtls/vtls_int.h" | |
| #include "vtls/rustls.h" | |
lib/vtls/vtls.c+1 -1
| @@ -42,7 +42,6 @@ | |
| #include "urldata.h" | |
| #include "cfilters.h" | |
| - | #include "cf-dns.h" |
| #include "vtls/vtls.h" /* generic SSL protos etc */ | |
| #include "vtls/vtls_int.h" | |
| @@ -68,6 +67,7 @@ | |
| #include "connect.h" | |
| #include "select.h" | |
| #include "setopt.h" | |
| + | #include "vdns/cf-dns.h" |
| #include "curlx/strdup.h" | |
| #include "curlx/strcopy.h" | |
lib/vtls/wolfssl.c+2 -2
| @@ -55,8 +55,8 @@ | |
| #include "urldata.h" | |
| #include "curl_trc.h" | |
| - | #include "httpsrr.h" |
| - | #include "cf-dns.h" |
| + | #include "vdns/cf-dns.h" |
| + | #include "vdns/httpsrr.h" |
| #include "vtls/vtls.h" | |
| #include "vtls/vtls_int.h" | |
| #include "vtls/vtls_scache.h" | |
projects/Windows/generate.bat+4 -0
| @@ -214,6 +214,10 @@ rem | |
| for /f "delims=" %%c in ('dir /b ..\..\lib\vauth\*.c') do call :element lib\vauth "%%c" %3 | |
| ) else if "!var!" == "CURL_LIB_VAUTH_H_FILES" ( | |
| for /f "delims=" %%h in ('dir /b ..\..\lib\vauth\*.h') do call :element lib\vauth "%%h" %3 | |
| + | ) else if "!var!" == "CURL_LIB_VDNS_C_FILES" ( |
| + | for /f "delims=" %%c in ('dir /b ..\..\lib\vdns\*.c') do call :element lib\vdns "%%c" %3 |
| + | ) else if "!var!" == "CURL_LIB_VDNS_H_FILES" ( |
| + | for /f "delims=" %%h in ('dir /b ..\..\lib\vdns\*.h') do call :element lib\vdns "%%h" %3 |
| ) else if "!var!" == "CURL_LIB_VQUIC_C_FILES" ( | |
| for /f "delims=" %%c in ('dir /b ..\..\lib\vquic\*.c') do call :element lib\vquic "%%c" %3 | |
| ) else if "!var!" == "CURL_LIB_VQUIC_H_FILES" ( | |
projects/Windows/tmpl/libcurl.vcxproj+2 -0
| @@ -2034,6 +2034,7 @@ | |
| CURL_LIB_C_FILES | |
| CURL_LIB_CURLX_C_FILES | |
| CURL_LIB_VAUTH_C_FILES | |
| + | CURL_LIB_VDNS_C_FILES |
| CURL_LIB_VQUIC_C_FILES | |
| CURL_LIB_VSSH_C_FILES | |
| CURL_LIB_VTLS_C_FILES | |
| @@ -2042,6 +2043,7 @@ CURL_LIB_VTLS_C_FILES | |
| CURL_LIB_H_FILES | |
| CURL_LIB_CURLX_H_FILES | |
| CURL_LIB_VAUTH_H_FILES | |
| + | CURL_LIB_VDNS_H_FILES |
| CURL_LIB_VQUIC_H_FILES | |
| CURL_LIB_VSSH_H_FILES | |
| CURL_LIB_VTLS_H_FILES | |
src/curlinfo.c+1 -1
| @@ -34,7 +34,7 @@ | |
| #include "multihandle.h" /* for ENABLE_WAKEUP */ | |
| #include "tool_xattr.h" /* for USE_XATTR */ | |
| #include "curl_sha512_256.h" /* for CURL_HAVE_SHA512_256 */ | |
| - | #include "asyn.h" /* for USE_RESOLV_ARES, USE_RESOLV_THREADED */ |
| + | #include "vdns/asyn.h" /* for USE_RESOLV_ARES, USE_RESOLV_THREADED */ |
| #include "fake_addrinfo.h" /* for USE_FAKE_GETADDRINFO */ | |
| #include <stdio.h> | |
tests/unit/unit1305.c+1 -1
| @@ -35,7 +35,7 @@ | |
| #include "curl_addrinfo.h" | |
| #include "hash.h" | |
| - | #include "dnscache.h" |
| + | #include "vdns/dnscache.h" |
| static struct Curl_dnscache hp; | |
| static char *data_key; | |
tests/unit/unit1650.c+1 -1
| @@ -22,7 +22,7 @@ | |
| * | |
| ***************************************************************************/ | |
| #include "unitcheck.h" | |
| - | #include "doh.h" |
| + | #include "vdns/doh.h" |
| static CURLcode test_unit1650(const char *arg) | |
| { | |
tests/unit/unit1655.c+1 -1
| @@ -22,7 +22,7 @@ | |
| * | |
| ***************************************************************************/ | |
| #include "unitcheck.h" | |
| - | #include "doh.h" |
| + | #include "vdns/doh.h" |
| static CURLcode test_unit1655(const char *arg) | |
| { | |
tests/unit/unit1658.c+2 -2
| @@ -25,8 +25,8 @@ | |
| /* DoH + HTTPSRR are required */ | |
| #if !defined(CURL_DISABLE_DOH) && defined(USE_HTTPSRR) | |
| - | #include "doh.h" |
| - | #include "httpsrr.h" |
| + | #include "vdns/doh.h" |
| + | #include "vdns/httpsrr.h" |
| static CURLcode t1658_setup(void) | |
| { | |