mirror of
https://github.com/curl/curl.git
synced 2026-08-25 06:33:32 +03:00
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: 8537a5b0bc #16577
Closes #22170
This commit is contained in:
Viktor Szakats
parent
a62e08c5eb
commit
39dec13ec0
22 changed files with 214 additions and 448 deletions
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue