Add IN6ADDR_ANY_INIT, IN6ADDR_LOOPBACK_INIT, in6addr_any, in6addr_loo…

…pback (backport <rust-lang#3693>) [ move constants to the align module to support old rustc - Trevor ] (cherry picked from commit 8db9bc7)
tgross35 · Aug 28, 2024 · 5320268 · 5320268
1 parent f9aa12d
commit 5320268
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 0 deletions.
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/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: [u32; 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: [u32; 0],
+};