refactor(net): unify TracerSocket trait

src/tracing/net/platform/unix.rs

@@ -154,6 +154,14 @@ impl Socket {
             inner: socket2::Socket::new(Domain::IPV6, Type::RAW, Some(protocol))?,
         })
     }
+
+    fn set_nonblocking(&self, nonblocking: bool) -> io::Result<()> {
+        self.inner.set_nonblocking(nonblocking)
+    }
+
+    fn local_addr(&self) -> io::Result<Option<SocketAddr>> {
+        Ok(self.inner.local_addr()?.as_socket())
+    }
 }
 
 impl TracerSocket for Socket {
@@ -223,9 +231,6 @@ impl TracerSocket for Socket {
     fn set_header_included(&self, included: bool) -> io::Result<()> {
         self.inner.set_header_included(included)
     }
-    fn set_nonblocking(&self, nonblocking: bool) -> io::Result<()> {
-        self.inner.set_nonblocking(nonblocking)
-    }
     fn set_unicast_hops_v6(&self, hops: u8) -> io::Result<()> {
         self.inner.set_unicast_hops_v6(u32::from(hops))
     }
@@ -259,7 +264,7 @@ impl TracerSocket for Socket {
         )?;
         Ok(writable == 1)
     }
-    fn recv_from(&self, buf: &mut [u8]) -> io::Result<(usize, Option<SocketAddr>)> {
+    fn recv_from(&mut self, buf: &mut [u8]) -> io::Result<(usize, Option<SocketAddr>)> {
         self.inner.recv_from_into_buf(buf)
     }
     fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> {
@@ -268,9 +273,6 @@ impl TracerSocket for Socket {
     fn shutdown(&self, how: Shutdown) -> io::Result<()> {
         self.inner.shutdown(how)
     }
-    fn local_addr(&self) -> io::Result<Option<SocketAddr>> {
-        Ok(self.inner.local_addr()?.as_socket())
-    }
     fn peer_addr(&self) -> io::Result<Option<SocketAddr>> {
         Ok(self.inner.peer_addr()?.as_socket())
     }

src/tracing/net/platform/windows.rs

@@ -131,12 +131,6 @@ impl TracerSocket for Socket {
         unimplemented!()
     }
 
-    /// TODO
-    #[allow(dead_code)]
-    fn set_nonblocking(&self, _nonblocking: bool) -> io::Result<()> {
-        unimplemented!()
-    }
-
     /// TODO
     fn set_unicast_hops_v6(&self, _hops: u8) -> io::Result<()> {
         unimplemented!()
@@ -163,7 +157,7 @@ impl TracerSocket for Socket {
     }
 
     /// TODO
-    fn recv_from(&self, _buf: &mut [u8]) -> io::Result<(usize, Option<SocketAddr>)> {
+    fn recv_from(&mut self, _buf: &mut [u8]) -> io::Result<(usize, Option<SocketAddr>)> {
         unimplemented!()
     }
 
@@ -176,12 +170,6 @@ impl TracerSocket for Socket {
         unimplemented!()
     }
 
-    /// TODO
-    #[allow(dead_code, clippy::unused_self)]
-    fn local_addr(&self) -> io::Result<Option<SocketAddr>> {
-        unimplemented!()
-    }
-
     /// TODO
     fn peer_addr(&self) -> io::Result<Option<SocketAddr>> {
         unimplemented!()

src/tracing/net/socket.rs

@@ -31,18 +31,16 @@ where
     fn set_ttl(&self, ttl: u32) -> Result<()>;
     fn set_reuse_port(&self, reuse: bool) -> Result<()>;
     fn set_header_included(&self, included: bool) -> Result<()>;
-    fn set_nonblocking(&self, nonblocking: bool) -> Result<()>;
     fn set_unicast_hops_v6(&self, hops: u8) -> Result<()>;
     fn connect(&self, address: SocketAddr) -> Result<()>;
     fn send_to(&self, buf: &[u8], addr: SocketAddr) -> Result<usize>;
     /// Returns true if the socket becomes readable before the timeout, false otherwise.
     fn is_readable(&self, timeout: Duration) -> Result<bool>;
     /// Returns true if the socket is currently writeable, false otherwise.
     fn is_writable(&self) -> Result<bool>;
-    fn recv_from(&self, buf: &mut [u8]) -> Result<(usize, Option<SocketAddr>)>;
+    fn recv_from(&mut self, buf: &mut [u8]) -> Result<(usize, Option<SocketAddr>)>;
     fn read(&mut self, buf: &mut [u8]) -> Result<usize>;
     fn shutdown(&self, how: Shutdown) -> Result<()>;
-    fn local_addr(&self) -> Result<Option<SocketAddr>>;
     fn peer_addr(&self) -> Result<Option<SocketAddr>>;
     fn take_error(&self) -> Result<Option<Error>>;
     fn icmp_error_info(&self) -> Result<IpAddr>;