improve ipv6 part, update test

Author: devnexen

ext/sockets/sockets.c

@@ -1766,12 +1766,56 @@ PHP_FUNCTION(socket_recvfrom)
 					char s[INET6_ADDRSTRLEN], d[INET6_ADDRSTRLEN];
 					inet_ntop(AF_INET6, &ip->saddr, s, sizeof(s));
 					inet_ntop(AF_INET6, &ip->daddr, d, sizeof(d));
+					zval szpayload;
 					object_init_ex(&zpayload, ipv6packet_ce);
 					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_string(Z_OBJCE(zpayload), Z_OBJ(zpayload), ZEND_STRL("rawPacket"), (char *)payload);
-					// TODO completing
+					unsigned char ipprotocol = ip->nexthdr;
+					unsigned char *ipdata = payload + sizeof(*ip);
+
+					switch (ipprotocol) {
+						case IPPROTO_TCP: {
+							struct tcphdr a;
+							memcpy(&a, ipdata, sizeof(a));
+							struct tcphdr *tcp = &a;
+							object_init_ex(&szpayload, tcppacket_ce);
+							zend_update_property_long(Z_OBJCE(szpayload), Z_OBJ(szpayload), ZEND_STRL("srcPort"), ntohs(tcp->th_sport));
+							zend_update_property_long(Z_OBJCE(szpayload), Z_OBJ(szpayload), ZEND_STRL("dstPort"), ntohs(tcp->th_dport));
+							zend_update_property_long(Z_OBJCE(szpayload), Z_OBJ(szpayload), ZEND_STRL("headerSize"), sizeof(*tcp));
+							zend_update_property_string(Z_OBJCE(szpayload), Z_OBJ(szpayload), ZEND_STRL("rawPacket"), (char *)ipdata);
+							zend_update_property(Z_OBJCE(zpayload), Z_OBJ(zpayload), ZEND_STRL("payload"), &szpayload);
+							Z_DELREF(szpayload);
+							break;
+						}
+						case IPPROTO_UDP: {
+							struct udphdr a;
+							memcpy(&a, ipdata, sizeof(a));
+							struct udphdr *udp = &a;
+							object_init_ex(&szpayload, udppacket_ce);
+							zend_update_property_long(Z_OBJCE(szpayload), Z_OBJ(szpayload), ZEND_STRL("srcPort"), ntohs(udp->uh_sport));
+							zend_update_property_long(Z_OBJCE(szpayload), Z_OBJ(szpayload), ZEND_STRL("dstPort"), ntohs(udp->uh_dport));
+							zend_update_property_long(Z_OBJCE(szpayload), Z_OBJ(szpayload), ZEND_STRL("headerSize"), sizeof(*udp));
+							zend_update_property_string(Z_OBJCE(szpayload), Z_OBJ(szpayload), ZEND_STRL("rawPacket"), (char *)ipdata);
+							zend_update_property(Z_OBJCE(zpayload), Z_OBJ(zpayload), ZEND_STRL("payload"), &szpayload);
+							Z_DELREF(szpayload);
+							break;
+						}
+						// TODO IPPROTO_ICMPV6 support
+						default:
+							zend_update_property(Z_OBJCE(obj), Z_OBJ(obj), ZEND_STRL("payload"), &zpayload);
+							zend_update_property_string(Z_OBJCE(obj), Z_OBJ(obj), ZEND_STRL("rawPacket"), ZSTR_VAL(recv_buf));
+							zend_string_efree(recv_buf);
+							ZEND_TRY_ASSIGN_REF_VALUE(arg2, &obj);
+							ZEND_TRY_ASSIGN_REF_STRING(arg5, ifrname);
+
+							if (arg6) {
+								ZEND_TRY_ASSIGN_REF_LONG(arg6, sll.sll_ifindex);
+							}
+							zend_value_error("unsupported ip header protocol");
+							RETURN_THROWS();
+					}
 					break;
 				}
 				case ETH_P_LOOP: {

ext/sockets/sockets.stub.php

@@ -2211,6 +2211,7 @@ final class Ipv6Packet extends Packet
     {
 	public string $srcAddr;
 	public string $dstAddr;
+	public ?Packet $payload;
     }
 #endif
 }

