curlx: move curlx_inet_pton

Used by test server code.

Closes #17300

diff --git a/lib/Makefile.inc b/lib/Makefile.inc
index 08147ebb42bfc5d6956d3f818ff49f45d96e0775..b384e09623d937b90e6504d4dfeab2cf67792a10 100644 (file)
--- a/lib/Makefile.inc
+++ b/lib/Makefile.inc
@@ -25,6 +25,7 @@
 LIB_CURLX_CFILES = \
   curlx/base64.c   \
   curlx/dynbuf.c   \
+  curlx/inet_pton.c \
   curlx/multibyte.c \
   curlx/nonblock.c \
   curlx/strparse.c \
@@ -38,6 +39,7 @@ LIB_CURLX_HFILES = \
   curlx/base64.h   \
   curlx/curlx.h    \
   curlx/dynbuf.h   \
+  curlx/inet_pton.h \
   curlx/multibyte.h \
   curlx/nonblock.h \
   curlx/strparse.h \
@@ -207,7 +209,6 @@ LIB_CFILES =         \
   if2ip.c            \
   imap.c             \
   inet_ntop.c        \
-  inet_pton.c        \
   krb5.c             \
   ldap.c             \
   llist.c            \
@@ -345,7 +346,6 @@ LIB_HFILES =         \
   if2ip.h            \
   imap.h             \
   inet_ntop.h        \
-  inet_pton.h        \
   llist.h            \
   macos.h            \
   memdebug.h         \

diff --git a/lib/altsvc.c b/lib/altsvc.c
index ad37af4db8fd84e9db3f5c784ba47d93ab96287b..8a29ca46265e505798c566bb647debd4e75e9c00 100644 (file)
--- a/lib/altsvc.c
+++ b/lib/altsvc.c
@@ -39,7 +39,7 @@
 #include "fopen.h"
 #include "rename.h"
 #include "strdup.h"
-#include "inet_pton.h"
+#include "curlx/inet_pton.h"
 #include "curlx/strparse.h"
 #include "connect.h"
 

diff --git a/lib/asyn-ares.c b/lib/asyn-ares.c
index 4f576c5cb04a24b9d70b7bb3f837530bf471e60e..340d3d51ceaff449115bf8e7c9b79d2279129deb 100644 (file)
--- a/lib/asyn-ares.c
+++ b/lib/asyn-ares.c
@@ -54,7 +54,7 @@
 #include "share.h"
 #include "url.h"
 #include "multiif.h"
-#include "inet_pton.h"
+#include "curlx/inet_pton.h"
 #include "connect.h"
 #include "select.h"
 #include "progress.h"

diff --git a/lib/cf-socket.c b/lib/cf-socket.c
index c625d7fda61a97a9ab15fff234be453321d9f0be..e31977201c6812d5ee00eb16e85c1487155061d7 100644 (file)
--- a/lib/cf-socket.c
+++ b/lib/cf-socket.c
@@ -74,7 +74,7 @@
 #include "multiif.h"
 #include "sockaddr.h" /* required for Curl_sockaddr_storage */
 #include "inet_ntop.h"
-#include "inet_pton.h"
+#include "curlx/inet_pton.h"
 #include "progress.h"
 #include "curlx/warnless.h"
 #include "conncache.h"

diff --git a/lib/connect.c b/lib/connect.c
index fcac5ac7f109a10fa061b87b675ddd073abb71da..52f2c84a4e44da270a68f38e8e39d3cc58a8c999 100644 (file)
--- a/lib/connect.c
+++ b/lib/connect.c
@@ -67,7 +67,7 @@
 #include "multiif.h"
 #include "sockaddr.h" /* required for Curl_sockaddr_storage */
 #include "inet_ntop.h"
-#include "inet_pton.h"
+#include "curlx/inet_pton.h"
 #include "vtls/vtls.h" /* for vtsl cfilters */
 #include "progress.h"
 #include "curlx/warnless.h"

