adding ipv6 case, further fixes

Author: devnexen

ext/sockets/sockets.c

@@ -1714,7 +1714,6 @@ PHP_FUNCTION(socket_recvfrom)
 					zend_update_property_string(Z_OBJCE(zpayload), Z_OBJ(zpayload), ZEND_STRL("dstAddr"), inet_ntoa(d));
 					zend_update_property_long(Z_OBJCE(zpayload), Z_OBJ(zpayload), ZEND_STRL("headerSize"), totalip);
 					zend_update_property_string(Z_OBJCE(zpayload), Z_OBJ(zpayload), ZEND_STRL("rawPacket"), (char *)payload);
-					zend_update_property(Z_OBJCE(zpayload), Z_OBJ(zpayload), ZEND_STRL("socket"), arg1);
 
 					switch (ip->protocol) {
 						case IPPROTO_TCP: {
@@ -1771,7 +1770,7 @@ PHP_FUNCTION(socket_recvfrom)
 					zend_update_property_string(Z_OBJCE(zpayload), Z_OBJ(zpayload), ZEND_STRL("srcAddr"), s);
 					zend_update_property_string(Z_OBJCE(zpayload), Z_OBJ(zpayload), ZEND_STRL("dstAddr"), d);
 					zend_update_property_long(Z_OBJCE(zpayload), Z_OBJ(zpayload), ZEND_STRL("headerSize"), totalip);
-					zend_update_property(Z_OBJCE(zpayload), Z_OBJ(zpayload), ZEND_STRL("socket"), arg1);
+					zend_update_property_string(Z_OBJCE(zpayload), Z_OBJ(zpayload), ZEND_STRL("rawPacket"), (char *)payload);
 					// TODO completing
 					break;
 				}

ext/sockets/sockets.stub.php

@@ -2185,7 +2185,7 @@ final class EthernetPacket extends Packet
 	public int $ethProtocol;
 	public string $srcMac;
 	public string $dstMac;
-	public ?object $payload;
+	public ?Packet $payload;
     }
 
     final class TcpPacket extends Packet
@@ -2204,7 +2204,7 @@ final class Ipv4Packet extends Packet
     {
 	public string $srcAddr;
 	public string $dstAddr;
-	public ?object $payload;
+	public ?Packet $payload;
     }
 
     final class Ipv6Packet extends Packet

ext/sockets/sockets_arginfo.h

@@ -72,7 +72,7 @@ if (!function_exists("posix_getuid") || posix_getuid() != 0) {
 	    "7f000001" .
 	    "7f000001"
     );
-    $p = str_repeat("A", 20);  // Total payload 20 + 20 = 40 bytes
+    $p = str_repeat("A", 20);
 
     $buf = pack("H12H12n", "ffffffffffff", "000000000000", ETH_P_IP);
     $buf .= $ip . $p;
@@ -85,6 +85,36 @@ if (!function_exists("posix_getuid") || posix_getuid() != 0) {
 
     var_dump($addr);
     var_dump($rsp);
+
+    socket_close($s_s);
+    socket_close($s_c);
+
+    $s_c     = socket_create(AF_PACKET, SOCK_RAW, ETH_P_IPV6);
+    $s_bind  = socket_bind($s_c, 'lo');
+    $s_s     = socket_create(AF_PACKET, SOCK_RAW, ETH_P_IPV6);
+    $v_bind  = socket_bind($s_s, 'lo');
+
+    $ip = hex2bin(
+	    "60000000" .
+	    "0014" .
+	    "3A" .
+	    "40" .
+	    "00000000000000000000000000000001" .
+	    "00000000000000000000000000000001"
+    );
+
+    $payload = str_repeat("A", 20);
+
+    $buf = pack("H12H12n", "ffffffffffff", "000000000000", ETH_P_IPV6);
+    $buf .= $ip . $payload;
+
+    $buf .= str_repeat("\x00", max(0, 60 - strlen($buf)));
+
+    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);
 ?>
 --EXPECTF--
 bool(true)
@@ -118,8 +148,6 @@ object(Socket\EthernetPacket)#3 (%d) {
 int(60)
 unsupported ethernet protocol
 int(60)
-
-Deprecated: Creation of dynamic property Socket\Ipv4Packet::$socket is deprecated in %s on line %d
 int(%d)
 string(2) "lo"
 object(Socket\EthernetPacket)#2 (7) {
@@ -137,7 +165,7 @@ object(Socket\EthernetPacket)#2 (7) {
   ["dstMac"]=>
   string(%d) "%s:%s:%s:%s:%s:%s"
   ["payload"]=>
-  object(Socket\Ipv4Packet)#10 (6) {
+  object(Socket\Ipv4Packet)#10 (5) {
     ["headerSize"]=>
     int(%d)
     ["rawPacket"]=>
@@ -157,8 +185,34 @@ object(Socket\EthernetPacket)#2 (7) {
       ["dstPort"]=>
       int(%d)
     }
-    ["socket"]=>
-    object(Socket)#8 (0) {
-    }
+  }
+}
+int(74)
+int(74)
+string(2) "lo"
+object(Socket\EthernetPacket)#9 (7) {
+  ["headerSize"]=>
+  int(14)
+  ["rawPacket"]=>
+  string(%d) "%A"
+  ["socket"]=>
+  object(Socket)#3 (0) {
+  }
+  ["ethProtocol"]=>
+  int(%d)
+  ["srcMac"]=>
+  string(%d) "%s:%s:%s:%s:%s:%s"
+  ["dstMac"]=>
+  string(17) "%s:%s:%s:%s:%s:%s"
+  ["payload"]=>
+  object(Socket\Ipv6Packet)#1 (4) {
+    ["headerSize"]=>
+    int(5160)
+    ["rawPacket"]=>
+    string(%d) "%s"
+    ["srcAddr"]=>
+    string(%d) "%s"
+    ["dstAddr"]=>
+    string(%d) "%s"
   }
 }