0.3.0: converge relibc to upstream 0.6.0 + Red Bear patches

src/platform/linux/socket.rs

@@ -1,46 +1,64 @@
-use super::{
-    super::{types::*, PalSocket},
-    e, Sys,
+use super::{Sys, e_raw};
+use crate::{
+    error::Result,
+    header::{
+        bits_socklen_t::socklen_t,
+        sys_socket::{msghdr, sockaddr},
+    },
+    platform::{
+        PalSocket,
+        types::{c_int, c_void, size_t},
+    },
 };
-use crate::header::sys_socket::{sockaddr, socklen_t};
 
 impl PalSocket for Sys {
-    unsafe fn accept(socket: c_int, address: *mut sockaddr, address_len: *mut socklen_t) -> c_int {
-        e(syscall!(ACCEPT, socket, address, address_len)) as c_int
+    unsafe fn accept(
+        socket: c_int,
+        address: *mut sockaddr,
+        address_len: *mut socklen_t,
+    ) -> Result<c_int> {
+        Ok(e_raw(syscall!(ACCEPT, socket, address, address_len))? as c_int)
     }
 
-    unsafe fn bind(socket: c_int, address: *const sockaddr, address_len: socklen_t) -> c_int {
-        e(syscall!(BIND, socket, address, address_len)) as c_int
+    unsafe fn bind(socket: c_int, address: *const sockaddr, address_len: socklen_t) -> Result<()> {
+        e_raw(syscall!(BIND, socket, address, address_len))?;
+        Ok(())
     }
 
-    unsafe fn connect(socket: c_int, address: *const sockaddr, address_len: socklen_t) -> c_int {
-        e(syscall!(CONNECT, socket, address, address_len)) as c_int
+    unsafe fn connect(
+        socket: c_int,
+        address: *const sockaddr,
+        address_len: socklen_t,
+    ) -> Result<c_int> {
+        Ok(e_raw(syscall!(CONNECT, socket, address, address_len))? as c_int)
     }
 
     unsafe fn getpeername(
         socket: c_int,
         address: *mut sockaddr,
         address_len: *mut socklen_t,
-    ) -> c_int {
-        e(syscall!(GETPEERNAME, socket, address, address_len)) as c_int
+    ) -> Result<()> {
+        e_raw(syscall!(GETPEERNAME, socket, address, address_len))?;
+        Ok(())
     }
 
     unsafe fn getsockname(
         socket: c_int,
         address: *mut sockaddr,
         address_len: *mut socklen_t,
-    ) -> c_int {
-        e(syscall!(GETSOCKNAME, socket, address, address_len)) as c_int
+    ) -> Result<()> {
+        e_raw(syscall!(GETSOCKNAME, socket, address, address_len))?;
+        Ok(())
     }
 
-    fn getsockopt(
+    unsafe fn getsockopt(
         socket: c_int,
         level: c_int,
         option_name: c_int,
         option_value: *mut c_void,
         option_len: *mut socklen_t,
-    ) -> c_int {
-        e(unsafe {
+    ) -> Result<()> {
+        e_raw(unsafe {
             syscall!(
                 GETSOCKOPT,
                 socket,
@@ -49,11 +67,13 @@ impl PalSocket for Sys {
                 option_value,
                 option_len
             )
-        }) as c_int
+        })?;
+        Ok(())
     }
 
-    fn listen(socket: c_int, backlog: c_int) -> c_int {
-        e(unsafe { syscall!(LISTEN, socket, backlog) }) as c_int
+    fn listen(socket: c_int, backlog: c_int) -> Result<()> {
+        e_raw(unsafe { syscall!(LISTEN, socket, backlog) })?;
+        Ok(())
     }
 
     unsafe fn recvfrom(
@@ -63,8 +83,8 @@ impl PalSocket for Sys {
         flags: c_int,
         address: *mut sockaddr,
         address_len: *mut socklen_t,
-    ) -> ssize_t {
-        e(syscall!(
+    ) -> Result<usize> {
+        e_raw(syscall!(
             RECVFROM,
             socket,
             buf,
@@ -72,7 +92,15 @@ impl PalSocket for Sys {
             flags,
             address,
             address_len
-        )) as ssize_t
+        ))
+    }
+
+    unsafe fn recvmsg(socket: c_int, msg: *mut msghdr, flags: c_int) -> Result<usize> {
+        e_raw(syscall!(RECVMSG, socket, msg, flags))
+    }
+
+    unsafe fn sendmsg(socket: c_int, msg: *const msghdr, flags: c_int) -> Result<usize> {
+        e_raw(syscall!(SENDMSG, socket, msg, flags))
     }
 
     unsafe fn sendto(
@@ -82,20 +110,20 @@ impl PalSocket for Sys {
         flags: c_int,
         dest_addr: *const sockaddr,
         dest_len: socklen_t,
-    ) -> ssize_t {
-        e(syscall!(
+    ) -> Result<usize> {
+        e_raw(syscall!(
             SENDTO, socket, buf, len, flags, dest_addr, dest_len
-        )) as ssize_t
+        ))
     }
 
-    fn setsockopt(
+    unsafe fn setsockopt(
         socket: c_int,
         level: c_int,
         option_name: c_int,
         option_value: *const c_void,
         option_len: socklen_t,
-    ) -> c_int {
-        e(unsafe {
+    ) -> Result<()> {
+        e_raw(unsafe {
             syscall!(
                 SETSOCKOPT,
                 socket,
@@ -104,18 +132,21 @@ impl PalSocket for Sys {
                 option_value,
                 option_len
             )
-        }) as c_int
+        })?;
+        Ok(())
     }
 
-    fn shutdown(socket: c_int, how: c_int) -> c_int {
-        e(unsafe { syscall!(SHUTDOWN, socket, how) }) as c_int
+    fn shutdown(socket: c_int, how: c_int) -> Result<()> {
+        e_raw(unsafe { syscall!(SHUTDOWN, socket, how) })?;
+        Ok(())
     }
 
-    unsafe fn socket(domain: c_int, kind: c_int, protocol: c_int) -> c_int {
-        e(syscall!(SOCKET, domain, kind, protocol)) as c_int
+    unsafe fn socket(domain: c_int, kind: c_int, protocol: c_int) -> Result<c_int> {
+        Ok(e_raw(syscall!(SOCKET, domain, kind, protocol))? as c_int)
     }
 
-    fn socketpair(domain: c_int, kind: c_int, protocol: c_int, sv: &mut [c_int; 2]) -> c_int {
-        e(unsafe { syscall!(SOCKETPAIR, domain, kind, protocol, sv.as_mut_ptr()) }) as c_int
+    fn socketpair(domain: c_int, kind: c_int, protocol: c_int, sv: &mut [c_int; 2]) -> Result<()> {
+        e_raw(unsafe { syscall!(SOCKETPAIR, domain, kind, protocol, sv.as_mut_ptr()) })?;
+        Ok(())
     }
 }