Merge pull request #3871 from tgross35/backport-garlic

[0.2] Backport four pull requests
rust-lang · Aug 29, 2024 · 8b5330f · 8b5330f
2 parents f9aa12d + f90afef
commit 8b5330f
Show file tree

Hide file tree

Showing 10 changed files with 65 additions and 0 deletions.
diff --git a/libc-test/semver/android.txt b/libc-test/semver/android.txt
@@ -1503,11 +1503,16 @@ NFT_CMP_LT
 NFT_CMP_LTE
 NFT_CMP_NEQ
 NFT_CONTINUE
+NFT_CT_AVGPKT
 NFT_CT_BYTES
 NFT_CT_DIRECTION
 NFT_CT_DST
+NFT_CT_DST_IP
+NFT_CT_DST_IP6
+NFT_CT_EVENTMASK
 NFT_CT_EXPIRATION
 NFT_CT_HELPER
+NFT_CT_ID
 NFT_CT_L3PROTOCOL
 NFT_CT_LABELS
 NFT_CT_MARK
@@ -1517,8 +1522,11 @@ NFT_CT_PROTO_DST
 NFT_CT_PROTO_SRC
 NFT_CT_SECMARK
 NFT_CT_SRC
+NFT_CT_SRC_IP
+NFT_CT_SRC_IP6
 NFT_CT_STATE
 NFT_CT_STATUS
+NFT_CT_ZONE
 NFT_DATA_RESERVED_MASK
 NFT_DATA_VALUE
 NFT_DATA_VALUE_MAXLEN

diff --git a/libc-test/semver/linux-gnu.txt b/libc-test/semver/linux-gnu.txt
@@ -191,9 +191,13 @@ NFT_CMP_LT
 NFT_CMP_LTE
 NFT_CMP_NEQ
 NFT_CONTINUE
+NFT_CT_AVGPKT
 NFT_CT_BYTES
 NFT_CT_DIRECTION
 NFT_CT_DST
+NFT_CT_DST_IP
+NFT_CT_DST_IP6
+NFT_CT_EVENTMASK
 NFT_CT_EXPIRATION
 NFT_CT_HELPER
 NFT_CT_L3PROTOCOL
@@ -205,8 +209,11 @@ NFT_CT_PROTO_DST
 NFT_CT_PROTO_SRC
 NFT_CT_SECMARK
 NFT_CT_SRC
+NFT_CT_SRC_IP
+NFT_CT_SRC_IP6
 NFT_CT_STATE
 NFT_CT_STATUS
+NFT_CT_ZONE
 NFT_DATA_RESERVED_MASK
 NFT_DATA_VALUE
 NFT_DATA_VALUE_MAXLEN
@@ -650,6 +657,7 @@ malloc_info
 malloc_trim
 malloc_usable_size
 mallopt
+mq_notify
 nl_mmap_hdr
 nl_mmap_req
 nl_pktinfo

diff --git a/libc-test/semver/unix.txt b/libc-test/semver/unix.txt
@@ -152,6 +152,8 @@ IF_NAMESIZE
 IGNBRK
 IGNCR
 IGNPAR
+IN6ADDR_ANY_INIT
+IN6ADDR_LOOPBACK_INIT
 INADDR_ANY
 INADDR_BROADCAST
 INADDR_LOOPBACK
@@ -586,6 +588,8 @@ hstrerror
 if_indextoname
 if_nametoindex
 in6_addr
+in6addr_any
+in6addr_loopback
 in_addr
 in_addr_t
 in_port_t

diff --git a/src/unix/align.rs b/src/unix/align.rs
@@ -4,3 +4,11 @@ s! {
         pub s6_addr: [u8; 16],
     }
 }
