Refactor Socket::peer_addr

Author: Thomasdezeeuw

src/socket.rs

@@ -210,9 +210,15 @@ impl Socket {
         sys::getsockname(self.inner)
     }
 
-    /// Returns the socket address of the remote peer of this TCP connection.
+    /// Returns the socket address of the remote peer of this socket.
+    ///
+    /// # Notes
+    ///
+    /// This returns an error if the socket is not [`connect`ed].
+    ///
+    /// [`connect`ed]: Socket::connect
     pub fn peer_addr(&self) -> io::Result<SockAddr> {
-        self.inner().peer_addr()
+        sys::getpeername(self.inner)
     }
 
     /// Creates a new independently owned handle to the underlying socket.

src/sys/unix.rs

@@ -339,6 +339,13 @@ pub(crate) fn getsockname(fd: SysSocket) -> io::Result<SockAddr> {
         .map(|_| unsafe { SockAddr::from_raw_parts(&storage as *const _ as *const _, len) })
 }
 
+pub(crate) fn getpeername(fd: SysSocket) -> io::Result<SockAddr> {
+    let mut storage: libc::sockaddr_storage = unsafe { mem::zeroed() };
+    let mut len = size_of_val(&storage) as libc::socklen_t;
+    syscall!(getpeername(fd, &mut storage as *mut _ as *mut _, &mut len,))
+        .map(|_| unsafe { SockAddr::from_raw_parts(&storage as *const _ as *const _, len) })
+}
+
 /// Unix only API.
 impl crate::Socket {
     /// Accept a new incoming connection from this listener.
@@ -434,17 +441,6 @@ pub struct Socket {
 }
 
 impl Socket {
-    pub fn peer_addr(&self) -> io::Result<SockAddr> {
-        let mut storage: libc::sockaddr_storage = unsafe { mem::zeroed() };
-        let mut len = mem::size_of_val(&storage) as libc::socklen_t;
-        syscall!(getpeername(
-            self.fd,
-            &mut storage as *mut _ as *mut _,
-            &mut len,
-        ))?;
-        Ok(unsafe { SockAddr::from_raw_parts(&storage as *const _ as *const _, len) })
-    }
-
     pub fn try_clone(&self) -> io::Result<Socket> {
         // implementation lifted from libstd
         #[cfg(any(target_os = "android", target_os = "haiku"))]
@@ -1052,7 +1048,7 @@ impl fmt::Debug for Socket {
         if let Ok(addr) = getsockname(self.fd) {
             f.field("local_addr", &addr);
         }
-        if let Ok(addr) = self.peer_addr() {
+        if let Ok(addr) = getpeername(self.fd) {
             f.field("peer_addr", &addr);
         }
         f.finish()

src/sys/windows.rs

@@ -193,6 +193,18 @@ pub(crate) fn getsockname(socket: SysSocket) -> io::Result<SockAddr> {
     .map(|_| unsafe { SockAddr::from_raw_parts(&storage as *const _ as *const _, len) })
 }
 
+pub(crate) fn getpeername(socket: SysSocket) -> io::Result<SockAddr> {
+    // Safety: zeroed `SOCKADDR_STORAGE` is valid.
+    let mut storage: SOCKADDR_STORAGE = unsafe { mem::zeroed() };
+    let mut len = size_of_val(&storage) as c_int;
+    syscall!(
+        getpeername(socket, &mut storage as *mut _ as *mut _, &mut len),
+        PartialEq::eq,
+        sock::SOCKET_ERROR
+    )
+    .map(|_| unsafe { SockAddr::from_raw_parts(&storage as *const _ as *const _, len) })
+}
+
 impl crate::Socket {
     /// Sets `HANDLE_FLAG_INHERIT` to zero using `SetHandleInformation`.
     pub fn set_no_inherit(&self) -> io::Result<()> {
@@ -211,20 +223,6 @@ pub struct Socket {
 }
 
 impl Socket {
-    pub fn peer_addr(&self) -> io::Result<SockAddr> {
-        unsafe {
-            let mut storage: SOCKADDR_STORAGE = mem::zeroed();
-            let mut len = mem::size_of_val(&storage) as c_int;
-            if sock::getpeername(self.socket, &mut storage as *mut _ as *mut _, &mut len) != 0 {
-                return Err(last_error());
-            }
-            Ok(SockAddr::from_raw_parts(
-                &storage as *const _ as *const _,
-                len,
-            ))
-        }
-    }
-
     pub fn try_clone(&self) -> io::Result<Socket> {
         unsafe {
             let mut info: sock::WSAPROTOCOL_INFOW = mem::zeroed();
@@ -895,7 +893,7 @@ impl fmt::Debug for Socket {
         if let Ok(addr) = getsockname(self.socket) {
             f.field("local_addr", &addr);
         }
-        if let Ok(addr) = self.peer_addr() {
+        if let Ok(addr) = getpeername(self.socket) {
             f.field("peer_addr", &addr);
         }
         f.finish()