test packet send/recv.

Author: devnexen

ext/sockets/sockets.c

@@ -1402,7 +1402,7 @@ PHP_FUNCTION(socket_bind)
 				struct sockaddr_ll *sa = (struct sockaddr_ll *) sock_type;
 				socklen_t sa_len = sizeof(sa);
 
-				if (getsockname(php_sock->bsd_socket, sock_type, &sa_len) < 0) {
+				if (getsockname(php_sock->bsd_socket, (struct sockaddr *)sa, &sa_len) < 0) {
 					zend_value_error("invalid AF_PACKET socket");
 					RETURN_THROWS();
 				}
@@ -1549,8 +1549,8 @@ PHP_FUNCTION(socket_recvfrom)
 #ifdef AF_PACKET
 	// ethernet header + payload
 	// possibly follow-up PR SOCK_DGRAM
-	if (php_sock->type == AF_PACKET && arg3 < 1514) {
-		zend_argument_value_error(3, "must be at least 1514 for AF_PACKET");
+	if (php_sock->type == AF_PACKET && arg3 < 60) {
+		zend_argument_value_error(3, "must be at least 60 for AF_PACKET");
 		RETURN_THROWS();
 	}
 #endif
@@ -1720,10 +1720,12 @@ PHP_FUNCTION(socket_recvfrom)
 					RETURN_THROWS();
 			}
 
+			zend_update_property(Z_OBJCE(obj), Z_OBJ(obj), ZEND_STRL("socket"), arg1);
 			zend_update_property_string(Z_OBJCE(obj), Z_OBJ(obj), ZEND_STRL("macsrc"), ether_ntoa((struct ether_addr *)e->h_source));
 			zend_update_property_string(Z_OBJCE(obj), Z_OBJ(obj), ZEND_STRL("macdst"), ether_ntoa((struct ether_addr *)e->h_dest));
 			zend_update_property_long(Z_OBJCE(obj), Z_OBJ(obj), ZEND_STRL("ethprotocol"), protocol);
 			zend_update_property(Z_OBJCE(obj), Z_OBJ(obj), ZEND_STRL("payload"), &zpayload);
+			// TODO fix leaks
 
 			ZEND_TRY_ASSIGN_REF_COPY(arg2, &obj);
 			ZEND_TRY_ASSIGN_REF_STRING(arg5, ifrname);

ext/sockets/tests/socket_afpacket.phpt

@@ -15,7 +15,7 @@ if (!function_exists("posix_getuid") || posix_getuid() != 0) {
 ?>
 --FILE--
 <?php
-    $s_c     = socket_create(AF_PACKET, SOCK_RAW, ETH_P_IP);
+    $s_c     = socket_create(AF_PACKET, SOCK_RAW, ETH_P_ALL);
     $s_bind  = socket_bind($s_c, 'lo');
     var_dump($s_bind);
 
@@ -27,16 +27,17 @@ if (!function_exists("posix_getuid") || posix_getuid() != 0) {
 
     socket_getpeername($s_c, $istr2, $iindex2);
 
-    $s_s     = socket_create(AF_PACKET, SOCK_RAW, ETH_P_ALL);
+    $s_s     = socket_create(AF_PACKET, SOCK_RAW, ETH_P_LOOP);
     $v_bind  = socket_bind($s_s, 'lo');
 
-    $buf = str_repeat("0", ETH_FRAME_LEN) .
-	   str_repeat("\xFF", 6) .
-	   str_repeat("\x11", 6) .
-	   "\x08\x00" .
-	   str_pad("TEST", 46, "\x00");
+    $buf = pack("H12H12n", "ffffffffffff", "000000000000", ETH_P_LOOP);
+    $buf .= str_repeat("A", 46);
 
     var_dump(socket_sendto($s_s, $buf, strlen($buf), 0, "lo", 1));
+    var_dump(socket_recvfrom($s_c, $rsp, strlen($buf), 0, $addr));
+
+    var_dump($addr);
+    var_dump($rsp);
 
     socket_close($s_c);
 ?>
@@ -47,4 +48,24 @@ string(2) "lo"
 int(%i)
 
 Warning: socket_getpeername(): unable to retrieve peer name [95]: %sot supported in %s on line %d
-int(1574)
+int(60)
+int(60)
+string(2) "lo"
+object(SocketEthernetInfo)#3 (4) {
+  ["socket"]=>
+  object(Socket)#1 (0) {
+  }
+  ["ethprotocol"]=>
+  int(%i)
+  ["macsrc"]=>
+  string(11) "0:0:0:0:0:0"
+  ["macdst"]=>
+  string(%d) "%s:%s:%s:%s:%s:%s"
+  ["payload"]=>
+  array(2) {
+    ["ipsrc"]=>
+    string(%d) "%d.%d.%d.%d"
+    ["ipdst"]=>
+    string(%d) "%d.%d.%d.%d"
+  }
+}