Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Socket ether linux step2 #17926

Open
wants to merge 11 commits into
base: master
Choose a base branch
from
+517 −20
Open

Socket ether linux step2 #17926

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
c9897ef
ext/sockets: follow-up on AF_PACKET support.
devnexen Feb 25, 2025
d921aa6
applying one of the @arnaud-lb suggestions.
devnexen Feb 25, 2025
cfc49f4
update test
devnexen Feb 25, 2025
90edddc
fix nullable payload
devnexen Feb 25, 2025
f4d6be5
fix zendmm leaks
devnexen Feb 26, 2025
91947f6
re-establish lost test data and testing unsupported proto.
devnexen Feb 26, 2025
57a17bd
address most of remarks
devnexen Feb 27, 2025
40eaa81
few transport layer sanitiy checks.
devnexen Feb 27, 2025
07c4d44
Fix classes definitions
devnexen Mar 7, 2025
70c93fc
starting to namespace types
devnexen Mar 7, 2025
3a67b50
fix properties
devnexen Mar 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
fix properties
  • Loading branch information
@devnexen
devnexen committed Mar 20, 2025
commit 3a67b50b4304ade0235c672df51e11283c20f297
2 changes: 1 addition & 1 deletion ext/sockets/sockets.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1771,7 +1771,7 @@ PHP_FUNCTION(socket_recvfrom)
zend_update_property_string(Z_OBJCE(zpayload), Z_OBJ(zpayload), ZEND_STRL("macDst"), ether_ntoa((struct ether_addr *)innere->h_dest));
zend_update_property_long(Z_OBJCE(zpayload), Z_OBJ(zpayload), ZEND_STRL("headerSize"), sizeof(*innere));
zend_update_property(Z_OBJCE(zpayload), Z_OBJ(zpayload), ZEND_STRL("socket"), arg1);
zend_update_property(Z_OBJCE(zpayload), Z_OBJ(zpayload), ZEND_STRL("rawpacket"), &innerp);
zend_update_property(Z_OBJCE(zpayload), Z_OBJ(zpayload), ZEND_STRL("rawPacket"), &innerp);
zend_update_property(Z_OBJCE(zpayload), Z_OBJ(zpayload), ZEND_STRL("payload"), &innerp);
zend_update_property_long(Z_OBJCE(zpayload), Z_OBJ(zpayload), ZEND_STRL("ethProtocol"), 0);
break;
Expand Down
6 changes: 3 additions & 3 deletions ext/sockets/sockets.stub.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2171,8 +2171,8 @@ function socket_wsaprotocol_info_release(string $info_id): bool {}
#endif
}

#ifdef AF_PACKET
namespace Socket {
#ifdef AF_PACKET
readonly class Packet
{
public int $headerSize;
Expand All @@ -2181,7 +2181,7 @@ function socket_wsaprotocol_info_release(string $info_id): bool {}

final readonly class EthernetPacket extends Packet
{
public Socket $socket;
public \Socket $socket;
public int $ethProtocol;
public string $macSrc;
public string $macDst;
Expand Down Expand Up @@ -2216,5 +2216,5 @@ function socket_wsaprotocol_info_release(string $info_id): bool {}
public string $srcAddr;
public string $dstAddr;
}
}
#endif
}
18 changes: 15 additions & 3 deletions ext/sockets/sockets_arginfo.h
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions ext/sockets/tests/socket_afpacket.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,19 +66,19 @@ Warning: socket_getpeername(): unable to retrieve peer name [95]: %sot supported
int(60)
int(60)
string(2) "lo"
object(EthernetPacket)#3 (%d) {
["headersize"]=>
object(Socket\EthernetPacket)#3 (%d) {
["headerSize"]=>
int(%d)
["rawpacket"]=>
["rawPacket"]=>
string(%d) "%A"
["socket"]=>
object(Socket)#1 (0) {
}
["ethprotocol"]=>
["ethProtocol"]=>
int(%i)
["macsrc"]=>
["macSrc"]=>
string(%d) "%s:%s:%s:%s:%s:%s"
["macdst"]=>
["macDst"]=>
string(%d) "%s:%s:%s:%s:%s:%s"
["payload"]=>
object(%s)#4 (%d) {
Expand Down
Loading