expose needed ETH_FRAME_LEN, fix socket_sendto, test.

Author: devnexen

ext/sockets/sockets.c

@@ -1658,6 +1658,7 @@ PHP_FUNCTION(socket_recvfrom)
 			object_init_ex(arg2, socket_ethinfo_ce);
 			zend_update_property_string(Z_OBJCE_P(arg2), Z_OBJ_P(arg2), ZEND_STRL("macsrc"), ether_ntoa((struct ether_addr *)e->h_source));
 			zend_update_property_string(Z_OBJCE_P(arg2), Z_OBJ_P(arg2), ZEND_STRL("macdst"), ether_ntoa((struct ether_addr *)e->h_dest));
+			zend_update_property_long(Z_OBJCE_P(arg2), Z_OBJ_P(arg2), ZEND_STRL("ethprotocol"), protocol);
 			array_init(&zpayload);
 
 			switch (protocol) {
@@ -1826,7 +1827,7 @@ PHP_FUNCTION(socket_sendto)
 			sll.sll_halen = ETH_ALEN;
 
 			// TODO allows to use more user friendly type to replace raw buffer usage
-			retval = sendto(php_sock->bsd_socket, buf, ((size_t)len > buf_len) ? buf_len : (size_t)len, flags, (struct sockaddr *) &sin, sizeof(sin));
+			retval = sendto(php_sock->bsd_socket, buf, ((size_t)len > buf_len) ? buf_len : (size_t)len, flags, (struct sockaddr *) &sll, sizeof(sll));
 			break;
 #endif
 		default:

ext/sockets/sockets.stub.php

@@ -2006,6 +2006,11 @@
  * @cvalue ETH_P_ALL
  */
 const ETH_P_ALL = UNKNOWN;
+/**
+ * @var int
+ * @cvalue ETH_FRAME_LEN
+ */
+const ETH_FRAME_LEN = UNKNOWN;
 #endif
 
 /**
@@ -2156,6 +2161,8 @@ final class SocketEthernetInfo
     /** @readonly **/
     public Socket $socket;
     /** @readonly **/
+    public int $ethprotocol;
+    /** @readonly **/
     public string $macsrc;
     /** @readonly **/
     public string $macdst;

ext/sockets/sockets_arginfo.h

@@ -26,6 +26,18 @@ if (!function_exists("posix_getuid") || posix_getuid() != 0) {
     var_dump($iindex);
 
     socket_getpeername($s_c, $istr2, $iindex2);
+
+    $s_s     = socket_create(AF_PACKET, SOCK_RAW, ETH_P_ALL);
+    $v_bind  = socket_bind($s_s, 'lo');
+
+    $buf = str_pad(str_repeat("0", ETH_FRAME_LEN) .
+	   str_repeat("\xFF", 6) .
+	   str_repeat("\x11", 6) .
+	   "\x08\x00TEST ethernet", 2048, "\x00");
+
+    var_dump(socket_sendto($s_s, $buf, strlen($buf), 0, "lo", 1));
+
+    socket_close($s_s);
     socket_close($s_c);
 ?>
 --EXPECTF--
@@ -35,3 +47,4 @@ string(2) "lo"
 int(%i)
 
 Warning: socket_getpeername(): unable to retrieve peer name [95]: %sot supported in %s on line %d
+int(2048)