fixing bug/test

Author: devnexen

ext/sockets/sockets.c

@@ -1686,7 +1686,6 @@ PHP_FUNCTION(socket_recvfrom)
 					payload = ((unsigned char *)e + ETH_HLEN);
 					struct iphdr a;
 					memcpy(&a, payload, sizeof(a));
-					//struct iphdr *ip = (struct iphdr *)payload;
 					struct iphdr *ip = &a;
 					size_t tlayer = ip->ihl * 4;
 					size_t totalip = ntohs(ip->tot_len);
@@ -1714,6 +1713,7 @@ PHP_FUNCTION(socket_recvfrom)
 					zend_update_property_string(Z_OBJCE(zpayload), Z_OBJ(zpayload), ZEND_STRL("srcAddr"), inet_ntoa(s));
 					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) {
@@ -1725,6 +1725,7 @@ PHP_FUNCTION(socket_recvfrom)
 							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;
@@ -1737,6 +1738,7 @@ PHP_FUNCTION(socket_recvfrom)
 							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;

ext/sockets/sockets.stub.php

@@ -2173,41 +2173,41 @@ function socket_wsaprotocol_info_release(string $info_id): bool {}
 
 namespace Socket {
 #ifdef AF_PACKET
-    readonly class Packet
+    class Packet
     {
 	public int $headerSize;
 	public ?string $rawPacket;
     }
 
-    final readonly class EthernetPacket extends Packet
+    final class EthernetPacket extends Packet
     {
 	public \Socket $socket;
 	public int $ethProtocol;
 	public string $srcMac;
 	public string $dstMac;
-	public ?Packet $payload;
+	public ?object $payload;
     }
 
-    final readonly class TcpPacket extends Packet
+    final class TcpPacket extends Packet
     {
-	public string $srcPort;
+	public int $srcPort;
 	public int $dstPort;
     }
 
-    final readonly class UdpPacket extends Packet
+    final class UdpPacket extends Packet
     {
 	public int $srcPort;
 	public int $dstPort;
     }
 
-    final readonly class Ipv4Packet extends Packet
+    final class Ipv4Packet extends Packet
     {
 	public string $srcAddr;
 	public string $dstAddr;
-	public ?Packet $payload;
+	public ?object $payload;
     }
 
-    final readonly class Ipv6Packet extends Packet
+    final class Ipv6Packet extends Packet
     {
 	public string $srcAddr;
 	public string $dstAddr;

ext/sockets/sockets_arginfo.h

@@ -112,8 +112,53 @@ object(Socket\EthernetPacket)#3 (%d) {
   string(%d) "%s:%s:%s:%s:%s:%s"
   ["payload"]=>
   object(%s)#4 (%d) {
-    %a
+    %A
   }
 }
 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) {
+  ["headerSize"]=>
+  int(14)
+  ["rawPacket"]=>
+  string(%d) "%A"
+  ["socket"]=>
+  object(Socket)#8 (0) {
+  }
+  ["ethProtocol"]=>
+  int(2048)
+  ["srcMac"]=>
+  string(%d) "%s:%s:%s:%s:%s:%s"
+  ["dstMac"]=>
+  string(%d) "%s:%s:%s:%s:%s:%s"
+  ["payload"]=>
+  object(Socket\Ipv4Packet)#10 (6) {
+    ["headerSize"]=>
+    int(%d)
+    ["rawPacket"]=>
+    string(%d) "%s"
+    ["srcAddr"]=>
+    string(%d) "%d.%d.%d.%d"
+    ["dstAddr"]=>
+    string(%d) "%d.%d.%d.%d"
+    ["payload"]=>
+    object(Socket\%sPacket)#11 (4) {
+      ["headerSize"]=>
+      int(%d)
+      ["rawPacket"]=>
+      string(%d) "%s"
+      ["srcPort"]=>
+      int(%d)
+      ["dstPort"]=>
+      int(%d)
+    }
+    ["socket"]=>
+    object(Socket)#8 (0) {
+    }
+  }
+}