From cf003e78bec78dc70241eed4ff910d2fa8d2d07a Mon Sep 17 00:00:00 2001 From: David Carlier Date: Mon, 20 Jan 2025 16:23:48 +0000 Subject: [PATCH] changes from review --- ext/sockets/sockets.c | 17 ++++++++--------- ext/sockets/tests/socket_afpacket.phpt | 3 ++- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/ext/sockets/sockets.c b/ext/sockets/sockets.c index 5c842966be88f..610dadeaf34d9 100644 --- a/ext/sockets/sockets.c +++ b/ext/sockets/sockets.c @@ -98,14 +98,13 @@ ZEND_DECLARE_MODULE_GLOBALS(sockets) #endif #if defined(ETH_P_ALL) -#define PHP_ETH_PROTO_CHECK(protocol, family) \ - do { \ - /* We ll let EINVAL errno warning about miusage, too many protocols conflicts but AF_PACKET family works only with ETH_P_* constants */ \ - if ((protocol >= ETH_P_LOOP && protocol <= USHRT_MAX) && family == AF_PACKET) { \ - protocol = htons(protocol); \ - } \ - } \ - while (0) +#define PHP_ETH_PROTO_CHECK(protocol, family) \ + do { \ + /* We ll let EINVAL errno warning about miusage, too many protocols conflicts */ \ + if (protocol <= USHRT_MAX && family == AF_PACKET) { \ + protocol = htons(protocol); \ + } \ + } while (0) #else #define PHP_ETH_PROTO_CHECK(protocol, family) (0) #endif @@ -1180,7 +1179,7 @@ PHP_FUNCTION(socket_create) RETURN_THROWS(); } - PHP_ETH_PROTO_CHECK(protocol, protocol); + PHP_ETH_PROTO_CHECK(protocol, domain); object_init_ex(return_value, socket_ce); php_sock = Z_SOCKET_P(return_value); diff --git a/ext/sockets/tests/socket_afpacket.phpt b/ext/sockets/tests/socket_afpacket.phpt index 50796aad419c8..d0de69f7b1a19 100644 --- a/ext/sockets/tests/socket_afpacket.phpt +++ b/ext/sockets/tests/socket_afpacket.phpt @@ -2,6 +2,7 @@ socket_getsockname from AF_PACKET socket --EXTENSIONS-- sockets +posix --SKIPIF--