[0.2] Add additional Linux AF_PACKET options #3540
Conversation
|
r? @JohnTitor (rustbot has picked a reviewer for you, use r? to override) |
nathaniel-bennett
force-pushed
the
libc-0.2
branch
from
375d15a to
c7a3466
Compare
|
Sorry but could you add cfgs here? 0.2's MSRV is 1.13 and we need to add them, see https://github.com/rust-lang/libc/tree/libc-0.2#rust-version-support. |
nathaniel-bennett
force-pushed
the
libc-0.2
branch
from
c7a3466 to
37539c6
Compare
|
Added cfgs for union types in latest force-push |
|
CI fails, seems you also need |
nathaniel-bennett
force-pushed
the
libc-0.2
branch
from
37539c6 to
3f3b9b6
Compare
|
Added libc_align cfg to any structs that use |
nathaniel-bennett
force-pushed
the
libc-0.2
branch
8 times, most recently
from
d48b986 to
d0e72e9
Compare
nathaniel-bennett
force-pushed
the
libc-0.2
branch
7 times, most recently
from
8b168d1 to
e5e8b78
Compare
nathaniel-bennett
force-pushed
the
libc-0.2
branch
3 times, most recently
from
af37ff7 to
ed656e0
Compare
|
This is a big-ish API surface so it's still taking me a while to going through it. Feel free to hold off rebasing until I get back to you. Some brief notes below. |
libc-test/build.rs
Outdated
| // FIXME: pass by value for structs that are not an even 32/64 bits on | ||
| // big-endian systems corrupts the value for unknown reasons. | ||
| if (sparc64 || ppc || ppc64 || s390x) | ||
| && (ty == "sockaddr_pkt" | ||
| || ty == "tpacket_auxdata" | ||
| || ty == "tpacket_hdr_variant1" | ||
| || ty == "tpacket_req3" | ||
| || ty == "tpacket_stats_v3" | ||
| || ty == "tpacket_req_u") | ||
| { | ||
| return true; | ||
| } | ||
| // FIXME: musl doesn't compile with `struct fanout_args` for unknown reasons. | ||
| if musl && ty == "fanout_args" { | ||
| return true; | ||
| } |
There was a problem hiding this comment.
What are these unknown reasons, or what is the error? Ideally we link actual rust-lang/rust issues here so we know when this can be removed.
src/unix/linux_like/linux/align.rs
Outdated
|
|
||
|
|
src/unix/linux_like/linux/mod.rs
Outdated
| #[cfg(libc_union)] | ||
| impl ::fmt::Debug for tpacket_req_u { | ||
| fn fmt(&self, f: &mut ::fmt::Formatter) -> ::fmt::Result { | ||
| f.debug_struct("tpacket_req_u") | ||
| .field("req3", unsafe { &self.req3 }) | ||
| .finish() | ||
| } | ||
| } | ||
|
|
||
| #[cfg(libc_union)] | ||
| impl ::fmt::Debug for tpacket_bd_header_u { | ||
| fn fmt(&self, f: &mut ::fmt::Formatter) -> ::fmt::Result { | ||
| f.debug_struct("tpacket_bd_header_u") | ||
| .field("bh1", unsafe { &self.bh1 }) | ||
| .finish() | ||
| } | ||
| } | ||
|
|
||
| #[cfg(libc_union)] | ||
| impl ::fmt::Debug for tpacket_block_desc { | ||
| fn fmt(&self, f: &mut ::fmt::Formatter) -> ::fmt::Result { | ||
| f.debug_struct("tpacket_bd_header_u") | ||
| .field("version", &self.version) | ||
| .field("offset_to_priv", &self.offset_to_priv) | ||
| .field("hdr", &self.hdr) | ||
| .finish() | ||
| } | ||
| } | ||
|
|
||
|
|
There was a problem hiding this comment.
Reading req3 on tpacket_req_u reads potentially uninitialized data if the variant is actually req. It is probably best to just drop these Debug implementations entirely, considering they may be removed anyway in 1.0.
nathaniel-bennett
force-pushed
the
libc-0.2
branch
from
ed656e0 to
f402cbe
Compare
|
Linked to (rust-lang/rust#43894), removed the spurious whitespace, and dropped the |
nathaniel-bennett
force-pushed
the
libc-0.2
branch
from
f402cbe to
f3ba4d0
Compare
nathaniel-bennett
force-pushed
the
libc-0.2
branch
from
f3ba4d0 to
a0ac2f1
Compare
|
@rustbot label S-waiting-on-review |
|
@rustbot label -S-waiting-on-author |
tgross35
added
the
main-needs-cherry-pick
tgross35
added
main-applied
4 participants
Added socket options, structs and other miscellaneous constants that make memory-mapped packet sockets possible in Linux--PACKET_TX_RING, PACKET_RX_RING, etc.
(adding this to libc 0.2 as 0.3 is in early development)