build: always use local `inet_pton()`/`inet_ntop()` implementations

Also repurpose existing build-time feature checks into unit test 1961,
to verify.

Prior to this patch these functions were auto-detected with both
autotools and cmake. In case of autotools there was an extra
verification phase ensuring the functions work as expected. This step
required running the function, thus was limited to non-cross-builds. For
cross-builds and CMake it always used the system implementation if
present. On Windows it always used the local implementation, because
availability/use is complicated there.

After this patch all platforms, always use the local implementation,
which is known to be accurate. This makes curl behave more consistently,
and simplifies the build process, a fixes cross-builds and CMake
auto-detection differences.

Also:
- test1960: enable unconditionally.
- checksrc: disallow globally, allowlist in `block_ip.c` example.
- dnsd: verify ntop result for NULL before passing to printf.

Ref: https://github.com/curl/curl/pull/22137#issuecomment-4797440983
Ref: #22137
Ref: 8537a5b0bcf4565551774c2b2375c49767e405a7 #16577

Closes #22170

diff --git a/CMake/unix-cache.cmake b/CMake/unix-cache.cmake
index 44dc6472b22ead7201b23d2d094e03c16ea8e242..97be36d5f3c2f010402cc3b7c084618303a1e32a 100644 (file)
--- a/CMake/unix-cache.cmake
+++ b/CMake/unix-cache.cmake
@@ -166,8 +166,6 @@ endif()
 set(HAVE_GMTIME_R 1)
 set(HAVE_IFADDRS_H 1)
 set(HAVE_IF_NAMETOINDEX 1)
-set(HAVE_INET_NTOP 1)
-set(HAVE_INET_PTON 1)
 set(HAVE_IOCTLSOCKET 0)
 set(HAVE_IOCTLSOCKET_CAMEL 0)
 set(HAVE_IOCTLSOCKET_CAMEL_FIONBIO 0)

diff --git a/CMake/win32-cache.cmake b/CMake/win32-cache.cmake
index bd9bb6e3fc89110668063ef38cd5a0b37f6670fd..c1080872738646101a1cef2a80081eea555b2052 100644 (file)
--- a/CMake/win32-cache.cmake
+++ b/CMake/win32-cache.cmake
@@ -104,8 +104,6 @@ set(HAVE_GETSOCKNAME 1)
 set(HAVE_GLIBC_STRERROR_R 0)
 set(HAVE_GMTIME_R 0)
 set(HAVE_IFADDRS_H 0)
-set(HAVE_INET_NTOP 0)
-set(HAVE_INET_PTON 0)
 set(HAVE_IOCTLSOCKET 1)
 set(HAVE_IOCTLSOCKET_CAMEL 0)
 set(HAVE_IOCTLSOCKET_CAMEL_FIONBIO 0)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8db6d79ad7bf873ec14b5700fd2a4a8721467643..0ad15f76679189ed854ee82b1c279d9a32fec9f2 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1685,8 +1685,6 @@ if(NOT WIN32)
   check_function_exists("realpath"        HAVE_REALPATH)
   check_function_exists("sched_yield"     HAVE_SCHED_YIELD)
 
-  check_symbol_exists("inet_ntop"       "${CURL_INCLUDES};stdlib.h;string.h" HAVE_INET_NTOP) # arpa/inet.h netinet/in.h sys/socket.h
-  check_symbol_exists("inet_pton"       "${CURL_INCLUDES};stdlib.h;string.h" HAVE_INET_PTON) # arpa/inet.h netinet/in.h sys/socket.h
   check_symbol_exists("strcasecmp"      "string.h" HAVE_STRCASECMP)
   check_symbol_exists("stricmp"         "string.h" HAVE_STRICMP)
   check_symbol_exists("strcmpi"         "string.h" HAVE_STRCMPI)

diff --git a/configure.ac b/configure.ac
index 575cf4046af9f4572c81c4ce31822e3444aa869d..a8bf9703fa71417f59f45ed6b2a9307cc2e6bbd6 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -4193,8 +4193,6 @@ if test "$curl_cv_native_windows" != "yes"; then
     realpath \
     sched_yield \
   ])
-  CURL_CHECK_FUNC_INET_NTOP
-  CURL_CHECK_FUNC_INET_PTON
   CURL_CHECK_FUNC_STRCASECMP
   CURL_CHECK_FUNC_STRCMPI
   CURL_CHECK_FUNC_STRICMP

diff --git a/docs/examples/block_ip.c b/docs/examples/block_ip.c
index 675490701bfda1765bb1d949d3537c4dbb89b2f7..69ffb251953daea518d1352f5cd4d45d6939df87 100644 (file)
--- a/docs/examples/block_ip.c
+++ b/docs/examples/block_ip.c
@@ -150,6 +150,7 @@ static struct ip *ip_list_append(struct ip *list, const char *data)
     ip->maskbits = 128;
 #endif
 
