Change Socket::set_nosigpipe to accept a bool

Same as Socket::set_nonblocking. Also add test for it.

Author: Thomasdezeeuw

src/socket.rs

@@ -78,7 +78,7 @@ use crate::{Domain, Protocol, SockAddr, Type};
 ///
 /// // On macOS and iOS set `NOSIGPIPE`.
 /// #[cfg(target_vendor = "apple")]
-/// socket.set_nosigpipe()?;
+/// socket.set_nosigpipe(true)?;
 ///
 /// # drop(socket);
 /// # Ok(())

src/sys/unix.rs

@@ -9,7 +9,7 @@
 #[cfg(not(target_os = "redox"))]
 use std::io::{IoSlice, IoSliceMut};
 use std::io::{Read, Write};
-use std::mem::{self, size_of_val, MaybeUninit};
+use std::mem::{self, size_of, size_of_val, MaybeUninit};
 use std::net::Shutdown;
 use std::net::{self, Ipv4Addr, Ipv6Addr};
 #[cfg(feature = "all")]
@@ -435,8 +435,15 @@ impl crate::Socket {
     ///
     /// Only supported on Apple platforms (`target_vendor = "apple"`).
     #[cfg(all(feature = "all", target_vendor = "apple"))]
-    pub fn set_nosigpipe(&self) -> io::Result<()> {
-        unsafe { setsockopt(self.inner, libc::SOL_SOCKET, libc::SO_NOSIGPIPE, 1i32) }
+    pub fn set_nosigpipe(&self, nosigpipe: bool) -> io::Result<()> {
+        unsafe {
+            setsockopt::<c_int>(
+                self.inner,
+                libc::SOL_SOCKET,
+                libc::SO_NOSIGPIPE,
+                nosigpipe as _,
+            )
+        }
     }
 }
 
@@ -467,7 +474,7 @@ fn fcntl_remove(fd: SysSocket, get_cmd: c_int, set_cmd: c_int, flag: c_int) -> i
 /// Caller must ensure `T` is the correct type for `opt` and `val`.
 unsafe fn getsockopt<T>(fd: SysSocket, opt: c_int, val: c_int) -> io::Result<T> {
     let mut payload: MaybeUninit<T> = MaybeUninit::uninit();
-    let mut len = mem::size_of::<T>() as libc::socklen_t;
+    let mut len = size_of::<T>() as libc::socklen_t;
     syscall!(getsockopt(
         fd,
         opt,
@@ -476,18 +483,15 @@ unsafe fn getsockopt<T>(fd: SysSocket, opt: c_int, val: c_int) -> io::Result<T>
         &mut len,
     ))
     .map(|_| {
-        debug_assert_eq!(len as usize, mem::size_of::<T>());
+        debug_assert_eq!(len as usize, size_of::<T>());
         // Safety: `getsockopt` initialised `payload` for us.
         payload.assume_init()
     })
 }
 
 /// Caller must ensure `T` is the correct type for `opt` and `val`.
 #[cfg(all(feature = "all", target_vendor = "apple"))]
-unsafe fn setsockopt<T>(fd: SysSocket, opt: c_int, val: c_int, payload: T) -> io::Result<()>
-where
-    T: Copy,
-{
+unsafe fn setsockopt<T>(fd: SysSocket, opt: c_int, val: c_int, payload: T) -> io::Result<()> {
     let payload = &payload as *const T as *const c_void;
     syscall!(setsockopt(
         fd,
@@ -499,6 +503,15 @@ where
     .map(|_| ())
 }
 
+/*
+            setsockopt::<c_int>(
+                self.inner,
+                libc::SOL_SOCKET,
+                libc::SO_NOSIGPIPE,
+                nosigpipe as _,
+            )
+*/
+
 #[repr(transparent)] // Required during rewriting.
 pub struct Socket {
     fd: SysSocket,

tests/socket.rs

@@ -1,4 +1,4 @@
-#[cfg(windows)]
+#[cfg(any(windows, all(feature = "all", target_vendor = "apple")))]
 use std::io;
 #[cfg(unix)]
 use std::os::unix::io::AsRawFd;
@@ -142,3 +142,43 @@ where
         "FLAG_INHERIT option"
     );
 }
+
+#[cfg(all(feature = "all", target_vendor = "apple"))]
+#[test]
+fn set_nosigpipe() {
+    let socket = Socket::new(Domain::IPV4, Type::STREAM, None).unwrap();
+    assert_flag_no_sigpipe(&socket, false);
+
+    socket.set_nosigpipe(true).unwrap();
+    assert_flag_no_sigpipe(&socket, true);
+
+    socket.set_nosigpipe(false).unwrap();
+    assert_flag_no_sigpipe(&socket, false);
+}
+
+/// Assert that `SO_NOSIGPIPE` is set on `socket`.
+#[cfg(all(feature = "all", target_vendor = "apple"))]
+#[track_caller]
+pub fn assert_flag_no_sigpipe<S>(socket: &S, want: bool)
+where
+    S: AsRawFd,
+{
+    use std::mem::size_of;
+    let mut flags: libc::c_int = 0;
+    let mut length = size_of::<libc::c_int>() as libc::socklen_t;
+    let res = unsafe {
+        libc::getsockopt(
+            socket.as_raw_fd(),
+            libc::SOL_SOCKET,
+            libc::SO_NOSIGPIPE,
+            &mut flags as *mut _ as *mut _,
+            &mut length,
+        )
+    };
+    if res != 0 {
+        let err = io::Error::last_os_error();
+        panic!("unexpected error: {}", err);
+    }
+    assert_eq!(length as usize, size_of::<libc::c_int>());
+    assert_eq!(flags, want as _, "non-blocking option");
+}