+
+pub const IN6ADDR_LOOPBACK_INIT: in6_addr = in6_addr {
+    s6_addr: [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1],
+};
+
+pub const IN6ADDR_ANY_INIT: in6_addr = in6_addr {
+    s6_addr: [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+};
diff --git a/src/unix/hurd/mod.rs b/src/unix/hurd/mod.rs
@@ -450,6 +450,11 @@ s! {
         pub tv_nsec: __syscall_slong_t,
     }
 
+    pub struct __timeval {
+        pub tv_sec: i32,
+        pub tv_usec: i32,
+    }
+
     pub struct __locale_data {
         pub _address: u8,
     }

diff --git a/src/unix/linux_like/android/mod.rs b/src/unix/linux_like/android/mod.rs
@@ -2572,6 +2572,14 @@ pub const NFT_CT_PROTO_DST: ::c_int = 12;
 pub const NFT_CT_LABELS: ::c_int = 13;
 pub const NFT_CT_PKTS: ::c_int = 14;
 pub const NFT_CT_BYTES: ::c_int = 15;
+pub const NFT_CT_AVGPKT: ::c_int = 16;
+pub const NFT_CT_ZONE: ::c_int = 17;
+pub const NFT_CT_EVENTMASK: ::c_int = 18;
+pub const NFT_CT_SRC_IP: ::c_int = 19;
+pub const NFT_CT_DST_IP: ::c_int = 20;
+pub const NFT_CT_SRC_IP6: ::c_int = 21;
+pub const NFT_CT_DST_IP6: ::c_int = 22;
+pub const NFT_CT_ID: ::c_int = 23;
 
 pub const NFT_LIMIT_PKTS: ::c_int = 0;
 pub const NFT_LIMIT_PKT_BYTES: ::c_int = 1;

diff --git a/src/unix/linux_like/linux/gnu/mod.rs b/src/unix/linux_like/linux/gnu/mod.rs
@@ -1541,6 +1541,8 @@ extern "C" {
 
     // Added in `glibc` 2.34
     pub fn close_range(first: ::c_uint, last: ::c_uint, flags: ::c_int) -> ::c_int;
+
+    pub fn mq_notify(mqdes: ::mqd_t, sevp: *const ::sigevent) -> ::c_int;
 }
 
 cfg_if! {

diff --git a/src/unix/linux_like/linux/mod.rs b/src/unix/linux_like/linux/mod.rs
@@ -3980,6 +3980,13 @@ pub const NFT_CT_PROTO_DST: ::c_int = 12;
 pub const NFT_CT_LABELS: ::c_int = 13;
 pub const NFT_CT_PKTS: ::c_int = 14;
 pub const NFT_CT_BYTES: ::c_int = 15;
+pub const NFT_CT_AVGPKT: ::c_int = 16;
+pub const NFT_CT_ZONE: ::c_int = 17;
+pub const NFT_CT_EVENTMASK: ::c_int = 18;
+pub const NFT_CT_SRC_IP: ::c_int = 19;
+pub const NFT_CT_DST_IP: ::c_int = 20;
+pub const NFT_CT_SRC_IP6: ::c_int = 21;
+pub const NFT_CT_DST_IP6: ::c_int = 22;
 
 pub const NFT_LIMIT_PKTS: ::c_int = 0;
 pub const NFT_LIMIT_PKT_BYTES: ::c_int = 1;

diff --git a/src/unix/mod.rs b/src/unix/mod.rs
@@ -313,6 +313,11 @@ pub const ATF_PERM: ::c_int = 0x04;
 pub const ATF_PUBL: ::c_int = 0x08;
 pub const ATF_USETRAILERS: ::c_int = 0x10;
 
+extern "C" {
+    pub static in6addr_loopback: in6_addr;
+    pub static in6addr_any: in6_addr;
+}
+
 cfg_if! {
     if #[cfg(any(target_os = "l4re", target_os = "espidf"))] {
         // required libraries for L4Re and the ESP-IDF framework are linked externally, ATM

diff --git a/src/unix/no_align.rs b/src/unix/no_align.rs
@@ -4,3 +4,13 @@ s! {
         __align: [u32; 0],
     }
 }
+
+pub const IN6ADDR_LOOPBACK_INIT: in6_addr = in6_addr {
+    s6_addr: [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1],
+    __align: [0u32; 0],
+};
+
+pub const IN6ADDR_ANY_INIT: in6_addr = in6_addr {
+    s6_addr: [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+    __align: [0u32; 0],
+};