diff --git a/lib/curl_addrinfo.c b/lib/curl_addrinfo.c
index d858515a08652ae309fd7930d7ef26e83a9bac20..ad1769fdb0cce806cca40bfcac3e7989c0aba1aa 100644 (file)
--- a/lib/curl_addrinfo.c
+++ b/lib/curl_addrinfo.c
@@ -51,7 +51,7 @@
 
 #include "curl_addrinfo.h"
 #include "fake_addrinfo.h"
-#include "inet_pton.h"
+#include "curlx/inet_pton.h"
 #include "curlx/warnless.h"
 /* The last 3 #include files should be in this order */
 #include "curl_printf.h"

diff --git a/lib/curlx/curlx.h b/lib/curlx/curlx.h
index e8249d7f61199fbef9942e97110d7c3b20e58f65..983c7b5c75b68151d6fb4cfa0dbcf6be39e50154 100644 (file)
--- a/lib/curlx/curlx.h
+++ b/lib/curlx/curlx.h
@@ -68,4 +68,7 @@
 #include "winapi.h"
 /* for curlx_winapi_strerror */
 
+#include "inet_pton.h"
+/* for curlx_inet_pton */
+
 #endif /* HEADER_CURL_CURLX_H */

diff --git a/lib/inet_pton.c b/lib/curlx/inet_pton.c
similarity index 98%
rename from lib/inet_pton.c
rename to lib/curlx/inet_pton.c
index e197afd79531e92a59388f36534c96874e5735e7..d2b39ae9f1a772a853359d24838db64291bf24ee 100644 (file)
--- a/lib/inet_pton.c
+++ b/lib/curlx/inet_pton.c
@@ -18,9 +18,9 @@
  * SPDX-License-Identifier: ISC
  */
 
-#include "curl_setup.h"
-#include "curl_ctype.h"
-#include "curlx/strparse.h"
+#include "../curl_setup.h"
+#include "../curl_ctype.h"
+#include "strparse.h"
 
 #ifndef HAVE_INET_PTON
 

diff --git a/lib/inet_pton.h b/lib/curlx/inet_pton.h
similarity index 98%
rename from lib/inet_pton.h
rename to lib/curlx/inet_pton.h
index fa6ee7a0ba67360b0b74e8e02f7925e81108801b..a9dc43085f4510ac81df6b2db554dd9cebc1a30b 100644 (file)
--- a/lib/inet_pton.h
+++ b/lib/curlx/inet_pton.h
@@ -24,7 +24,7 @@
  *
  ***************************************************************************/
 
-#include "curl_setup.h"
+#include "../curl_setup.h"
 
 int curlx_inet_pton(int, const char *, void *);
 

diff --git a/lib/ftp.c b/lib/ftp.c
index 40e08be47b731382f62d854be6139c56cba4f00d..8804ce5e61601a0ab315ec94972982f84f058319 100644 (file)
--- a/lib/ftp.c
+++ b/lib/ftp.c
@@ -61,7 +61,7 @@
 #include "connect.h"
 #include "strerror.h"
 #include "inet_ntop.h"
-#include "inet_pton.h"
+#include "curlx/inet_pton.h"
 #include "select.h"
 #include "parsedate.h" /* for the week day and month names */
 #include "sockaddr.h" /* required for Curl_sockaddr_storage */

diff --git a/lib/hostip.c b/lib/hostip.c
index 77b69d1449cda9fbdaf266024860c51a066debc6..266ba8e549212a184b8b496fd2de10d9eccd749d 100644 (file)
--- a/lib/hostip.c
+++ b/lib/hostip.c
@@ -55,7 +55,7 @@
 #include "share.h"
 #include "url.h"
 #include "inet_ntop.h"
-#include "inet_pton.h"
+#include "curlx/inet_pton.h"
 #include "multiif.h"
 #include "doh.h"
 #include "curlx/warnless.h"

diff --git a/lib/hostip6.c b/lib/hostip6.c
index 0d5770d3cf124e52974e841cd2f255b48850320b..35cc2d737bb37e3c6fa5b19d6c8d3552590d3592 100644 (file)
--- a/lib/hostip6.c
+++ b/lib/hostip6.c
@@ -49,7 +49,7 @@
 #include "hash.h"
 #include "share.h"
 #include "url.h"
