Auto merge of #2625 - tamird:ip_mreqn, r=Amanieu

Add `ip_mreqn` on more platforms See individual commits; please do not squash on merge. `@Thomasdezeeuw`
rust-lang · Jan 17, 2022 · 8cba30b · 8cba30b
2 parents df679e8 + 037d741
commit 8cba30b
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 0 deletions.
diff --git a/libc-test/semver/android.txt b/libc-test/semver/android.txt
@@ -2844,6 +2844,7 @@ intptr_t
 ioctl
 iovec
 ip_mreq
+ip_mreqn
 ip_mreq_source
 ipv6_mreq
 isalnum

diff --git a/libc-test/semver/apple.txt b/libc-test/semver/apple.txt
@@ -1724,6 +1724,7 @@ in6_pktinfo
 in_pktinfo
 initgroups
 integer_t
+ip_mreqn
 ipc_perm
 kern_return_t
 kevent

diff --git a/libc-test/semver/freebsd.txt b/libc-test/semver/freebsd.txt
@@ -1536,6 +1536,7 @@ if_nameindex
 ifaddrs
 in6_pktinfo
 initgroups
+ip_mreqn
 ipc_perm
 jail
 jail_attach

diff --git a/src/unix/bsd/apple/mod.rs b/src/unix/bsd/apple/mod.rs
@@ -215,6 +215,12 @@ s! {
         pub imr_interface: in_addr,
     }
 
+    pub struct ip_mreqn {
+        pub imr_multiaddr: in_addr,
+        pub imr_address: in_addr,
+        pub imr_ifindex: ::c_int,
+    }
+
     pub struct aiocb {
         pub aio_fildes: ::c_int,
         pub aio_offset: ::off_t,

diff --git a/src/unix/bsd/freebsdlike/mod.rs b/src/unix/bsd/freebsdlike/mod.rs
@@ -90,6 +90,12 @@ s! {
         pub imr_interface: in_addr,
     }
 
+    pub struct ip_mreqn {
+        pub imr_multiaddr: in_addr,
+        pub imr_address: in_addr,
+        pub imr_ifindex: ::c_int,
+    }
+
     pub struct glob_t {
         pub gl_pathc:  ::size_t,
         pub gl_matchc: ::size_t,

diff --git a/src/unix/linux_like/android/mod.rs b/src/unix/linux_like/android/mod.rs
@@ -73,6 +73,12 @@ s! {
         pub cmsg_type: ::c_int,
     }
 
+    pub struct ip_mreqn {
+        pub imr_multiaddr: ::in_addr,
+        pub imr_address: ::in_addr,
+        pub imr_ifindex: ::c_int,
+    }
+
     pub struct termios {
         pub c_iflag: ::tcflag_t,
         pub c_oflag: ::tcflag_t,