impl Debug for all sockaddr types

Author: luozijun

src/ifaddrs.rs

@@ -4,7 +4,6 @@
 //! of interfaces and their associated addresses.
 
 use std::ffi;
-use std::fmt;
 use std::iter::Iterator;
 use std::mem;
 use std::option::Option;
@@ -16,7 +15,7 @@ use sys::socket::SockAddr;
 use net::if_::*;
 
 /// Describes a single address for an interface as returned by `getifaddrs`.
-#[derive(Clone, Eq, Hash, PartialEq)]
+#[derive(Clone, Eq, Hash, PartialEq, Debug)]
 pub struct InterfaceAddress {
     /// Name of the network interface
     pub interface_name: String,
@@ -32,12 +31,6 @@ pub struct InterfaceAddress {
     pub destination: Option<SockAddr>,
 }
 
-impl fmt::Debug for InterfaceAddress {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(f, "InterfaceAddress ({:?})", self.interface_name)
-    }
-}
-
 cfg_if! {
     if #[cfg(any(target_os = "emscripten", target_os = "fuchsia", target_os = "linux"))] {
         fn get_ifu_from_sockaddr(info: &libc::ifaddrs) -> *const libc::sockaddr {
@@ -150,4 +143,4 @@ mod tests {
     fn test_getifaddrs() {
         let _ = getifaddrs();
     }
-}
+}

src/sys/socket/addr.rs

@@ -222,7 +222,7 @@ impl AddressFamily {
     }
 }
 
-#[derive(Clone, Copy)]
+#[derive(Copy)]
 pub enum InetAddr {
     V4(libc::sockaddr_in),
     V6(libc::sockaddr_in6),
@@ -348,6 +348,12 @@ impl hash::Hash for InetAddr {
     }
 }
 
+impl Clone for InetAddr {
+    fn clone(&self) -> InetAddr {
+        *self
+    }
+}
+
 impl fmt::Display for InetAddr {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         match *self {
@@ -357,6 +363,12 @@ impl fmt::Display for InetAddr {
     }
 }
 
+impl fmt::Debug for InetAddr {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        fmt::Display::fmt(self, f)
+    }
+}
+
 /*
  *
  * ===== IpAddr =====
@@ -390,7 +402,6 @@ impl IpAddr {
             net::IpAddr::V6(ref std) => IpAddr::V6(Ipv6Addr::from_std(std)),
         }
     }
-
     pub fn to_std(&self) -> net::IpAddr {
         match *self {
             IpAddr::V4(ref ip) => net::IpAddr::V4(ip.to_std()),
@@ -409,13 +420,19 @@ impl fmt::Display for IpAddr {
     }
 }
 
+impl fmt::Debug for IpAddr {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        fmt::Display::fmt(self, f)
+    }
+}
+
 /*
  *
  * ===== Ipv4Addr =====
  *
  */
 
-#[derive(Clone, Copy)]
+#[derive(Copy)]
 pub struct Ipv4Addr(pub libc::in_addr);
 
 impl Ipv4Addr {
@@ -463,13 +480,25 @@ impl hash::Hash for Ipv4Addr {
     }
 }
 
+impl Clone for Ipv4Addr {
+    fn clone(&self) -> Ipv4Addr {
+        *self
+    }
+}
+
 impl fmt::Display for Ipv4Addr {
     fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
         let octets = self.octets();
         write!(fmt, "{}.{}.{}.{}", octets[0], octets[1], octets[2], octets[3])
     }
 }
 
+impl fmt::Debug for Ipv4Addr {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        fmt::Display::fmt(self, f)
+    }
+}
+
 /*
  *
  * ===== Ipv6Addr =====
@@ -524,6 +553,12 @@ impl fmt::Display for Ipv6Addr {
     }
 }
 
+impl fmt::Debug for Ipv6Addr {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        fmt::Display::fmt(self, f)
+    }
+}
+
 /*
  *
  * ===== UnixAddr =====
@@ -538,7 +573,7 @@ impl fmt::Display for Ipv6Addr {
 /// does not require that `sun_len` include the terminating null even for normal
 /// sockets.  Note that the actual sockaddr length is greater by
 /// `offset_of!(libc::sockaddr_un, sun_path)`
-#[derive(Clone, Copy)]
+#[derive(Copy)]
 pub struct UnixAddr(pub libc::sockaddr_un, pub usize);
 
 impl UnixAddr {
@@ -645,6 +680,12 @@ impl hash::Hash for UnixAddr {
     }
 }
 
+impl Clone for UnixAddr {
+    fn clone(&self) -> UnixAddr {
+        *self
+    }
+}
+
 impl fmt::Display for UnixAddr {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         if self.1 == 0 {
@@ -658,14 +699,20 @@ impl fmt::Display for UnixAddr {
     }
 }
 
+impl fmt::Debug for UnixAddr {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        fmt::Display::fmt(self, f)
+    }
+}
+
 /*
  *
  * ===== Sock addr =====
  *
  */
 
 /// Represents a socket address
-#[derive(Clone, Copy)]
+#[derive(Copy, Debug)]
 pub enum SockAddr {
     Inet(InetAddr),
     Unix(UnixAddr),
@@ -732,7 +779,8 @@ impl SockAddr {
                     SysControlAddr(*(addr as *const sys_control::sockaddr_ctl)))),
                 // Other address families are currently not supported and simply yield a None
                 // entry instead of a proper conversion to a `SockAddr`.
-                Some(_) | None => None,
+                Some(_) => None,
+                None => None,
             }
         }
     }
@@ -784,6 +832,12 @@ impl hash::Hash for SockAddr {
     }
 }
 
+impl Clone for SockAddr {
+    fn clone(&self) -> SockAddr {
+        *self
+    }
+}
+
 impl fmt::Display for SockAddr {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         match *self {
@@ -850,6 +904,12 @@ pub mod netlink {
             write!(f, "pid: {} groups: {}", self.pid(), self.groups())
         }
     }
+
+    impl fmt::Debug for NetlinkAddr {
+        fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+            fmt::Display::fmt(self, f)
+        }
+    }
 }
 
 #[cfg(any(target_os = "ios", target_os = "macos"))]
@@ -948,4 +1008,10 @@ pub mod sys_control {
             write!(f, "id: {} unit: {}", self.id(), self.unit())
         }
     }
-}
+
+    impl fmt::Debug for SysControlAddr {
+        fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+            fmt::Display::fmt(self, f)
+        }
+    }
+}