From c70efd87cd7d6a5203dbbf3c6d7b3cfe9f0a261c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Marie?= Date: Sat, 14 Jul 2018 06:39:58 +0200 Subject: TCP_KEEP* constants are netbsd specific they doesn't exists on OpenBSD. put them under NetBSD specific tree. --- src/unix/bsd/netbsdlike/mod.rs | 4 ---- src/unix/bsd/netbsdlike/netbsd/mod.rs | 5 +++++ 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/unix/bsd/netbsdlike/mod.rs b/src/unix/bsd/netbsdlike/mod.rs index 1b7576e768..62a0ffc059 100644 --- a/src/unix/bsd/netbsdlike/mod.rs +++ b/src/unix/bsd/netbsdlike/mod.rs @@ -430,10 +430,6 @@ pub const IPV6_RECVPKTINFO: ::c_int = 36; pub const IPV6_PKTINFO: ::c_int = 46; pub const TCP_NODELAY: ::c_int = 0x01; -pub const TCP_KEEPIDLE: ::c_int = 3; -pub const TCP_KEEPINTVL: ::c_int = 5; -pub const TCP_KEEPCNT: ::c_int = 6; -pub const TCP_KEEPINIT: ::c_int = 7; pub const SOL_SOCKET: ::c_int = 0xffff; pub const SO_DEBUG: ::c_int = 0x01; diff --git a/src/unix/bsd/netbsdlike/netbsd/mod.rs b/src/unix/bsd/netbsdlike/netbsd/mod.rs index 01dd188495..cf1d74842f 100644 --- a/src/unix/bsd/netbsdlike/netbsd/mod.rs +++ b/src/unix/bsd/netbsdlike/netbsd/mod.rs @@ -381,6 +381,11 @@ pub const IP_RECVPKTINFO: ::c_int = 26; pub const IPV6_JOIN_GROUP: ::c_int = 12; pub const IPV6_LEAVE_GROUP: ::c_int = 13; +pub const TCP_KEEPIDLE: ::c_int = 3; +pub const TCP_KEEPINTVL: ::c_int = 5; +pub const TCP_KEEPCNT: ::c_int = 6; +pub const TCP_KEEPINIT: ::c_int = 7; + pub const SOCK_CONN_DGRAM: ::c_int = 6; pub const SOCK_DCCP: ::c_int = SOCK_CONN_DGRAM; pub const SOCK_NOSIGPIPE: ::c_int = 0x40000000; -- cgit v1.2.1 From 14f6cf8c6ac59a3a084e0cc71f9dbf3479d0da9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Marie?= Date: Sat, 14 Jul 2018 06:44:16 +0200 Subject: add KERN_AUDIO and inc KERN_MAXID on OpenBSD --- src/unix/bsd/netbsdlike/openbsdlike/mod.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/unix/bsd/netbsdlike/openbsdlike/mod.rs b/src/unix/bsd/netbsdlike/openbsdlike/mod.rs index e44bfca61c..d49c94e74c 100644 --- a/src/unix/bsd/netbsdlike/openbsdlike/mod.rs +++ b/src/unix/bsd/netbsdlike/openbsdlike/mod.rs @@ -653,7 +653,8 @@ pub const KERN_PROC_VMMAP: ::c_int = 80; pub const KERN_GLOBAL_PTRACE: ::c_int = 81; pub const KERN_CONSBUFSIZE: ::c_int = 82; pub const KERN_CONSBUF: ::c_int = 83; -pub const KERN_MAXID: ::c_int = 84; +pub const KERN_AUDIO: ::c_int = 84; +pub const KERN_MAXID: ::c_int = 85; pub const KERN_PROC_ALL: ::c_int = 0; pub const KERN_PROC_PID: ::c_int = 1; pub const KERN_PROC_PGRP: ::c_int = 2; -- cgit v1.2.1 From ec026d605c55592f68c0af37e0e77152eddf4ce5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Marie?= Date: Sat, 14 Jul 2018 06:45:39 +0200 Subject: add HW_NCPUONLINE sysctl (number of cpus being used) on OpenBSD --- src/unix/bsd/netbsdlike/openbsdlike/mod.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/unix/bsd/netbsdlike/openbsdlike/mod.rs b/src/unix/bsd/netbsdlike/openbsdlike/mod.rs index d49c94e74c..f75d7b35ac 100644 --- a/src/unix/bsd/netbsdlike/openbsdlike/mod.rs +++ b/src/unix/bsd/netbsdlike/openbsdlike/mod.rs @@ -579,6 +579,7 @@ pub const CTL_MACHDEP: ::c_int = 7; pub const CTL_DDB: ::c_int = 9; pub const CTL_VFS: ::c_int = 10; pub const CTL_MAXID: ::c_int = 11; +pub const HW_NCPUONLINE: ::c_int = 25; pub const KERN_OSTYPE: ::c_int = 1; pub const KERN_OSRELEASE: ::c_int = 2; pub const KERN_OSREV: ::c_int = 3; -- cgit v1.2.1 From 9d203f5ce97ca5c1fba1251f76cc402745c90bc3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Marie?= Date: Sat, 14 Jul 2018 06:48:47 +0200 Subject: adjust SIGSTKSZ value for OpenBSD 6.3-current --- src/unix/bsd/netbsdlike/openbsdlike/openbsd/mod.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/unix/bsd/netbsdlike/openbsdlike/openbsd/mod.rs b/src/unix/bsd/netbsdlike/openbsdlike/openbsd/mod.rs index cca8a47ae0..a2d5ac07c2 100644 --- a/src/unix/bsd/netbsdlike/openbsdlike/openbsd/mod.rs +++ b/src/unix/bsd/netbsdlike/openbsdlike/openbsd/mod.rs @@ -47,7 +47,7 @@ pub const IFF_LINK1: ::c_int = 0x2000; // per link layer defined bit pub const IFF_LINK2: ::c_int = 0x4000; // per link layer defined bit pub const IFF_MULTICAST: ::c_int = 0x8000; // supports multicast -pub const SIGSTKSZ : ::size_t = 24576; +pub const SIGSTKSZ : ::size_t = 28672; extern { pub fn accept4(s: ::c_int, addr: *mut ::sockaddr, -- cgit v1.2.1 From 280976e0d34625ef5b9e4240e31716489b69c4b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Marie?= Date: Sat, 14 Jul 2018 06:57:09 +0200 Subject: fix struct arphdr alignment on OpenBSD --- src/unix/bsd/netbsdlike/mod.rs | 9 --------- src/unix/bsd/netbsdlike/netbsd/mod.rs | 9 +++++++++ src/unix/bsd/netbsdlike/openbsdlike/mod.rs | 8 ++++++++ 3 files changed, 17 insertions(+), 9 deletions(-) diff --git a/src/unix/bsd/netbsdlike/mod.rs b/src/unix/bsd/netbsdlike/mod.rs index 62a0ffc059..6384a29f8c 100644 --- a/src/unix/bsd/netbsdlike/mod.rs +++ b/src/unix/bsd/netbsdlike/mod.rs @@ -57,15 +57,6 @@ s! { pub l_type: ::c_short, pub l_whence: ::c_short, } - - #[repr(packed)] - pub struct arphdr { - pub ar_hrd: u16, - pub ar_pro: u16, - pub ar_hln: u8, - pub ar_pln: u8, - pub ar_op: u16, - } } pub const D_T_FMT: ::nl_item = 0; diff --git a/src/unix/bsd/netbsdlike/netbsd/mod.rs b/src/unix/bsd/netbsdlike/netbsd/mod.rs index cf1d74842f..065f6bd36a 100644 --- a/src/unix/bsd/netbsdlike/netbsd/mod.rs +++ b/src/unix/bsd/netbsdlike/netbsd/mod.rs @@ -318,6 +318,15 @@ s! { pub ipi_addr: ::in_addr, pub ipi_ifindex: ::c_uint, } + + #[repr(packed)] + pub struct arphdr { + pub ar_hrd: u16, + pub ar_pro: u16, + pub ar_hln: u8, + pub ar_pln: u8, + pub ar_op: u16, + } } pub const AT_FDCWD: ::c_int = -100; diff --git a/src/unix/bsd/netbsdlike/openbsdlike/mod.rs b/src/unix/bsd/netbsdlike/openbsdlike/mod.rs index f75d7b35ac..bf5ddd2e7a 100644 --- a/src/unix/bsd/netbsdlike/openbsdlike/mod.rs +++ b/src/unix/bsd/netbsdlike/openbsdlike/mod.rs @@ -193,6 +193,14 @@ s! { pub gid: ::gid_t, pub pid: ::pid_t, } + + pub struct arphdr { + pub ar_hrd: u16, + pub ar_pro: u16, + pub ar_hln: u8, + pub ar_pln: u8, + pub ar_op: u16, + } } pub const UT_NAMESIZE: usize = 32; -- cgit v1.2.1 From fec9baf0a3752aecdbd372897d23c19368499b47 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Marie?= Date: Sat, 14 Jul 2018 06:58:37 +0200 Subject: remove ignore for published OpenBSD versions --- libc-test/build.rs | 6 ------ 1 file changed, 6 deletions(-) diff --git a/libc-test/build.rs b/libc-test/build.rs index 29e43f6d14..795330ab3f 100644 --- a/libc-test/build.rs +++ b/libc-test/build.rs @@ -538,12 +538,6 @@ fn main() { "KERN_USERMOUNT" | "KERN_ARND" if openbsd => true, - // These constants were added in OpenBSD 6.2 - "EV_RECEIPT" | "EV_DISPATCH" if openbsd => true, - - // These constants were added in OpenBSD 6.3 - "MAP_STACK" if openbsd => true, - // These are either unimplemented or optionally built into uClibc "LC_CTYPE_MASK" | "LC_NUMERIC_MASK" | "LC_TIME_MASK" | "LC_COLLATE_MASK" | "LC_MONETARY_MASK" | "LC_MESSAGES_MASK" | "MADV_MERGEABLE" | "MADV_UNMERGEABLE" | "MADV_HWPOISON" | "IPV6_ADD_MEMBERSHIP" | "IPV6_DROP_MEMBERSHIP" | "IPV6_MULTICAST_LOOP" | "IPV6_V6ONLY" | -- cgit v1.2.1