vdns: directory for all DNS related sources

Move all DNS related source files from lib to lib/vdns. Fix
include paths, no furher changes.

Closes #22482
This commit is contained in:
Stefan Eissing 2026-08-04 11:52:00 +02:00 committed by Daniel Stenberg
parent e5b5846c10
commit 69a224d6b4
No known key found for this signature in database
GPG key ID: 5CC908FDB71E12C2
54 changed files with 86 additions and 85 deletions

View file

@ -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)

View file

@ -25,7 +25,7 @@
#ifdef __AMIGA__
#include "hostip.h"
#include "vdns/hostip.h"
#include "curl_addrinfo.h"
#include "amigaos.h"

View file

@ -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 {

View file

@ -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 */

View file

@ -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)

View file

@ -25,7 +25,7 @@
***************************************************************************/
#include "curl_setup.h"
#include "hostip.h"
#include "vdns/hostip.h"
#include "curlx/timeval.h"
struct Curl_peer;

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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;

View file

@ -58,7 +58,6 @@
#include "sendf.h"
#include "curl_trc.h"
#include "hostip.h"
#include "progress.h"
#include "transfer.h"
#include "escape.h"

View file

@ -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"

View file

@ -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"

View file

@ -60,7 +60,6 @@
#include "sendf.h"
#include "curl_trc.h"
#include "hostip.h"
#include "progress.h"
#include "transfer.h"
#include "escape.h"

View file

@ -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 */

View file

@ -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"

View file

@ -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"

View file

@ -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 */

View file

@ -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

View file

@ -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

View file

@ -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"

View file

@ -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;

View file

@ -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 {

View file

@ -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"

View file

@ -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() */

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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 */

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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"