Skip to content

Commit e630aac

Browse files
jorgsowajorgsowa
authored
Remove HAVE_INET_PTON (#13410)
1 parent f5efaa3 commit e630aac

22 files changed

+60
-130
lines changed

‎Zend/Optimizer/zend_func_infos.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -517,9 +517,7 @@ static const func_info_t func_infos[] = {
517517
F1("sha1", MAY_BE_STRING),
518518
F1("sha1_file", MAY_BE_STRING|MAY_BE_FALSE),
519519
F1("inet_ntop", MAY_BE_STRING|MAY_BE_FALSE),
520-
#if defined(HAVE_INET_PTON)
521520
F1("inet_pton", MAY_BE_STRING|MAY_BE_FALSE),
522-
#endif
523521
F1("metaphone", MAY_BE_STRING),
524522
F1("headers_list", MAY_BE_ARRAY|MAY_BE_ARRAY_KEY_LONG|MAY_BE_ARRAY_OF_STRING),
525523
F1("htmlspecialchars", MAY_BE_STRING),

‎configure.ac

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -601,7 +601,6 @@ getgrnam_r \
601601
getpwuid_r \
602602
getwd \
603603
glob \
604-
inet_pton \
605604
localtime_r \
606605
lchown \
607606
memcntl \
@@ -638,10 +637,8 @@ memrchr \
638637
mempcpy \
639638
)
640639

641-
AC_CHECK_FUNC(inet_ntop,[],[
642-
AC_MSG_ERROR([Cannot find inet_ntop which is required])
643-
]
644-
)
640+
AC_CHECK_FUNC([inet_ntop],,[AC_MSG_ERROR([Required inet_ntop not found.])])
641+
AC_CHECK_FUNC([inet_pton],,[AC_MSG_ERROR([Required inet_pton not found.])])
645642

646643
dnl Check for strerror_r, and if its a POSIX-compatible or a GNU specific version.
647644
AC_FUNC_STRERROR_R

‎ext/ftp/ftp.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1704,7 +1704,7 @@ ftp_getdata(ftpbuf_t *ftp)
17041704

17051705
data->listener = fd;
17061706

1707-
#if defined(HAVE_IPV6)
1707+
#ifdef HAVE_IPV6
17081708
if (sa->sa_family == AF_INET6) {
17091709
/* need to use EPRT */
17101710
char eprtarg[INET6_ADDRSTRLEN + sizeof("|x||xxxxx|")];

‎ext/openssl/xp_ssl.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@
130130
#define PHP_X509_NAME_ENTRY_TO_UTF8(ne, i, out) \
131131
ASN1_STRING_to_UTF8(&out, X509_NAME_ENTRY_get_data(X509_NAME_get_entry(ne, i)))
132132

133-
#if defined(HAVE_IPV6) && defined(HAVE_INET_PTON)
133+
#ifdef HAVE_IPV6
134134
/* Used for IPv6 Address peer verification */
135135
#define EXPAND_IPV6_ADDRESS(_str, _bytes) \
136136
do { \

‎ext/sockets/conversions.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -514,7 +514,7 @@ static void to_zval_read_sa_family(const char *data, zval *zv, res_context *ctx)
514514

515515
ZVAL_LONG(zv, (zend_long)ival);
516516
}
517-
#if HAVE_IPV6
517+
#ifdef HAVE_IPV6
518518
static void to_zval_read_unsigned(const char *data, zval *zv, res_context *ctx)
519519
{
520520
unsigned ival;
@@ -597,7 +597,7 @@ static void to_zval_read_sockaddr_in(const char *data, zval *zv, res_context *ct
597597
{
598598
to_zval_read_aggregation(data, zv, descriptors_sockaddr_in, ctx);
599599
}
600-
#if HAVE_IPV6
600+
#ifdef HAVE_IPV6
601601
static void from_zval_write_sin6_addr(const zval *zaddr_str, char *addr6, ser_context *ctx)
602602
{
603603
int res;
@@ -753,7 +753,7 @@ static void from_zval_write_sockaddr_aux(const zval *container,
753753
}
754754
break;
755755

756-
#if HAVE_IPV6
756+
#ifdef HAVE_IPV6
757757
case AF_INET6:
758758
if (ctx->sock->type != AF_INET6) {
759759
do_from_zval_err(ctx, "the specified family (AF_INET6) is not "
@@ -817,7 +817,7 @@ static void to_zval_read_sockaddr_aux(const char *sockaddr_c, zval *zv, res_cont
817817
to_zval_read_sockaddr_in(sockaddr_c, zv, ctx);
818818
break;
819819

820-
#if HAVE_IPV6
820+
#ifdef HAVE_IPV6
821821
case AF_INET6:
822822
to_zval_read_sockaddr_in6(sockaddr_c, zv, ctx);
823823
break;

‎ext/sockets/multicast.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -475,7 +475,7 @@ static int _php_mcast_join_leave(
475475
join ? IP_ADD_MEMBERSHIP : IP_DROP_MEMBERSHIP, (char*)&mreq,
476476
sizeof(mreq));
477477
}
478-
#if HAVE_IPV6
478+
#ifdef HAVE_IPV6
479479
else if (sock->type == AF_INET6) {
480480
struct ipv6_mreq mreq;
481481
memset(&mreq, 0, sizeof(struct ipv6_mreq));
@@ -543,7 +543,7 @@ static int _php_mcast_source_op(
543543
return setsockopt(sock->bsd_socket, level,
544544
_php_source_op_to_ipv4_op(sop), (char*)&mreqs, sizeof(mreqs));
545545
}
546-
#if HAVE_IPV6
546+
#ifdef HAVE_IPV6
547547
else if (sock->type == AF_INET6) {
548548
php_error_docref(NULL, E_WARNING,
549549
"This platform does not support %s for IPv6 sockets",

‎ext/sockets/sendrecvmsg.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,7 @@ PHP_FUNCTION(socket_cmsg_space)
326326
RETURN_LONG((zend_long)CMSG_SPACE(entry->size + n * entry->var_el_size));
327327
}
328328

329-
#if HAVE_IPV6
329+
#ifdef HAVE_IPV6
330330
int php_do_setsockopt_ipv6_rfc3542(php_socket *php_sock, int level, int optname, zval *arg4)
331331
{
332332
struct err_s err = {0};

‎ext/sockets/sockaddr_conv.c

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
extern zend_result php_string_to_if_index(const char *val, unsigned *out);
1313

14-
#if HAVE_IPV6
14+
#ifdef HAVE_IPV6
1515
/* Sets addr by hostname, or by ip in string form (AF_INET6) */
1616
int php_set_inet6_addr(struct sockaddr_in6 *sin6, char *string, php_socket *php_sock) /* {{{ */
1717
{
@@ -89,11 +89,7 @@ int php_set_inet_addr(struct sockaddr_in *sin, char *string, php_socket *php_soc
8989
struct in_addr tmp;
9090
struct hostent *host_entry;
9191

92-
#ifdef HAVE_INET_PTON
9392
if (inet_pton(AF_INET, string, &tmp)) {
94-
#else
95-
if (inet_aton(string, &tmp)) {
96-
#endif
9793
sin->sin_addr.s_addr = tmp.s_addr;
9894
} else {
9995
if (strlen(string) > MAXFQDNLEN || ! (host_entry = php_network_gethostbyname(string))) {
@@ -129,7 +125,7 @@ int php_set_inet46_addr(php_sockaddr_storage *ss, socklen_t *ss_len, char *strin
129125
return 1;
130126
}
131127
}
132-
#if HAVE_IPV6
128+
#ifdef HAVE_IPV6
133129
else if (php_sock->type == AF_INET6) {
134130
struct sockaddr_in6 t = {0};
135131
if (php_set_inet6_addr(&t, string, php_sock)) {

‎ext/sockets/sockets.c

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -920,7 +920,7 @@ PHP_FUNCTION(socket_getsockname)
920920
php_socket *php_sock;
921921
struct sockaddr *sa;
922922
struct sockaddr_in *sin;
923-
#if HAVE_IPV6
923+
#ifdef HAVE_IPV6
924924
struct sockaddr_in6 *sin6;
925925
#endif
926926
char addrbuf[INET6_ADDRSTRLEN];
@@ -943,7 +943,7 @@ PHP_FUNCTION(socket_getsockname)
943943
}
944944

945945
switch (sa->sa_family) {
946-
#if HAVE_IPV6
946+
#ifdef HAVE_IPV6
947947
case AF_INET6:
948948
sin6 = (struct sockaddr_in6 *) sa;
949949
inet_ntop(AF_INET6, &sin6->sin6_addr, addrbuf, sizeof(addrbuf));
@@ -988,7 +988,7 @@ PHP_FUNCTION(socket_getpeername)
988988
php_socket *php_sock;
989989
struct sockaddr *sa;
990990
struct sockaddr_in *sin;
991-
#if HAVE_IPV6
991+
#ifdef HAVE_IPV6
992992
struct sockaddr_in6 *sin6;
993993
#endif
994994
char addrbuf[INET6_ADDRSTRLEN];
@@ -1011,7 +1011,7 @@ PHP_FUNCTION(socket_getpeername)
10111011
}
10121012

10131013
switch (sa->sa_family) {
1014-
#if HAVE_IPV6
1014+
#ifdef HAVE_IPV6
10151015
case AF_INET6:
10161016
sin6 = (struct sockaddr_in6 *) sa;
10171017
inet_ntop(AF_INET6, &sin6->sin6_addr, addrbuf, sizeof(addrbuf));
@@ -1062,7 +1062,7 @@ PHP_FUNCTION(socket_create)
10621062
}
10631063

10641064
if (domain != AF_UNIX
1065-
#if HAVE_IPV6
1065+
#ifdef HAVE_IPV6
10661066
&& domain != AF_INET6
10671067
#endif
10681068
&& domain != AF_INET) {
@@ -1113,7 +1113,7 @@ PHP_FUNCTION(socket_connect)
11131113
ENSURE_SOCKET_VALID(php_sock);
11141114

11151115
switch(php_sock->type) {
1116-
#if HAVE_IPV6
1116+
#ifdef HAVE_IPV6
11171117
case AF_INET6: {
11181118
struct sockaddr_in6 sin6 = {0};
11191119

@@ -1247,7 +1247,7 @@ PHP_FUNCTION(socket_bind)
12471247
retval = bind(php_sock->bsd_socket, (struct sockaddr *)sa, sizeof(struct sockaddr_in));
12481248
break;
12491249
}
1250-
#if HAVE_IPV6
1250+
#ifdef HAVE_IPV6
12511251
case AF_INET6:
12521252
{
12531253
struct sockaddr_in6 *sa = (struct sockaddr_in6 *) sock_type;
@@ -1357,7 +1357,7 @@ PHP_FUNCTION(socket_recvfrom)
13571357
php_socket *php_sock;
13581358
struct sockaddr_un s_un;
13591359
struct sockaddr_in sin;
1360-
#if HAVE_IPV6
1360+
#ifdef HAVE_IPV6
13611361
struct sockaddr_in6 sin6;
13621362
#endif
13631363
char addrbuf[INET6_ADDRSTRLEN];
@@ -1428,7 +1428,7 @@ PHP_FUNCTION(socket_recvfrom)
14281428
ZEND_TRY_ASSIGN_REF_STRING(arg5, address ? address : "0.0.0.0");
14291429
ZEND_TRY_ASSIGN_REF_LONG(arg6, ntohs(sin.sin_port));
14301430
break;
1431-
#if HAVE_IPV6
1431+
#ifdef HAVE_IPV6
14321432
case AF_INET6:
14331433
slen = sizeof(sin6);
14341434
memset(&sin6, 0, slen);
@@ -1473,7 +1473,7 @@ PHP_FUNCTION(socket_sendto)
14731473
php_socket *php_sock;
14741474
struct sockaddr_un s_un;
14751475
struct sockaddr_in sin;
1476-
#if HAVE_IPV6
1476+
#ifdef HAVE_IPV6
14771477
struct sockaddr_in6 sin6;
14781478
#endif
14791479
int retval;
@@ -1519,7 +1519,7 @@ PHP_FUNCTION(socket_sendto)
15191519

15201520
retval = sendto(php_sock->bsd_socket, buf, ((size_t)len > buf_len) ? buf_len : (size_t)len, flags, (struct sockaddr *) &sin, sizeof(sin));
15211521
break;
1522-
#if HAVE_IPV6
1522+
#ifdef HAVE_IPV6
15231523
case AF_INET6:
15241524
if (port_is_null) {
15251525
zend_argument_value_error(6, "cannot be null when the socket type is AF_INET6");
@@ -1590,7 +1590,7 @@ PHP_FUNCTION(socket_get_option)
15901590
}
15911591
}
15921592
}
1593-
#if HAVE_IPV6
1593+
#ifdef HAVE_IPV6
15941594
else if (level == IPPROTO_IPV6) {
15951595
int ret = php_do_getsockopt_ipv6_rfc3542(php_sock, level, optname, return_value);
15961596
if (ret == SUCCESS) {
@@ -1795,7 +1795,7 @@ PHP_FUNCTION(socket_set_option)
17951795
HANDLE_SUBCALL(res);
17961796
}
17971797

1798-
#if HAVE_IPV6
1798+
#ifdef HAVE_IPV6
17991799
else if (level == IPPROTO_IPV6) {
18001800
int res = php_do_setsockopt_ipv6_mcast(php_sock, level, optname, arg4);
18011801
if (res == 1) {
@@ -1999,7 +1999,7 @@ PHP_FUNCTION(socket_create_pair)
19991999
}
20002000

20012001
if (domain != AF_INET
2002-
#if HAVE_IPV6
2002+
#ifdef HAVE_IPV6
20032003
&& domain != AF_INET6
20042004
#endif
20052005
&& domain != AF_UNIX) {
@@ -2258,7 +2258,7 @@ PHP_FUNCTION(socket_export_stream)
22582258
/* Determine if socket is using a protocol with one of the default registered
22592259
* socket stream wrappers */
22602260
if (socket->type == PF_INET
2261-
#if HAVE_IPV6
2261+
#ifdef HAVE_IPV6
22622262
|| socket->type == PF_INET6
22632263
#endif
22642264
) {
@@ -2435,7 +2435,7 @@ PHP_FUNCTION(socket_addrinfo_bind)
24352435
}
24362436

24372437
case AF_INET:
2438-
#if HAVE_IPV6
2438+
#ifdef HAVE_IPV6
24392439
case AF_INET6:
24402440
#endif
24412441
{
@@ -2498,7 +2498,7 @@ PHP_FUNCTION(socket_addrinfo_connect)
24982498
}
24992499

25002500
case AF_INET:
2501-
#if HAVE_IPV6
2501+
#ifdef HAVE_IPV6
25022502
case AF_INET6:
25032503
#endif
25042504
{
@@ -2555,7 +2555,7 @@ PHP_FUNCTION(socket_addrinfo_explain)
25552555
add_assoc_string(&sockaddr, "sin_addr", addr);
25562556
break;
25572557
}
2558-
#if HAVE_IPV6
2558+
#ifdef HAVE_IPV6
25592559
case AF_INET6:
25602560
{
25612561
struct sockaddr_in6 *sa = (struct sockaddr_in6 *) ai->addrinfo.ai_addr;

‎ext/sockets/sockets.stub.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
* @cvalue AF_INET
1313
*/
1414
const AF_INET = UNKNOWN;
15-
#if HAVE_IPV6
15+
#ifdef HAVE_IPV6
1616
/**
1717
* @var int
1818
* @cvalue AF_INET6
@@ -649,7 +649,7 @@
649649
*/
650650
const IP_BIND_ADDRESS_NO_PORT = UNKNOWN;
651651
#endif
652-
#if HAVE_IPV6
652+
#ifdef HAVE_IPV6
653653
/**
654654
* @var int
655655
* @cvalue IPV6_MULTICAST_IF
@@ -1542,7 +1542,7 @@
15421542
* @cvalue IPPROTO_IP
15431543
*/
15441544
const IPPROTO_IP = UNKNOWN;
1545-
#if HAVE_IPV6
1545+
#ifdef HAVE_IPV6
15461546
/**
15471547
* @var int
15481548
* @cvalue IPPROTO_IPV6
@@ -1568,7 +1568,7 @@
15681568
const SOL_UDPLITE = UNKNOWN;
15691569
#endif
15701570

1571-
#if HAVE_IPV6
1571+
#ifdef HAVE_IPV6
15721572
/**
15731573
* @var int
15741574
* @cvalue IPV6_UNICAST_HOPS

‎ext/sockets/sockets_arginfo.h

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)