curlx: move curlx_inet_pton

Used by test server code.

Closes #17300

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         \

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"
 

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"

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"

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"

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"

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

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
 

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 *);
 

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

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"

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"

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"

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

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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