commit a8a817a028aaaf4cedacf65b55bed935342e4af4
author bors <bors@rust-lang.org> Wed Feb 13 10:27:58 2019 +0000
committer bors <bors@rust-lang.org> Wed Feb 13 10:27:58 2019 +0000
tree 6c84701217cd3b46cf8c20d36bcb0331c67a89a8
parent 810b8c6a84ca7234bfa1b2b4bad9b412007b4fda
parent 4d0694ce0b4814eaeafac13ba04eef1255759756

Auto merge of #1252 - vi:ORIGDSTADDR, r=gnzlbg

Add IP[V6]_[RECV]ORIGDSTADDR for Linux and Android

src/unix/notbsd/android/mod.rs

diff --git a/src/unix/notbsd/android/mod.rs b/src/unix/notbsd/android/mod.rs
index 2213b75..df4d5b8 100644
--- a/src/unix/notbsd/android/mod.rs
+++ b/src/unix/notbsd/android/mod.rs
@@ -1266,6 +1266,10 @@
 pub const SOCK_NONBLOCK: ::c_int = O_NONBLOCK;
 
 pub const SO_ORIGINAL_DST: ::c_int = 80;
+pub const IP_ORIGDSTADDR : ::c_int = 20;
+pub const IP_RECVORIGDSTADDR : ::c_int = IP_ORIGDSTADDR;
+pub const IPV6_ORIGDSTADDR : ::c_int = 74;
+pub const IPV6_RECVORIGDSTADDR : ::c_int = IPV6_ORIGDSTADDR;
 pub const IUTF8: ::tcflag_t = 0x00004000;
 pub const CMSPAR: ::tcflag_t = 0o10000000000;
 pub const O_TMPFILE: ::c_int = 0o20000000 | O_DIRECTORY;

src/unix/notbsd/linux/mod.rs

diff --git a/src/unix/notbsd/linux/mod.rs b/src/unix/notbsd/linux/mod.rs
index 03192e6..1ec2a95 100644
--- a/src/unix/notbsd/linux/mod.rs
+++ b/src/unix/notbsd/linux/mod.rs
@@ -1331,6 +1331,10 @@
 pub const ENOATTR: ::c_int = ::ENODATA;
 
 pub const SO_ORIGINAL_DST: ::c_int = 80;
+pub const IP_ORIGDSTADDR : ::c_int = 20;
+pub const IP_RECVORIGDSTADDR : ::c_int = IP_ORIGDSTADDR;
+pub const IPV6_ORIGDSTADDR : ::c_int = 74;
+pub const IPV6_RECVORIGDSTADDR : ::c_int = IPV6_ORIGDSTADDR;
 pub const IUTF8: ::tcflag_t = 0x00004000;
 pub const CMSPAR: ::tcflag_t = 0o10000000000;