Make SockAddr::from_raw_socket take a socklen_t instead of a usize

Author: coolreader18

src/ifaddrs.rs

@@ -67,7 +67,7 @@ impl InterfaceAddress {
                 libc::AF_NETLINK => mem::size_of::<libc::sockaddr_nl>(),
                 _ => return None,
             };
-            unsafe { SockAddr::from_raw_sockaddr(sa, len) }.ok()
+            unsafe { SockAddr::from_raw_sockaddr(sa, len as libc::socklen_t) }.ok()
         };
         let address = get_sockaddr(info.ifa_addr);
         let netmask = get_sockaddr(info.ifa_netmask);

src/sys/socket/addr.rs

@@ -820,15 +820,16 @@ impl SockAddr {
     /// let mut addr = mem::MaybeUninit::<sockaddr_storage>::uninit();
     /// let mut addrlen = mem::size_of::<sockaddr_storage>() as socklen_t;
     /// unsafe { get_me_an_address(addr.as_mut_ptr() as *mut sockaddr, &mut addrlen) };
-    /// let addr: SockAddr = unsafe { SockAddr::from_raw_sockaddr(addr.as_ptr() as *const sockaddr, addrlen as usize)? };
+    /// let addr: SockAddr = unsafe { SockAddr::from_raw_sockaddr(addr.as_ptr() as *const sockaddr, addrlen)? };
     /// # let _ = addr;
     /// # Ok(()) }
     /// ```
     ///
     /// # Safety
     /// `addr` must be a valid, non-null pointer, and `len` should describe the
     /// number of bytes within `*addr` that are initialized and represent data.
-    pub unsafe fn from_raw_sockaddr(addr: *const libc::sockaddr, len: usize) -> Result<SockAddr> {
+    pub unsafe fn from_raw_sockaddr(addr: *const libc::sockaddr, len: libc::socklen_t) -> Result<SockAddr> {
+        let len = len as usize;
         let af = (*addr).sa_family;
         if len < mem::size_of_val(&af) {
             return Err(Errno::ENOTCONN);
@@ -838,13 +839,13 @@ impl SockAddr {
         match af {
             AddressFamily::Inet => {
                 use libc::sockaddr_in;
-                assert!(len as usize >= mem::size_of::<sockaddr_in>());
+                assert!(len >= mem::size_of::<sockaddr_in>());
                 let sin = *(addr as *const sockaddr_in);
                 Ok(SockAddr::Inet(InetAddr::V4(sin)))
             }
             AddressFamily::Inet6 => {
                 use libc::sockaddr_in6;
-                assert!(len as usize >= mem::size_of::<sockaddr_in6>());
+                assert!(len >= mem::size_of::<sockaddr_in6>());
                 let sin6 = *(addr as *const sockaddr_in6);
                 Ok(SockAddr::Inet(InetAddr::V6(sin6)))
             }
@@ -1434,7 +1435,7 @@ mod tests {
     fn test_macos_loopback_datalink_addr() {
         let bytes = [20i8, 18, 1, 0, 24, 3, 0, 0, 108, 111, 48, 0, 0, 0, 0, 0];
         let sa = bytes.as_ptr() as *const libc::sockaddr;
-        let sock_addr = unsafe { SockAddr::from_raw_sockaddr(sa, bytes.len()).unwrap() };
+        let sock_addr = unsafe { SockAddr::from_raw_sockaddr(sa, bytes.len() as _).unwrap() };
         if let SockAddr::Link(link_addr) = sock_addr {
             assert!(link_addr.is_empty())
         } else {
@@ -1453,7 +1454,7 @@ mod tests {
         let bytes = [20i8, 18, 7, 0, 6, 3, 6, 0, 101, 110, 48, 24, 101, -112, -35, 76, -80];
         let ptr = bytes.as_ptr();
         let sa = ptr as *const libc::sockaddr;
-        let sock_addr = unsafe { SockAddr::from_raw_sockaddr(sa, bytes.len()).unwrap() };
+        let sock_addr = unsafe { SockAddr::from_raw_sockaddr(sa, bytes.len() as _).unwrap() };
 
         assert_eq!(sock_addr.family(), AddressFamily::Link);
 
@@ -1471,7 +1472,7 @@ mod tests {
         let bytes = [25u8, 0, 0, 0, 6, 0, 6, 0, 24, 101, 144, 221, 76, 176];
         let ptr = bytes.as_ptr();
         let sa = ptr as *const libc::sockaddr;
-        let sock_addr = unsafe { SockAddr::from_raw_sockaddr(sa, bytes.len()).unwrap() };
+        let sock_addr = unsafe { SockAddr::from_raw_sockaddr(sa, bytes.len() as _).unwrap() };
 
         assert_eq!(sock_addr.family(), AddressFamily::Link);
 

src/sys/socket/mod.rs

@@ -1392,7 +1392,7 @@ unsafe fn read_mhdr<'a, 'b>(
         }.as_ref()
     };
 
-    let address = SockAddr::from_raw_sockaddr(address, mhdr.msg_namelen as usize).ok();
+    let address = SockAddr::from_raw_sockaddr(address, mhdr.msg_namelen).ok();
 
     RecvMsg {
         bytes: r as usize,
@@ -1675,7 +1675,7 @@ pub fn recvfrom(sockfd: RawFd, buf: &mut [u8])
             addr.as_mut_ptr() as *mut libc::sockaddr,
             &mut len as *mut socklen_t))? as usize;
 
-        match SockAddr::from_raw_sockaddr(addr.as_ptr() as _, len as usize) {
+        match SockAddr::from_raw_sockaddr(addr.as_ptr() as _, len) {
             Err(Errno::ENOTCONN) => Ok((ret, None)),
             Ok(addr) => Ok((ret, Some(addr))),
             Err(e) => Err(e)
@@ -1772,7 +1772,7 @@ pub fn getpeername(fd: RawFd) -> Result<SockAddr> {
 
         Errno::result(ret)?;
 
-        SockAddr::from_raw_sockaddr(addr.as_ptr() as _, len as usize)
+        SockAddr::from_raw_sockaddr(addr.as_ptr() as _, len)
     }
 }
 
@@ -1792,7 +1792,7 @@ pub fn getsockname(fd: RawFd) -> Result<SockAddr> {
 
         Errno::result(ret)?;
 
-        SockAddr::from_raw_sockaddr(addr.as_ptr() as _, len as usize)
+        SockAddr::from_raw_sockaddr(addr.as_ptr() as _, len)
     }
 }
 
@@ -1812,7 +1812,7 @@ pub fn getsockname(fd: RawFd) -> Result<SockAddr> {
 pub fn sockaddr_storage_to_addr(
     addr: &sockaddr_storage,
     len: usize) -> Result<SockAddr> {
-    unsafe { SockAddr::from_raw_sockaddr(addr as *const sockaddr_storage as *const sockaddr, len) }
+    unsafe { SockAddr::from_raw_sockaddr(addr as *const sockaddr_storage as *const sockaddr, len as _) }
 }
 
 #[derive(Clone, Copy, Debug, Eq, Hash, PartialEq)]

test/sys/test_socket.rs

@@ -51,9 +51,9 @@ pub fn test_inetv4_addr_roundtrip_sockaddr_from_raw() {
         }
     };
 
-    let from_storage = unsafe { SockAddr::from_raw_sockaddr(storage.as_ptr() as _, ffi_size as usize).unwrap() };
+    let from_storage = unsafe { SockAddr::from_raw_sockaddr(storage.as_ptr() as _, ffi_size).unwrap() };
     assert_eq!(from_storage, sockaddr);
-    let from_storage = unsafe { SockAddr::from_raw_sockaddr(storage.as_ptr() as _, mem::size_of::<sockaddr_storage>()).unwrap() };
+    let from_storage = unsafe { SockAddr::from_raw_sockaddr(storage.as_ptr() as _, mem::size_of::<sockaddr_storage>() as _).unwrap() };
     assert_eq!(from_storage, sockaddr);
 }
 
@@ -100,9 +100,9 @@ pub fn test_inetv6_addr_roundtrip_sockaddr_from_raw() {
         }
     };
 
-    let from_storage = unsafe { SockAddr::from_raw_sockaddr(storage.as_ptr() as _, ffi_size as usize).unwrap() };
+    let from_storage = unsafe { SockAddr::from_raw_sockaddr(storage.as_ptr() as _, ffi_size).unwrap() };
     assert_eq!(from_storage, sockaddr);
-    let from_storage = unsafe { SockAddr::from_raw_sockaddr(storage.as_ptr() as _, mem::size_of::<sockaddr_storage>()).unwrap() };
+    let from_storage = unsafe { SockAddr::from_raw_sockaddr(storage.as_ptr() as _, mem::size_of::<sockaddr_storage>() as _).unwrap() };
     assert_eq!(from_storage, sockaddr);
 }