Skip to content

Add sock_extended_err and associated constants from errqueue.h to linux_like #1616

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

Merged
merged 5 commits into from
Dec 23, 2019
Merged

Add sock_extended_err and associated constants from errqueue.h to linux_like #1616

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
104a3f2
Move linux/ headers down in test_android
mcpherrinm Dec 2, 2019
73c2437
Add sock_extended_err and associated constants from errqueue.h
mcpherrinm Dec 2, 2019
d1a404c
Missing errqueue.h in android
mcpherrinm Dec 2, 2019
a9a6ef1
rustfmt build.rs
mcpherrinm Dec 2, 2019
06938ad
Add test for SO_EE_OFFENDER
mcpherrinm Dec 2, 2019
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
5 changes: 5 additions & 0 deletions libc-test/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,3 +52,8 @@ harness = false
name = "cmsg"
path = "test/cmsg.rs"
harness = true

[[test]]
name = "errqueue"
path = "test/errqueue.rs"
harness = true
54 changes: 32 additions & 22 deletions libc-test/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ fn do_cc() {
if cfg!(unix) && !target.contains("wasi") {
cc::Build::new().file("src/cmsg.c").compile("cmsg");
}
if target.contains("android") || target.contains("linux") {
cc::Build::new().file("src/errqueue.c").compile("errqueue");
}
}

fn do_ctest() {
Expand Down Expand Up @@ -1235,7 +1238,6 @@ fn test_android(target: &str) {

headers! { cfg:
"arpa/inet.h",
"asm/mman.h",
"ctype.h",
"dirent.h",
"dlfcn.h",
Expand All @@ -1244,27 +1246,6 @@ fn test_android(target: &str) {
"grp.h",
"ifaddrs.h",
"limits.h",
"linux/dccp.h",
"linux/futex.h",
"linux/fs.h",
"linux/genetlink.h",
"linux/if_alg.h",
"linux/if_ether.h",
"linux/if_tun.h",
"linux/magic.h",
"linux/memfd.h",
"linux/module.h",
"linux/net_tstamp.h",
"linux/netfilter/nfnetlink.h",
"linux/netfilter/nfnetlink_log.h",
"linux/netfilter/nf_tables.h",
"linux/netfilter_ipv4.h",
"linux/netfilter_ipv6.h",
"linux/netlink.h",
"linux/quota.h",
"linux/reboot.h",
"linux/seccomp.h",
"linux/sockios.h",
"locale.h",
"malloc.h",
"net/ethernet.h",
Expand Down Expand Up @@ -1335,6 +1316,34 @@ fn test_android(target: &str) {
[x86]: "sys/reg.h",
}

// Include linux headers at the end:
headers! { cfg:
"asm/mman.h",
"linux/dccp.h",
"linux/errqueue.h",
"linux/futex.h",
"linux/fs.h",
"linux/genetlink.h",
"linux/if_alg.h",
"linux/if_ether.h",
"linux/if_tun.h",
"linux/magic.h",
"linux/memfd.h",
"linux/module.h",
"linux/net_tstamp.h",
"linux/netfilter/nfnetlink.h",
"linux/netfilter/nfnetlink_log.h",
"linux/netfilter/nf_tables.h",
"linux/netfilter_ipv4.h",
"linux/netfilter_ipv6.h",
"linux/netlink.h",
"linux/quota.h",
"linux/reboot.h",
"linux/seccomp.h",
"linux/sockios.h",

}

cfg.type_name(move |ty, is_struct, is_union| {
match ty {
// Just pass all these through, no need for a "struct" prefix
Expand Down Expand Up @@ -2184,6 +2193,7 @@ fn test_linux(target: &str) {
cfg:
"asm/mman.h",
"linux/dccp.h",
"linux/errqueue.h",
"linux/falloc.h",
"linux/fs.h",
"linux/futex.h",
Expand Down
10 changes: 10 additions & 0 deletions libc-test/src/errqueue.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
#include <time.h>
#include <linux/errqueue.h>

// SO_EE_OFFENDER is defined as a macro in linux/errqueue.h. This file wraps
// that macro in a function so we can test the reimplementation in this package
// is equivalent.

struct sockaddr *so_ee_offender(struct sock_extended_err *ee) {
return SO_EE_OFFENDER(ee);
}
22 changes: 22 additions & 0 deletions libc-test/test/errqueue.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
//! Compare libc's SO_EE_OFFENDER function against the actual C macro

extern crate libc;

#[cfg(any(target_os = "linux", target_os = "android"))]
mod t {
use libc::{self, sock_extended_err, sockaddr};

extern "C" {
pub fn so_ee_offender(ee: *const sock_extended_err) -> *mut sockaddr;
}

#[test]
fn test_cmsg_data() {
for l in 0..128 {
let ee = l as *const sock_extended_err;
unsafe {
assert_eq!(libc::SO_EE_OFFENDER(ee), so_ee_offender(ee));
}
}
}
}
21 changes: 21 additions & 0 deletions src/unix/linux_like/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,16 @@ s! {
pub msg_hdr: ::msghdr,
pub msg_len: ::c_uint,
}

pub struct sock_extended_err {
pub ee_errno: u32,
pub ee_origin: u8,
pub ee_type: u8,
pub ee_code: u8,
pub ee_pad: u8,
pub ee_info: u32,
pub ee_data: u32
}
}

s_no_extra_traits! {
Expand Down Expand Up @@ -1189,6 +1199,13 @@ pub const ARPHRD_IEEE802154: u16 = 804;
pub const ARPHRD_VOID: u16 = 0xFFFF;
pub const ARPHRD_NONE: u16 = 0xFFFE;

pub const SO_EE_ORIGIN_NONE: u8 = 0;
pub const SO_EE_ORIGIN_LOCAL: u8 = 1;
pub const SO_EE_ORIGIN_ICMP: u8 = 2;
pub const SO_EE_ORIGIN_ICMP6: u8 = 3;
pub const SO_EE_ORIGIN_TXSTATUS: u8 = 4;
pub const SO_EE_ORIGIN_TIMESTAMPING: u8 = SO_EE_ORIGIN_TXSTATUS;

const_fn! {
{const} fn CMSG_ALIGN(len: usize) -> usize {
len + ::mem::size_of::<usize>() - 1 & !(::mem::size_of::<usize>() - 1)
Expand Down Expand Up @@ -1294,6 +1311,10 @@ f! {
pub fn IPTOS_ECN(x: u8) -> u8 {
x & ::IPTOS_ECN_MASK
}

pub fn SO_EE_OFFENDER(ee: *const ::sock_extended_err) -> *mut ::sockaddr {
ee.offset(1) as *mut ::sockaddr
}
}

extern "C" {
Expand Down