Skip to content

Commit 375d15a

Browse files
Add additional Linux AF_PACKET options
1 parent 3d17519 commit 375d15a

File tree

3 files changed

+314
-2
lines changed

3 files changed

+314
-2
lines changed

Diff for: libc-test/build.rs

+18-1
Original file line numberDiff line numberDiff line change
@@ -3332,7 +3332,6 @@ fn test_linux(target: &str) {
33323332
"netinet/ip.h",
33333333
"netinet/tcp.h",
33343334
"netinet/udp.h",
3335-
"netpacket/packet.h",
33363335
"poll.h",
33373336
"pthread.h",
33383337
"pty.h",
@@ -3432,6 +3431,7 @@ fn test_linux(target: &str) {
34323431
"linux/if_addr.h",
34333432
"linux/if_alg.h",
34343433
"linux/if_ether.h",
3434+
"linux/if_packet.h",
34353435
"linux/if_tun.h",
34363436
"linux/if_xdp.h",
34373437
"linux/input.h",
@@ -3608,6 +3608,23 @@ fn test_linux(target: &str) {
36083608
if (gnu && sparc64) && (ty == "ip_mreqn" || ty == "hwtstamp_config") {
36093609
return true;
36103610
}
3611+
// FIXME: pass by value for structs that are not an even 32/64 bits on
3612+
// big-endian systems corrupts the value for unknown reasons.
3613+
if (sparc64 || ppc || ppc64 || s390x)
3614+
&& (ty == "sockaddr_pkt"
3615+
|| ty == "tpacket_auxdata"
3616+
|| ty == "tpacket_hdr_variant1"
3617+
|| ty == "tpacket_req3"
3618+
|| ty == "tpacket_stats_v3"
3619+
|| ty == "tpacket_req_u")
3620+
{
3621+
return true;
3622+
}
3623+
// FIXME: musl doesn't compile with `struct fanout_args` for unknown reasons.
3624+
if musl && ty == "fanout_args" {
3625+
return true;
3626+
}
3627+
36113628
match ty {
36123629
// These cannot be tested when "resolv.h" is included and are tested
36133630
// in the `linux_elf.rs` file.

Diff for: libc-test/semver/linux.txt

+61
Original file line numberDiff line numberDiff line change
@@ -1799,11 +1799,38 @@ O_RSYNC
17991799
O_SYNC
18001800
O_TMPFILE
18011801
PACKET_ADD_MEMBERSHIP
1802+
PACKET_AUXDATA
1803+
PACKET_BROADCAST
18021804
PACKET_DROP_MEMBERSHIP
1805+
PACKET_FANOUT
1806+
PACKET_FANOUT_CBPF
1807+
PACKET_FANOUT_CPU
1808+
PACKET_FANOUT_FLAG_DEFRAG
1809+
PACKET_FANOUT_FLAG_ROLLOVER
1810+
PACKET_FANOUT_FLAG_UNIQUEID
1811+
PACKET_FANOUT_HASH
1812+
PACKET_FANOUT_LB
1813+
PACKET_FANOUT_QM
1814+
PACKET_FANOUT_RND
1815+
PACKET_FANOUT_ROLLOVER
1816+
PACKET_HOST
1817+
PACKET_KERNEL
1818+
PACKET_LOOPBACK
1819+
PACKET_LOSS
18031820
PACKET_MR_ALLMULTI
18041821
PACKET_MR_MULTICAST
18051822
PACKET_MR_PROMISC
18061823
PACKET_MR_UNICAST
1824+
PACKET_MULTICAST
1825+
PACKET_OTHERHOST
1826+
PACKET_OUTGOING
1827+
PACKET_QDISC_BYPASS
1828+
PACKET_RESERVE
1829+
PACKET_RX_RING
1830+
PACKET_STATISTICS
1831+
PACKET_TIMESTAMP
1832+
PACKET_USER
1833+
PACKET_VERSION
18071834
PENDIN
18081835
PF_ALG
18091836
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)