-#include "inet_pton.h"
+#include "curlx/inet_pton.h"
 #include "connect.h"
 /* The last 3 #include files should be in this order */
 #include "curl_printf.h"

diff --git a/lib/noproxy.c b/lib/noproxy.c
index f84ce1e7b76c93e655fcd773adc5ba55c80e8d7f..0ecd8e17875da34a29841b4e10fdcdf588031b76 100644 (file)
--- a/lib/noproxy.c
+++ b/lib/noproxy.c
@@ -26,7 +26,7 @@
 
 #ifndef CURL_DISABLE_PROXY
 
-#include "inet_pton.h"
+#include "curlx/inet_pton.h"
 #include "strcase.h"
 #include "noproxy.h"
 #include "curlx/strparse.h"

diff --git a/lib/socks.c b/lib/socks.c
index 1d0f4d97c0952950ac3e16beae456927e3e04708..18cefe8bc8c76002052f4f91790ea9d5c468d4e9 100644 (file)
--- a/lib/socks.c
+++ b/lib/socks.c
@@ -41,7 +41,7 @@
 #include "curlx/timeval.h"
 #include "socks.h"
 #include "multiif.h" /* for getsock macros */
-#include "inet_pton.h"
+#include "curlx/inet_pton.h"
 #include "url.h"
 
 /* The last 3 #include files should be in this order */

diff --git a/lib/urlapi.c b/lib/urlapi.c
index 73292b1dcc7868f3cd5306d9688c41d91b789ac0..f2196a8062ea684209d7dc882d9772d8eb905b69 100644 (file)
--- a/lib/urlapi.c
+++ b/lib/urlapi.c
@@ -30,7 +30,7 @@
 #include "url.h"
 #include "escape.h"
 #include "curl_ctype.h"
-#include "inet_pton.h"
+#include "curlx/inet_pton.h"
 #include "inet_ntop.h"
 #include "strdup.h"
 #include "idn.h"

diff --git a/lib/vquic/curl_ngtcp2.c b/lib/vquic/curl_ngtcp2.c
index ed14710cdfd09a9332035fa14e8f407c22d64627..c0bb20446e278c78e0368b946ae9db8de7e1e08a 100644 (file)
--- a/lib/vquic/curl_ngtcp2.c
+++ b/lib/vquic/curl_ngtcp2.c
@@ -61,7 +61,7 @@
 #include "../curlx/dynbuf.h"
 #include "../http1.h"
 #include "../select.h"
-#include "../inet_pton.h"
+#include "../curlx/inet_pton.h"
 #include "../transfer.h"
 #include "vquic.h"
 #include "vquic_int.h"

diff --git a/lib/vquic/curl_osslq.c b/lib/vquic/curl_osslq.c
index 39eaf268d56d652f96fc4705805ca2e9a474a527..f942eef843ec58937f6e5d3f6acf7bfdf7c711e4 100644 (file)
--- a/lib/vquic/curl_osslq.c
+++ b/lib/vquic/curl_osslq.c
@@ -46,7 +46,7 @@
 #include "../curlx/dynbuf.h"
 #include "../http1.h"
 #include "../select.h"
-#include "../inet_pton.h"
+#include "../curlx/inet_pton.h"
 #include "../uint-hash.h"
 #include "vquic.h"
 #include "vquic_int.h"

diff --git a/lib/vquic/curl_quiche.c b/lib/vquic/curl_quiche.c
index a1d184fc383d84516ae732c5f38b741573005ea9..88065328896ce936776b295ecd28e3ed2258a9df 100644 (file)
--- a/lib/vquic/curl_quiche.c
+++ b/lib/vquic/curl_quiche.c
@@ -47,7 +47,7 @@
 #include "vquic-tls.h"
 #include "curl_quiche.h"
 #include "../transfer.h"
