Add trait to reduce duplicated code between socket address types, implement netlink addresses

src/backend/libc/net/msghdr.rs

@@ -5,15 +5,9 @@
 
 use crate::backend::c;
 use crate::backend::conv::{msg_control_len, msg_iov_len};
-#[cfg(target_os = "linux")]
-use crate::backend::net::write_sockaddr::encode_sockaddr_xdp;
-use crate::backend::net::write_sockaddr::{encode_sockaddr_v4, encode_sockaddr_v6};
 
 use crate::io::{self, IoSlice, IoSliceMut};
-#[cfg(target_os = "linux")]
-use crate::net::xdp::SocketAddrXdp;
-use crate::net::{RecvAncillaryBuffer, SendAncillaryBuffer, SocketAddrV4, SocketAddrV6};
-use crate::utils::as_ptr;
+use crate::net::{RecvAncillaryBuffer, SendAncillaryBuffer, SockAddr};
 
 use core::mem::{size_of, zeroed, MaybeUninit};
 
@@ -66,87 +60,24 @@ pub(crate) fn with_noaddr_msghdr<R>(
     })
 }
 
-/// Create a message header intended to send with an IPv4 address.
-pub(crate) fn with_v4_msghdr<R>(
-    addr: &SocketAddrV4,
+/// Create a message header intended to send with the specified address.
+pub(crate) fn with_msghdr<R>(
+    addr: &impl SockAddr,
     iov: &[IoSlice<'_>],
     control: &mut SendAncillaryBuffer<'_, '_, '_>,
     f: impl FnOnce(c::msghdr) -> R,
 ) -> R {
-    let encoded = encode_sockaddr_v4(addr);
-
-    f({
-        let mut h = zero_msghdr();
-        h.msg_name = as_ptr(&encoded) as _;
-        h.msg_namelen = size_of::<SocketAddrV4>() as _;
-        h.msg_iov = iov.as_ptr() as _;
-        h.msg_iovlen = msg_iov_len(iov.len());
-        h.msg_control = control.as_control_ptr().cast();
-        h.msg_controllen = msg_control_len(control.control_len());
-        h
-    })
-}
-
-/// Create a message header intended to send with an IPv6 address.
-pub(crate) fn with_v6_msghdr<R>(
-    addr: &SocketAddrV6,
-    iov: &[IoSlice<'_>],
-    control: &mut SendAncillaryBuffer<'_, '_, '_>,
-    f: impl FnOnce(c::msghdr) -> R,
-) -> R {
-    let encoded = encode_sockaddr_v6(addr);
-
-    f({
-        let mut h = zero_msghdr();
-        h.msg_name = as_ptr(&encoded) as _;
-        h.msg_namelen = size_of::<SocketAddrV6>() as _;
-        h.msg_iov = iov.as_ptr() as _;
-        h.msg_iovlen = msg_iov_len(iov.len());
-        h.msg_control = control.as_control_ptr().cast();
-        h.msg_controllen = msg_control_len(control.control_len());
-        h
-    })
-}
-
-/// Create a message header intended to send with a Unix address.
-#[cfg(all(unix, not(target_os = "redox")))]
-pub(crate) fn with_unix_msghdr<R>(
-    addr: &crate::net::SocketAddrUnix,
-    iov: &[IoSlice<'_>],
-    control: &mut SendAncillaryBuffer<'_, '_, '_>,
-    f: impl FnOnce(c::msghdr) -> R,
-) -> R {
-    f({
-        let mut h = zero_msghdr();
-        h.msg_name = as_ptr(&addr.unix) as _;
-        h.msg_namelen = addr.addr_len();
-        h.msg_iov = iov.as_ptr() as _;
-        h.msg_iovlen = msg_iov_len(iov.len());
-        h.msg_control = control.as_control_ptr().cast();
-        h.msg_controllen = msg_control_len(control.control_len());
-        h
-    })
-}
-
-/// Create a message header intended to send with an IPv6 address.
-#[cfg(target_os = "linux")]
-pub(crate) fn with_xdp_msghdr<R>(
-    addr: &SocketAddrXdp,
-    iov: &[IoSlice<'_>],
-    control: &mut SendAncillaryBuffer<'_, '_, '_>,
-    f: impl FnOnce(c::msghdr) -> R,
-) -> R {
-    let encoded = encode_sockaddr_xdp(addr);
-
-    f({
-        let mut h = zero_msghdr();
-        h.msg_name = as_ptr(&encoded) as _;
-        h.msg_namelen = size_of::<SocketAddrXdp>() as _;
-        h.msg_iov = iov.as_ptr() as _;
-        h.msg_iovlen = msg_iov_len(iov.len());
-        h.msg_control = control.as_control_ptr().cast();
-        h.msg_controllen = msg_control_len(control.control_len());
-        h
+    addr.with_sockaddr(|addr_ptr, addr_len| {
+        f({
+            let mut h = zero_msghdr();
+            h.msg_name = addr_ptr as *mut _;
+            h.msg_namelen = addr_len as c::socklen_t;
+            h.msg_iov = iov.as_ptr() as _;
+            h.msg_iovlen = msg_iov_len(iov.len());
+            h.msg_control = control.as_control_ptr().cast();
+            h.msg_controllen = msg_control_len(control.control_len());
+            h
+        })
     })
 }
 

src/backend/libc/net/read_sockaddr.rs

@@ -9,6 +9,8 @@ use crate::backend::c;
 use crate::ffi::CStr;
 use crate::io;
 #[cfg(target_os = "linux")]
+use crate::net::netlink::SocketAddrNetlink;
+#[cfg(target_os = "linux")]
 use crate::net::xdp::{SockaddrXdpFlags, SocketAddrXdp};
 use crate::net::{Ipv4Addr, Ipv6Addr, SocketAddrAny, SocketAddrV4, SocketAddrV6};
 use core::mem::size_of;
@@ -210,6 +212,17 @@ pub(crate) unsafe fn read_sockaddr(
                 u32::from_be(decode.sxdp_shared_umem_fd),
             )))
         }
+        #[cfg(target_os = "linux")]
+        c::AF_NETLINK => {
+            if len < size_of::<c::sockaddr_nl>() {
+                return Err(io::Errno::INVAL);
+            }
+            let decode = &*storage.cast::<c::sockaddr_nl>();
+            Ok(SocketAddrAny::Netlink(SocketAddrNetlink::new(
+                decode.nl_pid,
+                decode.nl_groups,
+            )))
+        }
         _ => Err(io::Errno::INVAL),
     }
 }
@@ -329,6 +342,12 @@ unsafe fn inner_read_sockaddr_os(
                 u32::from_be(decode.sxdp_shared_umem_fd),
             ))
         }
+        #[cfg(target_os = "linux")]
+        c::AF_NETLINK => {
+            assert!(len >= size_of::<c::sockaddr_nl>());
+            let decode = &*storage.cast::<c::sockaddr_nl>();
+            SocketAddrAny::Netlink(SocketAddrNetlink::new(decode.nl_pid, decode.nl_groups))
+        }
         other => unimplemented!("{:?}", other),
     }
 }