From 2888e46bfa3fa0b7d7e4622b5eadcd250304af2f Mon Sep 17 00:00:00 2001 From: Damjan Cvetko Date: Mon, 10 Jun 2013 12:11:14 +0200 Subject: [PATCH 1/3] Implements feature Bug #63472 ability to set SO_BINDTODEVICE on socket. --- ext/sockets/sockets.c | 15 ++++++++ .../tests/socket_set_option_bindtodevice.phpt | 37 +++++++++++++++++++ 2 files changed, 52 insertions(+) create mode 100644 ext/sockets/tests/socket_set_option_bindtodevice.phpt diff --git a/ext/sockets/sockets.c b/ext/sockets/sockets.c index 9b519b22887a8..10375ab850402 100644 --- a/ext/sockets/sockets.c +++ b/ext/sockets/sockets.c @@ -679,6 +679,9 @@ static PHP_MINIT_FUNCTION(sockets) REGISTER_LONG_CONSTANT("SO_FAMILY", SO_FAMILY, CONST_CS | CONST_PERSISTENT); #endif REGISTER_LONG_CONSTANT("SO_ERROR", SO_ERROR, CONST_CS | CONST_PERSISTENT); +#ifdef SO_BINDTODEVICE + REGISTER_LONG_CONSTANT("SO_BINDTODEVICE", SO_BINDTODEVICE, CONST_CS | CONST_PERSISTENT); +#endif REGISTER_LONG_CONSTANT("SOL_SOCKET", SOL_SOCKET, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("SOMAXCONN", SOMAXCONN, CONST_CS | CONST_PERSISTENT); #ifdef TCP_NODELAY @@ -2038,6 +2041,18 @@ PHP_FUNCTION(socket_set_option) #endif break; } +#ifdef SO_BINDTODEVICE + case SO_BINDTODEVICE: { + if (Z_TYPE_PP(arg4) == IS_STRING) { + opt_ptr = Z_STRVAL_PP(arg4); + optlen = Z_STRLEN_PP(arg4); + } else { + opt_ptr = ""; + optlen = 0; + } + break; + } +#endif default: default_case: diff --git a/ext/sockets/tests/socket_set_option_bindtodevice.phpt b/ext/sockets/tests/socket_set_option_bindtodevice.phpt new file mode 100644 index 0000000000000..7784fb3aeb3d3 --- /dev/null +++ b/ext/sockets/tests/socket_set_option_bindtodevice.phpt @@ -0,0 +1,37 @@ +--TEST-- +Test if socket_set_option() works, option:SO_BINDTODEVICE +--DESCRIPTION-- +-Bind to loopback 'lo' device (should exist) +-Bind to unexisting device +--SKIPIF-- + +--FILE-- + + +--EXPECTF-- +bool(true) + +Warning: socket_set_option(): unable to set socket option [19]: No such device in /root/zobo/php-sockets/php-src/ext/sockets/tests/socket_set_option_bindtodevice.php on line 10 +bool(false) +--CREDITS-- +Damjan Cvetko, foreach.org From 28bb506c879b12f3809a857f607f33f70f611b9a Mon Sep 17 00:00:00 2001 From: Damjan Cvetko Date: Mon, 17 Jun 2013 10:45:07 +0300 Subject: [PATCH 2/3] Use wildcards for warning message. --- ext/sockets/tests/socket_set_option_bindtodevice.phpt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ext/sockets/tests/socket_set_option_bindtodevice.phpt b/ext/sockets/tests/socket_set_option_bindtodevice.phpt index 7784fb3aeb3d3..49ea6ba40b7e2 100644 --- a/ext/sockets/tests/socket_set_option_bindtodevice.phpt +++ b/ext/sockets/tests/socket_set_option_bindtodevice.phpt @@ -31,7 +31,7 @@ socket_close($socket); --EXPECTF-- bool(true) -Warning: socket_set_option(): unable to set socket option [19]: No such device in /root/zobo/php-sockets/php-src/ext/sockets/tests/socket_set_option_bindtodevice.php on line 10 +Warning: socket_set_option(): unable to set socket option [19]: No such device in %s on line %d bool(false) --CREDITS-- Damjan Cvetko, foreach.org From d6a44036746433a12d907cb2a8a3a989dcd7b83e Mon Sep 17 00:00:00 2001 From: Damjan Cvetko Date: Mon, 17 Jun 2013 10:53:07 +0300 Subject: [PATCH 3/3] Skip test if we are not root. --- ext/sockets/tests/socket_set_option_bindtodevice.phpt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ext/sockets/tests/socket_set_option_bindtodevice.phpt b/ext/sockets/tests/socket_set_option_bindtodevice.phpt index 49ea6ba40b7e2..05d718ce63fef 100644 --- a/ext/sockets/tests/socket_set_option_bindtodevice.phpt +++ b/ext/sockets/tests/socket_set_option_bindtodevice.phpt @@ -11,6 +11,9 @@ if (!extension_loaded('sockets')) { if (!defined("SO_BINDTODEVICE")) { die('SKIP SO_BINDTODEVICE not supported on this platform.'); } +if (!function_exists("posix_getuid") || posix_getuid() != 0) { + die('SKIP SO_BINDTODEVICE requires root permissions.'); +} ?> --FILE--