ext/sockets/sockets_arginfo.h

@@ -94,19 +94,39 @@ if (!function_exists("posix_getuid") || posix_getuid() != 0) {
     $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"
-    );
+    $ethhdr = pack("H12H12n", "ffffffffffff", "000000000000", ETH_P_IPV6);
+
+    $ipv6_first_4 = hex2bin("60000000");
+
+    $ipv6_payload_len = hex2bin("0014");
+
+    $ipv6_nexthdr = chr(6);
+
+    $ipv6_hop_limit = chr(64);
 
-    $payload = str_repeat("A", 20);
+    $src_ip = hex2bin("00000000000000000000000000000001");
 
-    $buf = pack("H12H12n", "ffffffffffff", "000000000000", ETH_P_IPV6);
-    $buf .= $ip . $payload;
+    $dst_ip = hex2bin("00000000000000000000000000000001");
+
+    $tcp_hdr = pack("nnNNCCnn",
+	    12345,
+	    80,
+	    0,
+	    0,
+	    (5 << 4),
+	    0x02,
+	    65535,
+	    0 
+    );
+
+    $buf = $ethhdr
+	    . $ipv6_first_4
+	    . $ipv6_payload_len
+	    . $ipv6_nexthdr
+	    . $ipv6_hop_limit
+	    . $src_ip
+	    . $dst_ip
+	    . $tcp_hdr;
 
     $buf .= str_repeat("\x00", max(0, 60 - strlen($buf)));
 
@@ -165,7 +185,7 @@ object(Socket\EthernetPacket)#2 (7) {
   ["dstMac"]=>
   string(%d) "%s:%s:%s:%s:%s:%s"
   ["payload"]=>
-  object(Socket\Ipv4Packet)#10 (5) {
+  object(Socket\Ipv4Packet)#%d (5) {
     ["headerSize"]=>
     int(%d)
     ["rawPacket"]=>
@@ -175,7 +195,7 @@ object(Socket\EthernetPacket)#2 (7) {
     ["dstAddr"]=>
     string(%d) "%d.%d.%d.%d"
     ["payload"]=>
-    object(Socket\%sPacket)#11 (4) {
+    object(Socket\%sPacket)#%d (4) {
       ["headerSize"]=>
       int(%d)
       ["rawPacket"]=>
@@ -187,10 +207,10 @@ object(Socket\EthernetPacket)#2 (7) {
     }
   }
 }
-int(74)
-int(74)
+int(%d)
+int(%d)
 string(2) "lo"
-object(Socket\EthernetPacket)#9 (7) {
+object(Socket\EthernetPacket)#%d (7) {
   ["headerSize"]=>
   int(14)
   ["rawPacket"]=>
@@ -203,16 +223,27 @@ object(Socket\EthernetPacket)#9 (7) {
   ["srcMac"]=>
   string(%d) "%s:%s:%s:%s:%s:%s"
   ["dstMac"]=>
-  string(17) "%s:%s:%s:%s:%s:%s"
+  string(%d) "%s:%s:%s:%s:%s:%s"
   ["payload"]=>
-  object(Socket\Ipv6Packet)#1 (4) {
+  object(Socket\Ipv6Packet)#%d (5) {
     ["headerSize"]=>
-    int(5160)
+    int(%d)
     ["rawPacket"]=>
-    string(%d) "%s"
+    string(%d) "%A"
     ["srcAddr"]=>
     string(%d) "%s"
     ["dstAddr"]=>
     string(%d) "%s"
+    ["payload"]=>
+    object(Socket\TcpPacket)#%d (4) {
+      ["headerSize"]=>
+      int(%d)
+      ["rawPacket"]=>
+      string(%d) "%A"
+      ["srcPort"]=>
+      int(%d)
+      ["dstPort"]=>
+      int(%d)
+    }
   }
 }