changes from feedback

Author: devnexen

src/sys/socket/sockopt.rs

@@ -1,8 +1,8 @@
 //! Socket options as used by `setsockopt` and `getsockopt`.
-#[cfg(linux_android)]
+#[cfg(any(linux_android, target_os = "illumos"))]
 use super::SetSockOpt;
 use crate::sys::time::TimeVal;
-#[cfg(linux_android)]
+#[cfg(any(linux_android, target_os = "illumos"))]
 use crate::{errno::Errno, Result};
 use cfg_if::cfg_if;
 use libc::{self, c_int, c_void, socklen_t};
@@ -11,7 +11,7 @@ use std::ffi::CString;
 use std::ffi::{CStr, OsStr, OsString};
 use std::mem::{self, MaybeUninit};
 use std::os::unix::ffi::OsStrExt;
-#[cfg(linux_android)]
+#[cfg(any(linux_android, target_os = "illumos"))]
 use std::os::unix::io::{AsFd, AsRawFd};
 
 // Constants
@@ -20,6 +20,10 @@ use std::os::unix::io::{AsFd, AsRawFd};
 #[cfg(feature = "net")]
 const TCP_CA_NAME_MAX: usize = 16;
 
+#[cfg(target_os = "illumos")]
+#[cfg(feature = "net")]
+const FILNAME_MAX: usize = 32;
+
 /// Helper for implementing `SetSockOpt` for a given socket option. See
 /// [`::sys::socket::SetSockOpt`](sys/socket/trait.SetSockOpt.html).
 ///
@@ -987,25 +991,6 @@ sockopt_impl!(
     libc::SO_ACCEPTFILTER,
     libc::accept_filter_arg
 );
-#[cfg(target_os = "illumos")]
-sockopt_impl!(
-    /// Attach a named filter to this socket to be able to
-    /// defer when anough byte had been buffered by the kernel
-    FilAttach,
-    SetOnly,
-    libc::SOL_FILTER,
-    libc::FIL_ATTACH,
-    SetOsString<'static>
-);
-#[cfg(target_os = "illumos")]
-sockopt_impl!(
-    /// Detach a socket filter previously attached with FIL_ATTACH
-    FilDetach,
-    SetOnly,
-    libc::SOL_FILTER,
-    libc::FIL_DETACH,
-    SetOsString<'static>
-);
 #[cfg(target_os = "linux")]
 sockopt_impl!(
     /// Set the mark for each packet sent through this socket (similar to the
@@ -1501,6 +1486,78 @@ impl SetSockOpt for TcpTlsRx {
     }
 }
 
+#[cfg(target_os = "illumos")]
+#[derive(Copy, Clone, Debug)]
+/// Attach a named filter to this socket to be able to
+/// defer when anough byte had been buffered by the kernel
+pub struct FilterAttach<'a> {
+    _marker: std::marker::PhantomData<&'a ()>,
+}
+
+impl<'a> FilterAttach<'a> {
+    #[allow(missing_docs)]
+    pub fn new() -> Self {
+        Self {
+            _marker: std::marker::PhantomData,
+        }
+    }
+}
+
+impl<'a> SetSockOpt for FilterAttach<'a> {
+    type Val = &'a OsStr;
+
+    fn set<F: AsFd>(&self, fd: &F, val: &Self::Val) -> Result<()> {
+        if val.len() > FILNAME_MAX {
+            return Err(Errno::EINVAL);
+        }
+        unsafe {
+            let res = libc::setsockopt(
+                fd.as_fd().as_raw_fd(),
+                libc::SOL_FILTER,
+                libc::FIL_ATTACH,
+                val.to_string_lossy().as_ptr().cast(),
+                val.len() as libc::socklen_t,
+            );
+            Errno::result(res).map(drop)
+        }
+    }
+}
+
+#[cfg(target_os = "illumos")]
+#[derive(Copy, Clone, Debug)]
+/// Detach a socket filter previously attached with FIL_ATTACH
+pub struct FilterDetach<'a> {
+    _marker: std::marker::PhantomData<&'a ()>,
+}
+
+impl<'a> FilterDetach<'a> {
+    #[allow(missing_docs)]
+    pub fn new() -> Self {
+        Self {
+            _marker: std::marker::PhantomData,
+        }
+    }
+}
+
+impl<'a> SetSockOpt for FilterDetach<'a> {
+    type Val = &'a OsStr;
+
+    fn set<F: AsFd>(&self, fd: &F, val: &Self::Val) -> Result<()> {
+        if val.len() > FILNAME_MAX {
+            return Err(Errno::EINVAL);
+        }
+        unsafe {
+            let res = libc::setsockopt(
+                fd.as_fd().as_raw_fd(),
+                libc::SOL_FILTER,
+                libc::FIL_DETACH,
+                val.to_string_lossy().as_ptr().cast(),
+                val.len() as libc::socklen_t,
+            );
+            Errno::result(res).map(drop)
+        }
+    }
+}
 /*
  *
  * ===== Accessor helpers =====