OpenBSD: add sendmmsg and recvmmsg support.

(backport <rust-lang#3831>) (cherry picked from commit c369185)
tgross35 · Aug 29, 2024 · 9b88c55 · 9b88c55
1 parent 4c0eaac
commit 9b88c55
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 19 deletions.
diff --git a/libc-test/semver/openbsd.txt b/libc-test/semver/openbsd.txt
@@ -1137,6 +1137,7 @@ mknodat
 mkostemp
 mkostemps
 mkstemps
+mmsghdr
 mount_info
 mrand48
 msdosfs_args
@@ -1216,6 +1217,7 @@ readlinkat
 reallocarray
 reboot
 recvmsg
+recvmmsg
 regcomp
 regerror
 regex_t
@@ -1237,6 +1239,7 @@ sem_init
 sem_open
 sem_timedwait
 sem_unlink
+sendmmsg
 sendmsg
 setdomainname
 setgrent

diff --git a/src/unix/bsd/netbsdlike/mod.rs b/src/unix/bsd/netbsdlike/mod.rs
@@ -92,6 +92,11 @@ s! {
         pub piod_addr: *mut ::c_void,
         pub piod_len: ::size_t,
     }
+
+    pub struct mmsghdr {
+        pub msg_hdr: ::msghdr,
+        pub msg_len: ::c_uint,
+    }
 }
 
 pub const D_T_FMT: ::nl_item = 0;
@@ -848,6 +853,20 @@ extern "C" {
     pub fn dirname(path: *mut ::c_char) -> *mut ::c_char;
     pub fn basename(path: *mut ::c_char) -> *mut ::c_char;
     pub fn getentropy(buf: *mut ::c_void, buflen: ::size_t) -> ::c_int;
+
+    pub fn sendmmsg(
+        sockfd: ::c_int,
+        mmsg: *mut ::mmsghdr,
+        vlen: ::c_uint,
+        flags: ::c_int,
+    ) -> ::c_int;
+    pub fn recvmmsg(
+        sockfd: ::c_int,
+        mmsg: *mut ::mmsghdr,
+        vlen: ::c_uint,
+        flags: ::c_int,
+        timeout: *mut ::timespec,
+    ) -> ::c_int;
 }
 
 cfg_if! {

diff --git a/src/unix/bsd/netbsdlike/netbsd/mod.rs b/src/unix/bsd/netbsdlike/netbsd/mod.rs
@@ -401,11 +401,6 @@ s! {
         pub sdl_data: [::c_char; 12],
     }
 
-    pub struct mmsghdr {
-        pub msg_hdr: ::msghdr,
-        pub msg_len: ::c_uint,
-    }
-
     pub struct __exit_status {
         pub e_termination: u16,
         pub e_exit: u16,
@@ -2781,20 +2776,6 @@ extern "C" {
 
     pub fn kqueue1(flags: ::c_int) -> ::c_int;
 
-    pub fn sendmmsg(
-        sockfd: ::c_int,
-        msgvec: *mut ::mmsghdr,
-        vlen: ::c_uint,
-        flags: ::c_int,
-    ) -> ::c_int;
-    pub fn recvmmsg(
-        sockfd: ::c_int,
-        msgvec: *mut ::mmsghdr,
-        vlen: ::c_uint,
-        flags: ::c_int,
-        timeout: *mut ::timespec,
-    ) -> ::c_int;
-
     pub fn _lwp_self() -> lwpid_t;
     pub fn memmem(
         haystack: *const ::c_void,