-#include "../inet_pton.h"
+#include "../curlx/inet_pton.h"
 #include "../vtls/openssl.h"
 #include "../vtls/keylog.h"
 #include "../vtls/vtls.h"

diff --git a/lib/vtls/bearssl.c b/lib/vtls/bearssl.c
index 39abf0f0c1a760d0617d0a856abe343fa52b7ea7..4b652444510f4afc72536101005fd0b3cdd9e6ec 100644 (file)
--- a/lib/vtls/bearssl.c
+++ b/lib/vtls/bearssl.c
@@ -31,7 +31,7 @@
 #include "cipher_suite.h"
 #include "../urldata.h"
 #include "../sendf.h"
-#include "../inet_pton.h"
+#include "../curlx/inet_pton.h"
 #include "vtls.h"
 #include "vtls_int.h"
 #include "vtls_scache.h"

diff --git a/lib/vtls/gtls.c b/lib/vtls/gtls.c
index 17051ca069a98de90f8476fb2fc2dc98a5452b09..bb2a0265cd30135b69500e45a80b2e03515c712d 100644 (file)
--- a/lib/vtls/gtls.c
+++ b/lib/vtls/gtls.c
@@ -42,7 +42,7 @@
 
 #include "../urldata.h"
 #include "../sendf.h"
-#include "../inet_pton.h"
+#include "../curlx/inet_pton.h"
 #include "keylog.h"
 #include "gtls.h"
 #include "vtls.h"

diff --git a/lib/vtls/mbedtls.c b/lib/vtls/mbedtls.c
index be5a8023643dfca12fbd0e158ea958511903e218..7af207caa77b66cce08102ab24f01284ac65748a 100644 (file)
--- a/lib/vtls/mbedtls.c
+++ b/lib/vtls/mbedtls.c
@@ -60,7 +60,7 @@
 #include "../strcase.h"
 #include "../urldata.h"
 #include "../sendf.h"
-#include "../inet_pton.h"
+#include "../curlx/inet_pton.h"
 #include "mbedtls.h"
 #include "vtls.h"
 #include "vtls_int.h"

diff --git a/lib/vtls/openssl.c b/lib/vtls/openssl.c
index e0baaff9ed82b6728c5e2808016d292971cfda8b..8817b835d7aec6bdbc9e38c819e5e361dbf581c2 100644 (file)
--- a/lib/vtls/openssl.c
+++ b/lib/vtls/openssl.c
@@ -49,7 +49,7 @@
 #include "../sendf.h"
 #include "../formdata.h" /* for the boundary function */
 #include "../url.h" /* for the ssl config check function */
-#include "../inet_pton.h"
+#include "../curlx/inet_pton.h"
 #include "openssl.h"
 #include "../connect.h"
 #include "../slist.h"

diff --git a/lib/vtls/rustls.c b/lib/vtls/rustls.c
index 3c4a2752deb9e796f71f6b5b769d69953f4a9cab..cb9fd6230a5caa960af452956f87bd278698ebb7 100644 (file)
--- a/lib/vtls/rustls.c
+++ b/lib/vtls/rustls.c
@@ -32,7 +32,7 @@
 
 #include <rustls.h>
 
-#include "../inet_pton.h"
+#include "../curlx/inet_pton.h"
 #include "../urldata.h"
 #include "../sendf.h"
 #include "vtls.h"

diff --git a/lib/vtls/schannel.c b/lib/vtls/schannel.c
index d77bb2da9a797a624b5420d6f64eb0e159012ccc..bea8eef8c0d9b81f9b87152e2ee9662ec822e036 100644 (file)
--- a/lib/vtls/schannel.c
+++ b/lib/vtls/schannel.c
@@ -47,7 +47,7 @@
 #include "../connect.h" /* for the connect timeout */
 #include "../strerror.h"
 #include "../select.h" /* for the socket readiness */
-#include "../inet_pton.h" /* for IP addr SNI check */
+#include "../curlx/inet_pton.h" /* for IP addr SNI check */
 #include "../curlx/multibyte.h"
 #include "../curlx/warnless.h"
 #include "x509asn1.h"