+  /* !checksrc! disable BANNEDFUNC 1 */
   if(inet_pton(ip->family, ip->str, &ip->netaddr) != 1) {
     free(ip->str);
     free(ip);
@@ -264,6 +265,7 @@ static curl_socket_t opensocket(void *clientp, curlsocktype purpose,
       if(ip && filter->type == CONNECTION_FILTER_BLACKLIST) {
         if(filter->verbose) {
           char buf[128] = { 0 };
+          /* !checksrc! disable BANNEDFUNC 1 */
           inet_ntop(address->family, cinaddr, buf, sizeof(buf));
           fprintf(stderr, "* Rejecting IP %s due to blacklist entry %s.\n",
                   buf, ip->str);
@@ -273,6 +275,7 @@ static curl_socket_t opensocket(void *clientp, curlsocktype purpose,
       else if(!ip && filter->type == CONNECTION_FILTER_WHITELIST) {
         if(filter->verbose) {
           char buf[128] = { 0 };
+          /* !checksrc! disable BANNEDFUNC 1 */
           inet_ntop(address->family, cinaddr, buf, sizeof(buf));
           fprintf(stderr,
                   "* Rejecting IP %s due to missing whitelist entry.\n", buf);

diff --git a/docs/internals/CODE_STYLE.md b/docs/internals/CODE_STYLE.md
index ce3c1991355586d5f3e868948e380e95bfa15b44..5feb52f3dca6ffff093f6138055e637e609fdea2 100644 (file)
--- a/docs/internals/CODE_STYLE.md
+++ b/docs/internals/CODE_STYLE.md
@@ -371,6 +371,8 @@ This is the full list of functions generally banned.
     getaddrinfo
     gets
     gmtime
+    inet_ntop
+    inet_pton
     llseek
     LoadLibrary
     LoadLibraryA

diff --git a/lib/config-win32.h b/lib/config-win32.h
index b1fc1022094eb0e0c3b4354ba030318fa82c68a5..fedfb8f30ed83c40f54ca985f2ec9c7f533ec1d5 100644 (file)
--- a/lib/config-win32.h
+++ b/lib/config-win32.h
@@ -154,12 +154,6 @@
 /* Define to the function return type for send. */
 #define SEND_TYPE_RETV int
 
-/* Must always use local implementations on Windows. */
-/* Define to 1 if you have an IPv6 capable working inet_ntop function. */
-/* #undef HAVE_INET_NTOP */
-/* Define to 1 if you have an IPv6 capable working inet_pton function. */
-/* #undef HAVE_INET_PTON */
-
 /* Define to 1 if you have the `basename' function. */
 #ifdef __MINGW32__
 #define HAVE_BASENAME 1

diff --git a/lib/curl_config-cmake.h.in b/lib/curl_config-cmake.h.in
index c38caa2a03fdc289988a464fbd9eba2ffc5a6f6a..92280010c08ed53c799d319eb1fb085ead6c2512 100644 (file)
--- a/lib/curl_config-cmake.h.in
+++ b/lib/curl_config-cmake.h.in
@@ -336,12 +336,6 @@
 /* Define to 1 if you have the <ifaddrs.h> header file. */
 #cmakedefine HAVE_IFADDRS_H 1
 
-/* Define to 1 if you have an IPv6 capable working inet_ntop function. */
-#cmakedefine HAVE_INET_NTOP 1
-
-/* Define to 1 if you have an IPv6 capable working inet_pton function. */
-#cmakedefine HAVE_INET_PTON 1
-
 /* Define to 1 if symbol `sa_family_t' exists */
 #cmakedefine HAVE_SA_FAMILY_T 1
 

diff --git a/lib/curlx/inet_ntop.c b/lib/curlx/inet_ntop.c
index 803b9887ac91c638e0f34a614a97aab8e42b5793..7f6028a7910162d981f1cb50839d0979c0cbf74a 100644 (file)
--- a/lib/curlx/inet_ntop.c
+++ b/lib/curlx/inet_ntop.c
@@ -18,8 +18,6 @@
  */
 #include "curl_setup.h"
 
-#ifndef HAVE_INET_NTOP
-
 #ifdef HAVE_SYS_PARAM_H
 #include <sys/param.h>
 #endif
@@ -219,4 +217,3 @@ char *curlx_inet_ntop(int af, const void *src, char *buf, size_t size)
     return NULL;
   }
 }
-#endif /* HAVE_INET_NTOP */

diff --git a/lib/curlx/inet_ntop.h b/lib/curlx/inet_ntop.h
index ba8299fe4e3d2dc2e74006b8a720982065153761..8f4c636d69449249f29413f47a6aa14be9503e39 100644 (file)
--- a/lib/curlx/inet_ntop.h
+++ b/lib/curlx/inet_ntop.h
@@ -25,26 +25,6 @@
  ***************************************************************************/
 #include "curl_setup.h"
 
-#ifdef HAVE_INET_NTOP
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifndef _WIN32
-#include <sys/socket.h>
-#endif
-#ifdef HAVE_ARPA_INET_H
-#include <arpa/inet.h>
-#endif
-#ifdef __AMIGA__
-#define curlx_inet_ntop(af, src, buf, size)                            \
-  (char *)inet_ntop(af, CURL_UNCONST(src), (unsigned char *)(buf),     \
-                    (curl_socklen_t)(size))
-#else
-#define curlx_inet_ntop(af, src, buf, size)                            \
-  inet_ntop(af, src, buf, (curl_socklen_t)(size))
-#endif
-#else
 char *curlx_inet_ntop(int af, const void *src, char *buf, size_t size);
-#endif /* HAVE_INET_NTOP */
 
 #endif /* HEADER_CURL_INET_NTOP_H */

diff --git a/lib/curlx/inet_pton.c b/lib/curlx/inet_pton.c
index 7994f258febde2e211c8afc8a247d41fc8ea7e96..c8f63a1413c6d2049611ddde06c3d091dced2247 100644 (file)
--- a/lib/curlx/inet_pton.c
+++ b/lib/curlx/inet_pton.c
@@ -19,8 +19,6 @@
  */
 #include "curl_setup.h"
 
-#ifndef HAVE_INET_PTON
-
 #ifdef HAVE_SYS_PARAM_H
 #include <sys/param.h>
 #endif
@@ -217,5 +215,3 @@ int curlx_inet_pton(int af, const char *src, void *dst)
   }
   /* NOTREACHED */
 }
-
-#endif /* HAVE_INET_PTON */

diff --git a/lib/curlx/inet_pton.h b/lib/curlx/inet_pton.h
index 02ae7f2269dd1c7131bb833c56a63453fac1c8d1..4e45e83285c418924cef21f284b5ac44113a3876 100644 (file)
--- a/lib/curlx/inet_pton.h
+++ b/lib/curlx/inet_pton.h
@@ -25,25 +25,6 @@
  ***************************************************************************/
 #include "curl_setup.h"
 
-#ifdef HAVE_INET_PTON
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifndef _WIN32
-#include <sys/socket.h>
-#endif
-#ifdef HAVE_ARPA_INET_H
-#include <arpa/inet.h>
-#endif
-#ifdef __AMIGA__
-#define curlx_inet_pton(x, y, z) \
-  inet_pton(x, (unsigned char *)CURL_UNCONST(y), z)
-#else
-#define curlx_inet_pton(x, y, z) \
-  inet_pton(x, y, z)
-#endif
-#else
 int curlx_inet_pton(int af, const char *src, void *dst);
-#endif /* HAVE_INET_PTON */
 
 #endif /* HEADER_CURL_INET_PTON_H */

diff --git a/m4/curl-functions.m4 b/m4/curl-functions.m4
index 490c1e5d1fb47db70a9e3ef3f07d1bcfe90c8014..64046a834afbf19a60d7ea06842942ac93230b1b 100644 (file)
--- a/m4/curl-functions.m4
+++ b/m4/curl-functions.m4
@@ -25,35 +25,6 @@
 dnl File version for 'aclocal' use. Keep it a single number.
 dnl serial 73
 
-dnl CURL_INCLUDES_ARPA_INET
-dnl -------------------------------------------------
-dnl Set up variable with list of headers that must be
-dnl included when arpa/inet.h is to be included.
-
-AC_DEFUN([CURL_INCLUDES_ARPA_INET], [
-curl_includes_arpa_inet="\
-/* includes start */
-#ifdef HAVE_SYS_TYPES_H
-#  include <sys/types.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#  include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_INET_H
-#  include <arpa/inet.h>
-#endif
-#ifdef _WIN32
-#include <winsock2.h>
-#include <ws2tcpip.h>
-#else
-#include <sys/socket.h>
-#endif
-/* includes end */"
-  AC_CHECK_HEADERS(
-    sys/types.h netinet/in.h arpa/inet.h,
-    [], [], [$curl_includes_arpa_inet])
-])
-
 
 dnl CURL_INCLUDES_FCNTL
 dnl -------------------------------------------------
@@ -2254,334 +2225,6 @@ AC_DEFUN([CURL_CHECK_FUNC_LOCALTIME_R], [
 ])
 
 
-dnl CURL_CHECK_FUNC_INET_NTOP
-dnl -------------------------------------------------
-dnl Verify if inet_ntop is available, prototyped, can
-dnl be compiled and seems to work. If all of these are
-dnl true, and usage has not been previously disallowed
-dnl with shell variable curl_disallow_inet_ntop, then
-dnl HAVE_INET_NTOP is defined.
-
-AC_DEFUN([CURL_CHECK_FUNC_INET_NTOP], [
-  AC_REQUIRE([CURL_INCLUDES_STDLIB])
-  AC_REQUIRE([CURL_INCLUDES_ARPA_INET])
-  AC_REQUIRE([CURL_INCLUDES_STRING])
-
-  tst_links_inet_ntop="unknown"
-  tst_proto_inet_ntop="unknown"
-  tst_compi_inet_ntop="unknown"
-  tst_works_inet_ntop="unknown"
-  tst_allow_inet_ntop="unknown"
-
-  AC_MSG_CHECKING([if inet_ntop can be linked])
-  AC_LINK_IFELSE([
-    AC_LANG_FUNC_LINK_TRY([inet_ntop])
-  ],[
-    AC_MSG_RESULT([yes])
-    tst_links_inet_ntop="yes"
-  ],[
-    AC_MSG_RESULT([no])
-    tst_links_inet_ntop="no"
-  ])
-
-  if test "$tst_links_inet_ntop" = "yes"; then
-    AC_MSG_CHECKING([if inet_ntop is prototyped])
-    AC_EGREP_CPP([inet_ntop],[
-      $curl_includes_arpa_inet
-    ],[
-      AC_MSG_RESULT([yes])
-      tst_proto_inet_ntop="yes"
-    ],[
-      AC_MSG_RESULT([no])
-      tst_proto_inet_ntop="no"
-    ])
-  fi
-
-  if test "$tst_proto_inet_ntop" = "yes"; then
-    AC_MSG_CHECKING([if inet_ntop is compilable])
-    AC_COMPILE_IFELSE([
-      AC_LANG_PROGRAM([[
-        $curl_includes_arpa_inet
-      ]],[[
-        char ipv4res[sizeof("255.255.255.255")];
-        unsigned char ipv4a[5] = "";
-        if(inet_ntop(0, ipv4a, ipv4res, 0))
-          return 1;
-      ]])
-    ],[
-      AC_MSG_RESULT([yes])
-      tst_compi_inet_ntop="yes"
-    ],[
-      AC_MSG_RESULT([no])
-      tst_compi_inet_ntop="no"
-    ])
-  fi
-
-  dnl only do runtime verification when not cross-compiling
-  if test "$cross_compiling" != "yes" &&
-     test "$tst_compi_inet_ntop" = "yes"; then
-    AC_MSG_CHECKING([if inet_ntop seems to work])
-    CURL_RUN_IFELSE([
-      AC_LANG_PROGRAM([[
-        $curl_includes_stdlib
-        $curl_includes_arpa_inet
-        $curl_includes_string
-      ]],[[
-        char ipv6res[sizeof("ffff:ffff:ffff:ffff:ffff:ffff:255.255.255.255")];
-        char ipv4res[sizeof("255.255.255.255")];
-        unsigned char ipv6a[26];
-        unsigned char ipv4a[5];
-        const char *ipv6ptr = 0;
-        const char *ipv4ptr = 0;
-        /* - */
-        ipv4res[0] = '\0';
-        ipv4a[0] = 0xc0;
-        ipv4a[1] = 0xa8;
-        ipv4a[2] = 0x64;
-        ipv4a[3] = 0x01;
-        ipv4a[4] = 0x01;
-        ipv4ptr = inet_ntop(AF_INET, ipv4a, ipv4res, sizeof(ipv4res));
-        if(!ipv4ptr)
-          return 1; /* fail */
-        if(ipv4ptr != ipv4res)
-          return 1; /* fail */
-        if(!ipv4ptr[0])
-          return 1; /* fail */
-        if(memcmp(ipv4res, "192.168.100.1", 13))
-          return 1; /* fail */
-        /* - */
-        ipv6res[0] = '\0';
-        memset(ipv6a, 0, sizeof(ipv6a));
-        ipv6a[0] = 0xfe;
-        ipv6a[1] = 0x80;
-        ipv6a[8] = 0x02;
-        ipv6a[9] = 0x14;
-        ipv6a[10] = 0x4f;
-        ipv6a[11] = 0xff;
-        ipv6a[12] = 0xfe;
-        ipv6a[13] = 0x0b;
-        ipv6a[14] = 0x76;
-        ipv6a[15] = 0xc8;
-        ipv6a[25] = 0x01;
-        ipv6ptr = inet_ntop(AF_INET6, ipv6a, ipv6res, sizeof(ipv6res));
-        if(!ipv6ptr)
-          return 1; /* fail */
-        if(ipv6ptr != ipv6res)
-          return 1; /* fail */
-        if(!ipv6ptr[0])
-          return 1; /* fail */
-        if(memcmp(ipv6res, "fe80::214:4fff:fe0b:76c8", 24))
-          return 1; /* fail */
-
-        /* verify working RFC 4291 zero prefixed IPv4 - mapped format */
-        memset(ipv6a, 0, sizeof(ipv6a));
-        ipv6a[12] = 0x7f;
-        ipv6a[13] = 0x0;
-        ipv6a[14] = 0x0;
-        ipv6a[15] = 0x01;
-        ipv6ptr = inet_ntop(AF_INET6, ipv6a, ipv6res, sizeof(ipv6res));
-        if(!ipv6ptr)
-          return 1; /* fail */
-        if(ipv6ptr != ipv6res)
-          return 1; /* fail */
-        if(!ipv6ptr[0])
-          return 1; /* fail */
-        if(memcmp(ipv6res, "::127.0.0.1", 11))
-          return 1; /* fail */
-        return 0;
-      ]])
-    ],[
-      AC_MSG_RESULT([yes])
-      tst_works_inet_ntop="yes"
-    ],[
-      AC_MSG_RESULT([no])
-      tst_works_inet_ntop="no"
-    ])
-  fi
-
-  if test "$tst_compi_inet_ntop" = "yes" &&
-     test "$tst_works_inet_ntop" != "no"; then
-    AC_MSG_CHECKING([if inet_ntop usage allowed])
-    if test "x$curl_disallow_inet_ntop" != "xyes"; then
-      AC_MSG_RESULT([yes])
-      tst_allow_inet_ntop="yes"
-    else
-      AC_MSG_RESULT([no])
-      tst_allow_inet_ntop="no"
-    fi
-  fi
-
-  AC_MSG_CHECKING([if inet_ntop might be used])
-  if test "$tst_links_inet_ntop" = "yes" &&
-     test "$tst_proto_inet_ntop" = "yes" &&
-     test "$tst_compi_inet_ntop" = "yes" &&
-     test "$tst_allow_inet_ntop" = "yes" &&
-     test "$tst_works_inet_ntop" != "no"; then
-    AC_MSG_RESULT([yes])
-    AC_DEFINE_UNQUOTED(HAVE_INET_NTOP, 1,
-      [Define to 1 if you have an IPv6 capable working inet_ntop function.])
-    curl_cv_func_inet_ntop="yes"
-  else
-    AC_MSG_RESULT([no])
-    curl_cv_func_inet_ntop="no"
-  fi
-])
-
-
-dnl CURL_CHECK_FUNC_INET_PTON
-dnl -------------------------------------------------
-dnl Verify if inet_pton is available, prototyped, can
-dnl be compiled and seems to work. If all of these are
-dnl true, and usage has not been previously disallowed
-dnl with shell variable curl_disallow_inet_pton, then
-dnl HAVE_INET_PTON is defined.
-
-AC_DEFUN([CURL_CHECK_FUNC_INET_PTON], [
-  AC_REQUIRE([CURL_INCLUDES_STDLIB])
-  AC_REQUIRE([CURL_INCLUDES_ARPA_INET])
-  AC_REQUIRE([CURL_INCLUDES_STRING])
-
-  tst_links_inet_pton="unknown"
-  tst_proto_inet_pton="unknown"
-  tst_compi_inet_pton="unknown"
-  tst_works_inet_pton="unknown"
-  tst_allow_inet_pton="unknown"
-
-  AC_MSG_CHECKING([if inet_pton can be linked])
-  AC_LINK_IFELSE([
-    AC_LANG_FUNC_LINK_TRY([inet_pton])
-  ],[
-    AC_MSG_RESULT([yes])
-    tst_links_inet_pton="yes"
-  ],[
-    AC_MSG_RESULT([no])
-    tst_links_inet_pton="no"
-  ])
-
-  if test "$tst_links_inet_pton" = "yes"; then
-    AC_MSG_CHECKING([if inet_pton is prototyped])
-    AC_EGREP_CPP([inet_pton],[
-      $curl_includes_arpa_inet
-    ],[
-      AC_MSG_RESULT([yes])
-      tst_proto_inet_pton="yes"
-    ],[
-      AC_MSG_RESULT([no])
-      tst_proto_inet_pton="no"
-    ])
-  fi
-
-  if test "$tst_proto_inet_pton" = "yes"; then
-    AC_MSG_CHECKING([if inet_pton is compilable])
-    AC_COMPILE_IFELSE([
-      AC_LANG_PROGRAM([[
-        $curl_includes_arpa_inet
-      ]],[[
-        unsigned char ipv4a[4 + 1] = "";
-        const char *ipv4src = "192.168.100.1";
-        if(inet_pton(0, ipv4src, ipv4a))
-          return 1;
-      ]])
-    ],[
-      AC_MSG_RESULT([yes])
-      tst_compi_inet_pton="yes"
-    ],[
-      AC_MSG_RESULT([no])
-      tst_compi_inet_pton="no"
-    ])
-  fi
-
-  dnl only do runtime verification when not cross-compiling
-  if test "$cross_compiling" != "yes" &&
-     test "$tst_compi_inet_pton" = "yes"; then
-    AC_MSG_CHECKING([if inet_pton seems to work])
-    CURL_RUN_IFELSE([
-      AC_LANG_PROGRAM([[
-        $curl_includes_stdlib
-        $curl_includes_arpa_inet
-        $curl_includes_string
-      ]],[[
-        unsigned char ipv6a[16 + 1];
-        unsigned char ipv4a[4 + 1];
-        const char *ipv6src = "fe80::214:4fff:fe0b:76c8";
-        const char *ipv4src = "192.168.100.1";
-        /* - */
-        memset(ipv4a, 1, sizeof(ipv4a));
-        if(inet_pton(AF_INET, ipv4src, ipv4a) != 1)
-          return 1; /* fail */
-        /* - */
-        if((ipv4a[0] != 0xc0) ||
-           (ipv4a[1] != 0xa8) ||
-           (ipv4a[2] != 0x64) ||
-           (ipv4a[3] != 0x01) ||
-           (ipv4a[4] != 0x01))
-          return 1; /* fail */
-        /* - */
-        memset(ipv6a, 1, sizeof(ipv6a));
-        if(inet_pton(AF_INET6, ipv6src, ipv6a) != 1)
-          return 1; /* fail */
-        /* - */
-        if((ipv6a[0]  != 0xfe) ||
-           (ipv6a[1]  != 0x80) ||
-           (ipv6a[8]  != 0x02) ||
-           (ipv6a[9]  != 0x14) ||
-           (ipv6a[10] != 0x4f) ||
-           (ipv6a[11] != 0xff) ||
-           (ipv6a[12] != 0xfe) ||
-           (ipv6a[13] != 0x0b) ||
-           (ipv6a[14] != 0x76) ||
-           (ipv6a[15] != 0xc8) ||
-           (ipv6a[16] != 0x01))
-          return 1; /* fail */
-        /* - */
-        if((ipv6a[2] != 0x0) ||
-           (ipv6a[3] != 0x0) ||
-           (ipv6a[4] != 0x0) ||
-           (ipv6a[5] != 0x0) ||
-           (ipv6a[6] != 0x0) ||
-           (ipv6a[7] != 0x0))
-          return 1; /* fail */
-        /* - */
-        return 0;
-      ]])
-    ],[
-      AC_MSG_RESULT([yes])
-      tst_works_inet_pton="yes"
-    ],[
-      AC_MSG_RESULT([no])
-      tst_works_inet_pton="no"
-    ])
-  fi
-
-  if test "$tst_compi_inet_pton" = "yes" &&
-     test "$tst_works_inet_pton" != "no"; then
-    AC_MSG_CHECKING([if inet_pton usage allowed])
-    if test "x$curl_disallow_inet_pton" != "xyes"; then
-      AC_MSG_RESULT([yes])
-      tst_allow_inet_pton="yes"
-    else
-      AC_MSG_RESULT([no])
-      tst_allow_inet_pton="no"
-    fi
-  fi
-
-  AC_MSG_CHECKING([if inet_pton might be used])
-  if test "$tst_links_inet_pton" = "yes" &&
-     test "$tst_proto_inet_pton" = "yes" &&
-     test "$tst_compi_inet_pton" = "yes" &&
-     test "$tst_allow_inet_pton" = "yes" &&
-     test "$tst_works_inet_pton" != "no"; then
-    AC_MSG_RESULT([yes])
-    AC_DEFINE_UNQUOTED(HAVE_INET_PTON, 1,
-      [Define to 1 if you have an IPv6 capable working inet_pton function.])
-    curl_cv_func_inet_pton="yes"
-  else
-    AC_MSG_RESULT([no])
-    curl_cv_func_inet_pton="no"
-  fi
-])
-
-
 dnl CURL_CHECK_FUNC_IOCTL
 dnl -------------------------------------------------
 dnl Verify if ioctl is available, prototyped, and

diff --git a/scripts/checksrc.pl b/scripts/checksrc.pl
index 7ef3074b0cb74c28592ba865eec801d90cee2ea0..b1062308a473bfb18855198c60c4a3a83f166059 100755 (executable)
--- a/scripts/checksrc.pl
+++ b/scripts/checksrc.pl
@@ -88,6 +88,8 @@ my %banfunc = (
     "getaddrinfo" => 1,
     "gets" => 1,
     "gmtime" => 1,
+    "inet_ntop" => 1,
+    "inet_pton" => 1,
     "llseek" => 1,
     "LoadLibrary" => 1,
     "LoadLibraryA" => 1,

diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am
index a8a3b96e610bea0cdb91a738a09300ec32203f33..940ee4bfe81d13a187f738817feb0b369577af74 100644 (file)
--- a/tests/data/Makefile.am
+++ b/tests/data/Makefile.am
@@ -235,10 +235,10 @@ test1916 test1917 test1918 test1919 test1920 test1921 test1922 \
 \
 test1933 test1934 test1935 test1936 test1937 test1938 test1939 test1940 \
 test1941 test1942 test1943 test1944 test1945 test1946 test1947 test1948 \
-test1955 test1956 test1957 test1958 test1959 test1960 test1964 test1965 \
-test1966 test1967                   test1970 test1971 test1972 test1973 \
-test1974 test1975 test1976 test1977 test1978 test1979 test1980 test1981 \
-test1982 test1983 test1984 \
+test1955 test1956 test1957 test1958 test1959 test1960 test1961 \
+         test1964 test1965 test1966 test1967                   test1970 \
+test1971 test1972 test1973 test1974 test1975 test1976 test1977 test1978 \
+test1979 test1980 test1981 test1982 test1983 test1984 \
 \
 test2000 test2001 test2002 test2003 test2004 test2005 test2006 test2007 \
 test2008 test2009 test2010 test2011 test2012 test2013 test2014 test2015 \

diff --git a/tests/data/test1961 b/tests/data/test1961
new file mode 100644 (file)
index 0000000..0b44ca3
--- /dev/null
+++ b/tests/data/test1961
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="US-ASCII"?>
+<testcase>
+<info>
+<keywords>
+unittest
+</keywords>
+</info>
+
+# Client-side
+<client>
+<features>
+unittest
+</features>
+<name>
+curlx_inet_ntop() and curlx_inet_pton()
+</name>
+</client>
+</testcase>

diff --git a/tests/libtest/Makefile.inc b/tests/libtest/Makefile.inc
index bec648542b4f441e84d36dee6f3a100c71a63a69..64508d1285b8bc171aa7ae857f21aadf8ebadc1f 100644 (file)
--- a/tests/libtest/Makefile.inc
+++ b/tests/libtest/Makefile.inc
@@ -36,6 +36,8 @@ UTILS_H = testutil.h testtrace.h unitcheck.h
 CURLX_C = \
   ../../lib/curl_threads.c \
   ../../lib/curlx/fopen.c \
+  ../../lib/curlx/inet_ntop.c \
+  ../../lib/curlx/inet_pton.c \
   ../../lib/curlx/multibyte.c \
   ../../lib/curlx/strcopy.c \
   ../../lib/curlx/strerr.c \

diff --git a/tests/libtest/first.h b/tests/libtest/first.h
index fda2fd9f1ff443c33b3bf2780667e998a9f187fe..75ae75c6fb43e343245ad3002b7c69dd624dc6da 100644 (file)
--- a/tests/libtest/first.h
+++ b/tests/libtest/first.h
@@ -47,6 +47,8 @@ extern int unitfail; /* for unittests */
 #include "curlx/base64.h" /* for curlx_base64* */
 #include "curlx/dynbuf.h" /* for curlx_dyn_*() */
 #include "curlx/fopen.h" /* for curlx_f*() */
+#include "curlx/inet_ntop.h" /* for curlx_inet_ntop() */
+#include "curlx/inet_pton.h" /* for curlx_inet_pton() */
 #include "curlx/strcopy.h" /* for curlx_strcopy() */
 #include "curlx/strerr.h" /* for curlx_strerror() */
 #include "curlx/strparse.h" /* for curlx_str_* parsing functions */

diff --git a/tests/libtest/lib1960.c b/tests/libtest/lib1960.c
index fbb0f7e597a806a4553c08b5f3ab5afed90f6eb1..1cda44040a8586b02f9aef4cf64341b7357d639e 100644 (file)
--- a/tests/libtest/lib1960.c
+++ b/tests/libtest/lib1960.c
@@ -23,8 +23,6 @@
  ***************************************************************************/
 #include "first.h"
 
-#ifdef HAVE_INET_PTON
-
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
 #endif
@@ -62,12 +60,6 @@ static int sockopt_cb(void *clientp,
   return CURL_SOCKOPT_ALREADY_CONNECTED;
 }
 
-#ifdef __AMIGA__
-#define my_inet_pton(x, y, z) inet_pton(x, (unsigned char *)CURL_UNCONST(y), z)
-#else
-#define my_inet_pton(x, y, z) inet_pton(x, y, z)
-#endif
-
 /* Expected args: URL IP PORT */
 static CURLcode test_lib1960(const char *URL)
 {
@@ -104,8 +96,8 @@ static CURLcode test_lib1960(const char *URL)
   serv_addr.sin_family = AF_INET;
   serv_addr.sin_port = htons((unsigned short)port);
 
-  if(my_inet_pton(AF_INET, libtest_arg2, &serv_addr.sin_addr) <= 0) {
-    curl_mfprintf(stderr, "inet_pton failed\n");
+  if(curlx_inet_pton(AF_INET, libtest_arg2, &serv_addr.sin_addr) <= 0) {
+    curl_mfprintf(stderr, "curlx_inet_pton() failed\n");
     goto test_cleanup;
   }
 
@@ -143,11 +135,3 @@ test_cleanup:
 
   return result;
 }
-#else
-static CURLcode test_lib1960(const char *URL)
-{
-  (void)URL;
-  curl_mprintf("lacks inet_pton\n");
-  return CURLE_OK;
-}
-#endif

diff --git a/tests/server/dnsd.c b/tests/server/dnsd.c
index b9a50c120b271eb63a070a2b05e7f826132e8eef..ca89c9c0536e888795157e9208d2b77f25b7f798 100644 (file)
--- a/tests/server/dnsd.c
+++ b/tests/server/dnsd.c
@@ -493,10 +493,12 @@ create_resp(int qid, const struct sockaddr *addr, curl_socklen_t addrlen,
   case QTYPE_A:
     for(a = 0; a < ancount_a; a++) {
       const unsigned char *store = ipv4_pref;
+      const char *ip;
       if(add_answer(&resp->body, store, sizeof(ipv4_pref), QTYPE_A))
         goto error;
+      ip = curlx_inet_ntop(AF_INET, store, addrbuf, sizeof(addrbuf));
       logmsg("[%d] response A (%x) '%s'", qid, (unsigned int)QTYPE_A,
-             curlx_inet_ntop(AF_INET, store, addrbuf, sizeof(addrbuf)));
+             ip ? ip : "(null)");
     }
     if(!ancount_a)
       logmsg("[%d] response A empty", qid);
@@ -504,10 +506,12 @@ create_resp(int qid, const struct sockaddr *addr, curl_socklen_t addrlen,
   case QTYPE_AAAA:
     for(a = 0; a < ancount_aaaa; a++) {
       const unsigned char *store = ipv6_pref;
+      const char *ip;
       if(add_answer(&resp->body, store, sizeof(ipv6_pref), QTYPE_AAAA))
         goto error;
+      ip = curlx_inet_ntop(AF_INET6, store, addrbuf, sizeof(addrbuf));
       logmsg("[%d] response AAAA (%x) '%s'", qid, (unsigned int)QTYPE_AAAA,
-             curlx_inet_ntop(AF_INET6, store, addrbuf, sizeof(addrbuf)));
+             ip ? ip : "(null)");
     }
     if(!ancount_aaaa)
       logmsg("[%d] response AAAA empty", qid);

diff --git a/tests/unit/Makefile.inc b/tests/unit/Makefile.inc
index 18d97b051ccc60594b5c76290363e3d576eae0c4..d1fec804ee6abf7efb2a61a75c3331965ac664d4 100644 (file)
--- a/tests/unit/Makefile.inc
+++ b/tests/unit/Makefile.inc
@@ -43,7 +43,7 @@ TESTS_C = \
   unit1657.c unit1658.c            unit1660.c unit1661.c unit1663.c unit1664.c \
              unit1666.c unit1667.c unit1668.c unit1669.c \
   unit1674.c unit1675.c unit1676.c \
-  unit1979.c unit1980.c \
+  unit1961.c unit1979.c unit1980.c \
   unit2413.c \
   unit2600.c unit2601.c unit2602.c unit2603.c unit2604.c unit2605.c \
   unit3200.c                                             unit3205.c \

diff --git a/tests/unit/unit1961.c b/tests/unit/unit1961.c
new file mode 100644 (file)
index 0000000..1353862
--- /dev/null
+++ b/tests/unit/unit1961.c
@@ -0,0 +1,172 @@
+/***************************************************************************
+ *                                  _   _ ____  _
+ *  Project                     ___| | | |  _ \| |
+ *                             / __| | | | |_) | |
+ *                            | (__| |_| |  _ <| |___
+ *                             \___|\___/|_| \_\_____|
+ *
+ * Copyright (C) Daniel Stenberg, <daniel@haxx.se>, et al.
+ *
+ * This software is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution. The terms
+ * are also available at https://curl.se/docs/copyright.html.
+ *
+ * You may opt to use, copy, modify, merge, publish, distribute and/or sell
+ * copies of the Software, and permit persons to whom the Software is
+ * furnished to do so, under the terms of the COPYING file.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ * SPDX-License-Identifier: curl
+ *
+ ***************************************************************************/
+#include "unitcheck.h"
+
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifndef _WIN32
+#include <sys/socket.h>
+#endif
+#ifdef HAVE_ARPA_INET_H
+#include <arpa/inet.h>
+#endif
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+#ifdef HAVE_NETINET_IN6_H
+#include <netinet/in6.h>
+#endif
+
+/*
+ * If USE_IPV6 is disabled, we still want to parse IPv6 addresses, so make
+ * sure we have _some_ value for AF_INET6 without polluting our fake value
+ * everywhere.
+ */
+#if !defined(USE_IPV6) && !defined(AF_INET6)
+#define AF_INET6 (AF_INET + 1)
+#endif
+
+static int test_ntop(void)
+{
+  char ipv6res[sizeof("ffff:ffff:ffff:ffff:ffff:ffff:255.255.255.255")];
+  char ipv4res[sizeof("255.255.255.255")];
+  unsigned char ipv6a[26];
+  unsigned char ipv4a[5];
+  const char *ipv6ptr = 0;
+  const char *ipv4ptr = 0;
+
+  ipv4res[0] = '\0';
+  ipv4a[0] = 0xc0;
+  ipv4a[1] = 0xa8;
+  ipv4a[2] = 0x64;
+  ipv4a[3] = 0x01;
+  ipv4a[4] = 0x01;
+  ipv4ptr = curlx_inet_ntop(AF_INET, ipv4a, ipv4res, sizeof(ipv4res));
+  if(!ipv4ptr)
+    return 1; /* fail */
+  if(ipv4ptr != ipv4res)
+    return 1; /* fail */
+  if(!ipv4ptr[0])
+    return 1; /* fail */
+  if(memcmp(ipv4res, "192.168.100.1", 13))
+    return 1; /* fail */
+
+  ipv6res[0] = '\0';
+  memset(ipv6a, 0, sizeof(ipv6a));
+  ipv6a[0] = 0xfe;
+  ipv6a[1] = 0x80;
+  ipv6a[8] = 0x02;
+  ipv6a[9] = 0x14;
+  ipv6a[10] = 0x4f;
+  ipv6a[11] = 0xff;
+  ipv6a[12] = 0xfe;
+  ipv6a[13] = 0x0b;
+  ipv6a[14] = 0x76;
+  ipv6a[15] = 0xc8;
+  ipv6a[25] = 0x01;
+  ipv6ptr = curlx_inet_ntop(AF_INET6, ipv6a, ipv6res, sizeof(ipv6res));
+  if(!ipv6ptr)
+    return 1; /* fail */
+  if(ipv6ptr != ipv6res)
+    return 1; /* fail */
+  if(!ipv6ptr[0])
+    return 1; /* fail */
+  if(memcmp(ipv6res, "fe80::214:4fff:fe0b:76c8", 24))
+    return 1; /* fail */
+
+  /* verify working RFC 4291 zero prefixed IPv4 - mapped format */
+  memset(ipv6a, 0, sizeof(ipv6a));
+  ipv6a[12] = 0x7f;
+  ipv6a[13] = 0x0;
+  ipv6a[14] = 0x0;
+  ipv6a[15] = 0x01;
+  ipv6ptr = curlx_inet_ntop(AF_INET6, ipv6a, ipv6res, sizeof(ipv6res));
+  if(!ipv6ptr)
+    return 1; /* fail */
+  if(ipv6ptr != ipv6res)
+    return 1; /* fail */
+  if(!ipv6ptr[0])
+    return 1; /* fail */
+  if(memcmp(ipv6res, "::127.0.0.1", 11))
+    return 1; /* fail */
+
+  return 0;
+}
+
+static int test_pton(void)
+{
+  unsigned char ipv6a[16 + 1];
+  unsigned char ipv4a[4 + 1];
+  const char *ipv6src = "fe80::214:4fff:fe0b:76c8";
+  const char *ipv4src = "192.168.100.1";
+
+  memset(ipv4a, 1, sizeof(ipv4a));
+  if(curlx_inet_pton(AF_INET, ipv4src, ipv4a) != 1)
+    return 1; /* fail */
+
+  if((ipv4a[0] != 0xc0) ||
+     (ipv4a[1] != 0xa8) ||
+     (ipv4a[2] != 0x64) ||
+     (ipv4a[3] != 0x01) ||
+     (ipv4a[4] != 0x01))
+    return 1; /* fail */
+
+  memset(ipv6a, 1, sizeof(ipv6a));
+  if(curlx_inet_pton(AF_INET6, ipv6src, ipv6a) != 1)
+    return 1; /* fail */
+
+  if((ipv6a[0]  != 0xfe) ||
+     (ipv6a[1]  != 0x80) ||
+     (ipv6a[8]  != 0x02) ||
+     (ipv6a[9]  != 0x14) ||
+     (ipv6a[10] != 0x4f) ||
+     (ipv6a[11] != 0xff) ||
+     (ipv6a[12] != 0xfe) ||
+     (ipv6a[13] != 0x0b) ||
+     (ipv6a[14] != 0x76) ||
+     (ipv6a[15] != 0xc8) ||
+     (ipv6a[16] != 0x01))
+    return 1; /* fail */
+
+  if((ipv6a[2] != 0x0) ||
+     (ipv6a[3] != 0x0) ||
+     (ipv6a[4] != 0x0) ||
+     (ipv6a[5] != 0x0) ||
+     (ipv6a[6] != 0x0) ||
+     (ipv6a[7] != 0x0))
+    return 1; /* fail */
+
+  return 0;
+}
+
+static CURLcode test_unit1961(const char *arg)
+{
+  UNITTEST_BEGIN_SIMPLE
+
+  fail_if(test_ntop(), "curlx_inet_ntop()");
+  fail_if(test_pton(), "curlx_inet_pton()");
+
+  UNITTEST_END_SIMPLE
+}