Skip to content

Commit 01eb413

Browse files
Add additional Linux AF_PACKET options
1 parent c9e2559 commit 01eb413

File tree

3 files changed

+313
-1
lines changed

3 files changed

+313
-1
lines changed

libc-test/build.rs

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3379,7 +3379,6 @@ fn test_linux(target: &str) {
33793379
"netinet/ip.h",
33803380
"netinet/tcp.h",
33813381
"netinet/udp.h",
3382-
"netpacket/packet.h",
33833382
"poll.h",
33843383
"pthread.h",
33853384
"pty.h",
@@ -3481,6 +3480,7 @@ fn test_linux(target: &str) {
34813480
"linux/if_addr.h",
34823481
"linux/if_alg.h",
34833482
"linux/if_ether.h",
3483+
"linux/if_packet.h",
34843484
"linux/if_tun.h",
34853485
"linux/if_xdp.h",
34863486
"linux/input.h",
@@ -3661,6 +3661,23 @@ fn test_linux(target: &str) {
36613661
if (gnu && sparc64) && (ty == "ip_mreqn" || ty == "hwtstamp_config") {
36623662
return true;
36633663
}
3664+
// FIXME: pass by value for structs that are not an even 32/64 bits on
3665+
// big-endian systems corrupts the value for unknown reasons.
3666+
if (sparc64 || ppc || ppc64 || s390x)
3667+
&& (ty == "sockaddr_pkt"
3668+
|| ty == "tpacket_auxdata"
3669+
|| ty == "tpacket_hdr_variant1"
3670+
|| ty == "tpacket_req3"
3671+
|| ty == "tpacket_stats_v3"
3672+
|| ty == "tpacket_req_u")
3673+
{
3674+
return true;
3675+
}
3676+
// FIXME: musl doesn't compile with `struct fanout_args` for unknown reasons.
3677+
if musl && ty == "fanout_args" {
3678+
return true;
3679+
}
3680+
36643681
match ty {
36653682
// These cannot be tested when "resolv.h" is included and are tested
36663683
// in the `linux_elf.rs` file.

libc-test/semver/linux.txt

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1801,11 +1801,38 @@ O_RSYNC
18011801
O_SYNC
18021802
O_TMPFILE
18031803
PACKET_ADD_MEMBERSHIP
1804+
PACKET_AUXDATA
1805+
PACKET_BROADCAST
18041806
PACKET_DROP_MEMBERSHIP
1807+
PACKET_FANOUT
1808+
PACKET_FANOUT_CBPF
1809+
PACKET_FANOUT_CPU
1810+
PACKET_FANOUT_FLAG_DEFRAG
1811+
PACKET_FANOUT_FLAG_ROLLOVER
1812+
PACKET_FANOUT_FLAG_UNIQUEID
1813+
PACKET_FANOUT_HASH
1814+
PACKET_FANOUT_LB
1815+
PACKET_FANOUT_QM
1816+
PACKET_FANOUT_RND
1817+
PACKET_FANOUT_ROLLOVER
1818+
PACKET_HOST
1819+
PACKET_KERNEL
1820+
PACKET_LOOPBACK
1821+
PACKET_LOSS
18051822
PACKET_MR_ALLMULTI
18061823
PACKET_MR_MULTICAST
18071824
PACKET_MR_PROMISC
18081825
PACKET_MR_UNICAST
1826+
PACKET_MULTICAST
1827+
PACKET_OTHERHOST
1828+
PACKET_OUTGOING
1829+
PACKET_QDISC_BYPASS
1830+
PACKET_RESERVE
1831+
PACKET_RX_RING
1832+
PACKET_STATISTICS
1833+
PACKET_TIMESTAMP
1834+
PACKET_USER
1835+
PACKET_VERSION
18091836
PENDIN
18101837
PF_ALG
18111838
PF_APPLETALK
@@ -3190,6 +3217,22 @@ TLS_GET_RECORD_TYPE
31903217
TLS_RX
31913218
TLS_SET_RECORD_TYPE
31923219
TLS_TX
3220+
TP_STATUS_AVAILABLE
3221+
TP_STATUS_BLK_TMO
3222+
TP_STATUS_COPY
3223+
TP_STATUS_CSUMNOTREADY
3224+
TP_STATUS_CSUM_VALID
3225+
TP_STATUS_KERNEL
3226+
TP_STATUS_LOSING
3227+
TP_STATUS_SENDING
3228+
TP_STATUS_SEND_REQUEST
3229+
TP_STATUS_TS_RAW_HARDWARE
3230+
TP_STATUS_TS_SOFTWARE
3231+
TP_STATUS_TS_SYS_HARDWARE
3232+
TP_STATUS_USER
3233+
TP_STATUS_VLAN_TPID_VALID
3234+
TP_STATUS_VLAN_VALID
3235+
TP_STATUS_WRONG_FORMAT
31933236
TUN_READQ_SIZE
31943237
TUN_TAP_DEV
31953238
TUN_TUN_DEV
@@ -3452,6 +3495,7 @@ fanotify_event_metadata
34523495
fanotify_init
34533496
fanotify_mark
34543497
fanotify_response
3498+
fanout_args
34553499
fchdir
34563500
fdatasync
34573501
fdopendir
@@ -3819,6 +3863,7 @@ sockaddr_alg
38193863
sockaddr_can
38203864
sockaddr_ll
38213865
sockaddr_nl
3866+
sockaddr_pkt
38223867
sockaddr_vm
38233868
splice
38243869
spwd
@@ -3853,6 +3898,22 @@ timer_getoverrun
38533898
timer_gettime
38543899
timer_settime
38553900
tmpfile64
3901+
tpacket2_hdr
3902+
tpacket3_hdr
3903+
tpacket_auxdata
3904+
tpacket_bd_header_u
3905+
tpacket_bd_ts
3906+
tpacket_block_desc
3907+
tpacket_hdr
3908+
tpacket_hdr_v1
3909+
tpacket_hdr_variant1
3910+
tpacket_req
3911+
tpacket_req3
3912+
tpacket_req_u
3913+
tpacket_rollover_stats
3914+
tpacket_stats
3915+
tpacket_stats_v3
3916+
tpacket_versions
38563917
truncate
38573918
truncate64
38583919
ttyname_r

0 commit comments

Comments
 (0)