diff --git a/lib/vtls/schannel_verify.c b/lib/vtls/schannel_verify.c
index 4834fc450faa1742034096c4a8194fa17e40101e..efa240534fc44b249d4e2cac7eb6cbdd8c7bde00 100644 (file)
--- a/lib/vtls/schannel_verify.c
+++ b/lib/vtls/schannel_verify.c
@@ -39,7 +39,7 @@
 #include "schannel.h"
 #include "schannel_int.h"
 
-#include "../inet_pton.h"
+#include "../curlx/inet_pton.h"
 #include "vtls.h"
 #include "vtls_int.h"
 #include "../sendf.h"

diff --git a/lib/vtls/sectransp.c b/lib/vtls/sectransp.c
index 12aa2f2a91ae6c545019e2c038159b1073a9f6b6..2ae2ef35a2bbfd2e044c8116cb6dd6346e6035dc 100644 (file)
--- a/lib/vtls/sectransp.c
+++ b/lib/vtls/sectransp.c
@@ -135,7 +135,7 @@
 #endif /* CURL_BUILD_MAC */
 
 #include "../sendf.h"
-#include "../inet_pton.h"
+#include "../curlx/inet_pton.h"
 #include "../connect.h"
 #include "../select.h"
 #include "vtls.h"

diff --git a/lib/vtls/vtls.c b/lib/vtls/vtls.c
index 3b335e28718c8d8eacd71bb9da2100cd3ab44000..2f2c544a8eb1b9aa8d48f687e109874f3a28792d 100644 (file)
--- a/lib/vtls/vtls.c
+++ b/lib/vtls/vtls.c
@@ -79,7 +79,7 @@
 #include "../curlx/warnless.h"
 #include "../curlx/base64.h"
 #include "../curl_printf.h"
-#include "../inet_pton.h"
+#include "../curlx/inet_pton.h"
 #include "../connect.h"
 #include "../select.h"
 #include "../strdup.h"

diff --git a/lib/vtls/wolfssl.c b/lib/vtls/wolfssl.c
index ab7ab46dbd936c9f6e40f71606502a65329495fe..ee3f650fce932e2b20e8cb90592c559674bfd338 100644 (file)
--- a/lib/vtls/wolfssl.c
+++ b/lib/vtls/wolfssl.c
@@ -58,7 +58,7 @@
 
 #include "../urldata.h"
 #include "../sendf.h"
-#include "../inet_pton.h"
+#include "../curlx/inet_pton.h"
 #include "vtls.h"
 #include "vtls_int.h"
 #include "vtls_scache.h"

diff --git a/lib/vtls/x509asn1.c b/lib/vtls/x509asn1.c
index 7f9d332ecf476fbf0626ff6e1ceb162c15392d28..dd2aa145af395494363d735918d656c47a2ca1fc 100644 (file)
--- a/lib/vtls/x509asn1.c
+++ b/lib/vtls/x509asn1.c
@@ -46,7 +46,7 @@
 #include "vtls.h"
 #include "vtls_int.h"
 #include "../sendf.h"
-#include "../inet_pton.h"
+#include "../curlx/inet_pton.h"
 #include "../curlx/base64.h"
 #include "x509asn1.h"
 #include "../curlx/dynbuf.h"

diff --git a/tests/server/Makefile.inc b/tests/server/Makefile.inc
index a4e26a529e162890dc9914e156595b05da0c4d3f..c3ed7c5e1125a2a5832078f7f8a2f65a68a7ac85 100644 (file)
--- a/tests/server/Makefile.inc
+++ b/tests/server/Makefile.inc
@@ -70,7 +70,7 @@ FIRSTFILES = \
   first.h
 
 INET_PTON = \
-  ../../lib/inet_pton.c
+  ../../lib/curlx/inet_pton.c
 
 resolve_SOURCES = $(MEMDEBUG) $(CURLX_SRCS) $(CURLX_HDRS) $(UTIL) \
   resolve.c