romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-08-03 15:01:21 +03:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
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 2026-06-25 12:48:26 +02:00
parent a62e08c5eb
commit 39dec13ec0
No known key found for this signature in database
22 changed files with 214 additions and 448 deletions
Download patch file Download diff file Expand all files Collapse all files

8
tests/data/Makefile.am
View file

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

18
tests/data/test1961 Normal file
View file

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

2
tests/libtest/Makefile.inc
View file

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

2
tests/libtest/first.h
View file

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

20
tests/libtest/lib1960.c
View file

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

8
tests/server/dnsd.c
View file

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

2
tests/unit/Makefile.inc
View file

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

172
tests/unit/unit1961.c Normal file
View file

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