sys::socket adding sockopt::LingerSec for Apple targets. (#2572)

Author: devnexen

changelog/2572.added.md

@@ -0,0 +1 @@
+Added `sockopt::LingerSec` for Apple targets

src/sys/socket/sockopt.rs

@@ -372,6 +372,15 @@ sockopt_impl!(
     libc::SO_LINGER,
     libc::linger
 );
+#[cfg(apple_targets)]
+sockopt_impl!(
+    /// Same as `SO_LINGER`, but the duration is in seconds rather than kernel ticks.
+    LingerSec,
+    Both,
+    libc::SOL_SOCKET,
+    libc::SO_LINGER_SEC,
+    libc::linger
+);
 #[cfg(feature = "net")]
 sockopt_impl!(
     #[cfg_attr(docsrs, doc(cfg(feature = "net")))]

test/sys/test_sockopt.rs

@@ -1063,13 +1063,49 @@ fn test_ipv6_recv_traffic_class_opts() {
     );
 }
 
+#[cfg(apple_targets)]
+#[test]
+fn test_linger_sec() {
+    let fd = socket(
+        AddressFamily::Inet,
+        SockType::Stream,
+        SockFlag::empty(),
+        None,
+    )
+    .unwrap();
+
+    let set_linger = libc::linger {
+        l_onoff: 1,
+        l_linger: 1,
+    };
+    setsockopt(&fd, sockopt::LingerSec, &set_linger).unwrap();
+
+    let get_linger = getsockopt(&fd, sockopt::Linger).unwrap();
+    assert_eq!(get_linger.l_linger, set_linger.l_linger * 100);
+}
+
 /// Users should be able to define their own sockopts.
 mod sockopt_impl {
     use nix::sys::socket::{
         getsockopt, setsockopt, socket, AddressFamily, SockFlag, SockProtocol,
         SockType,
     };
 
+    sockopt_impl!(KeepAlive, Both, libc::SOL_SOCKET, libc::SO_KEEPALIVE, bool);
+
+    #[test]
+    fn test_so_tcp_keepalive() {
+        let fd = socket(
+            AddressFamily::Inet,
+            SockType::Stream,
+            SockFlag::empty(),
+            SockProtocol::Tcp,
+        )
+        .unwrap();
+        setsockopt(&fd, KeepAlive, &true).unwrap();
+        assert!(getsockopt(&fd, KeepAlive).unwrap());
+    }
+
     sockopt_impl!(
         Linger,
         Both,
@@ -1096,19 +1132,4 @@ mod sockopt_impl {
         let get_linger = getsockopt(&fd, Linger).unwrap();
         assert_eq!(get_linger.l_linger, set_linger.l_linger);
     }
-
-    sockopt_impl!(KeepAlive, Both, libc::SOL_SOCKET, libc::SO_KEEPALIVE, bool);
-
-    #[test]
-    fn test_so_tcp_keepalive() {
-        let fd = socket(
-            AddressFamily::Inet,
-            SockType::Stream,
-            SockFlag::empty(),
-            SockProtocol::Tcp,
-        )
-        .unwrap();
-        setsockopt(&fd, KeepAlive, &true).unwrap();
-        assert!(getsockopt(&fd, KeepAlive).unwrap());
-    }
 }