adding more tests

Author: devnexen

ext/sockets/config.m4

@@ -5,7 +5,7 @@ PHP_ARG_ENABLE([sockets],
 
 if test "$PHP_SOCKETS" != "no"; then
   AC_CHECK_FUNCS([hstrerror if_nametoindex if_indextoname sockatmark])
-  AC_CHECK_HEADERS([sys/sockio.h linux/filter.h linux/if_packet.h linux/if_ether.h linux/udp.h netinet/ether.h])
+  AC_CHECK_HEADERS([sys/sockio.h linux/filter.h linux/if_packet.h linux/if_ether.h netinet/ether.h])
   AC_DEFINE([HAVE_SOCKETS], [1],
     [Define to 1 if the PHP extension 'sockets' is available.])
 

ext/sockets/sockets.c

@@ -76,9 +76,6 @@
 # if defined(HAVE_LINUX_IF_ETHER_H)
 #  include <linux/if_ether.h>
 # endif
-# if defined(HAVE_LINUX_UDP_H)
-#  include <linux/udp.h>
-# endif
 #endif
 
 #include <stddef.h>

ext/sockets/tests/socket_afpacket_error.phpt

@@ -0,0 +1,65 @@
+--TEST--
+AF_PACKET sockets handling errors
+--EXTENSIONS--
+sockets
+posix
+--SKIPIF--
+<?php
+
+if (!defined("AF_PACKET")) {
+    die('SKIP AF_PACKET not supported on this platform.');
+}
+if (!function_exists("posix_getuid") || posix_getuid() != 0) {
+    die('SKIP AF_PACKET requires root permissions.');
+}
+?>
+--FILE--
+<?php
+    $s_c     = socket_create(AF_PACKET, SOCK_RAW, ETH_P_ALL);
+    $s_bind  = socket_bind($s_c, 'lo');
+
+    $s_s     = socket_create(AF_PACKET, SOCK_RAW, ETH_P_ALL);
+    $v_bind  = socket_bind($s_s, 'lo');
+
+    $payload = random_bytes(1024);
+    $payload .= str_repeat("A", 46);
+
+    $buf = pack("H12H12n", "ffffffffffff", "000000000000", 0x0806);
+    $buf .= $payload;
+
+    var_dump(socket_sendto($s_s, $buf, strlen($buf), 0, "lo", 1));
+
+    try {
+    	socket_recvfrom($s_c, $rsp, strlen($buf), 0, $addr);
+    } catch (\ValueError $e) {
+	echo $e->getMessage(), PHP_EOL;
+    }
+
+    socket_close($s_s);
+    socket_close($s_c);
+
+    $s_c     = socket_create(AF_PACKET, SOCK_RAW, ETH_P_ALL);
+    $s_bind  = socket_bind($s_c, 'lo');
+
+    $s_s     = socket_create(AF_PACKET, SOCK_RAW, ETH_P_ALL);
+    $v_bind  = socket_bind($s_s, 'lo');
+
+    $buf = pack("H12H12n", "ffffffffffff", "000000000000", ETH_P_IP);
+    $buf .= str_repeat("A", 46);
+
+    var_dump(socket_sendto($s_s, $buf, strlen($buf), 0, "lo", 1));
+
+    try {
+    	socket_recvfrom($s_c, $rsp, strlen($buf), 0, $addr);
+    } catch (\ValueError $e) {
+	echo $e->getMessage(), PHP_EOL;
+    }
+
+    socket_close($s_s);
+    socket_close($s_c);
+?>
+--EXPECTF--
+int(1084)
+unsupported ethernet protocol
+int(60)
+invalid transport header length