summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2019-02-18 16:00:56 +0000
committerbors <bors@rust-lang.org>2019-02-18 16:00:56 +0000
commit0e1fbe33e9b1789f9a73ac47ea454cb48f601058 (patch)
tree8f2d87556396d897a7b4a5c3b0b4a8d2e7ea2c11
parentd7a1995a8745bf56ea5762ca5962ef5d20b2fb94 (diff)
parent486de2ba2bb3eb7f535fdbbae3da757abb6702dd (diff)
downloadrust-libc-0e1fbe33e9b1789f9a73ac47ea454cb48f601058.tar.gz
Auto merge of #1257 - vi:ORIGDSTADDR, r=gnzlbg
Add IP_ORIGDSTADDR and others on FreeBSD. A follow-up from #1252. CC @asomers. r? @gnzlbg
-rw-r--r--libc-test/build.rs10
-rw-r--r--src/unix/bsd/freebsdlike/freebsd/mod.rs8
2 files changed, 18 insertions, 0 deletions
diff --git a/libc-test/build.rs b/libc-test/build.rs
index e0bd795bb0..662273ae41 100644
--- a/libc-test/build.rs
+++ b/libc-test/build.rs
@@ -725,6 +725,16 @@ fn do_ctest() {
s if ios && s.starts_with("RTV_") => true,
s if ios && s.starts_with("DLT_") => true,
+ | "IP_ORIGDSTADDR"
+ | "IP_RECVORIGDSTADDR"
+ | "IPV6_ORIGDSTADDR"
+ | "IPV6_RECVORIGDSTADDR"
+ if freebsd =>
+ {
+ // FreeBSD 12 required, but CI has FreeBSD 11.
+ true
+ }
+
_ => false,
}
});
diff --git a/src/unix/bsd/freebsdlike/freebsd/mod.rs b/src/unix/bsd/freebsdlike/freebsd/mod.rs
index 573c096634..061daa49d8 100644
--- a/src/unix/bsd/freebsdlike/freebsd/mod.rs
+++ b/src/unix/bsd/freebsdlike/freebsd/mod.rs
@@ -828,8 +828,16 @@ pub const TCP_PCAP_OUT: ::c_int = 2048;
pub const TCP_PCAP_IN: ::c_int = 4096;
pub const IP_BINDANY: ::c_int = 24;
+pub const IP_BINDMULTI: ::c_int = 25;
+pub const IP_RSS_LISTEN_BUCKET: ::c_int = 26;
+pub const IP_ORIGDSTADDR : ::c_int = 27;
+pub const IP_RECVORIGDSTADDR : ::c_int = IP_ORIGDSTADDR;
+
pub const IP_RECVTOS: ::c_int = 68;
+pub const IPV6_ORIGDSTADDR: ::c_int = 72;
+pub const IPV6_RECVORIGDSTADDR: ::c_int = IPV6_ORIGDSTADDR;
+
pub const PF_SLOW: ::c_int = AF_SLOW;
pub const PF_SCLUSTER: ::c_int = AF_SCLUSTER;
pub const PF_ARP: ::c_int = AF_ARP;