Add pretty_print function to PeerAddress since can't override macro implementation of fmt::Display

Signed-off-by: Jacinta Ferrant <[email protected]>

Author: jferrant

stacks-common/src/types/net.rs

@@ -118,15 +118,12 @@ impl PeerAddress {
         )
     }
 
-    /// Convert to SocketAddr
-    pub fn to_socketaddr(&self, port: u16) -> SocketAddr {
+    /// Convert to IpAddr
+    pub fn to_ipaddr(&self) -> IpAddr {
         if self.is_ipv4() {
-            SocketAddr::new(
-                IpAddr::V4(Ipv4Addr::new(
-                    self.0[12], self.0[13], self.0[14], self.0[15],
-                )),
-                port,
-            )
+            IpAddr::V4(Ipv4Addr::new(
+                self.0[12], self.0[13], self.0[14], self.0[15],
+            ))
         } else {
             let addr_words: [u16; 8] = [
                 ((self.0[0] as u16) << 8) | (self.0[1] as u16),
@@ -138,23 +135,25 @@ impl PeerAddress {
                 ((self.0[12] as u16) << 8) | (self.0[13] as u16),
                 ((self.0[14] as u16) << 8) | (self.0[15] as u16),
             ];
-
-            SocketAddr::new(
-                IpAddr::V6(Ipv6Addr::new(
-                    addr_words[0],
-                    addr_words[1],
-                    addr_words[2],
-                    addr_words[3],
-                    addr_words[4],
-                    addr_words[5],
-                    addr_words[6],
-                    addr_words[7],
-                )),
-                port,
-            )
+            IpAddr::V6(Ipv6Addr::new(
+                addr_words[0],
+                addr_words[1],
+                addr_words[2],
+                addr_words[3],
+                addr_words[4],
+                addr_words[5],
+                addr_words[6],
+                addr_words[7],
+            ))
         }
     }
 
+    /// Convert to SocketAddr
+    pub fn to_socketaddr(&self, port: u16) -> SocketAddr {
+        let ip_addr = self.to_ipaddr();
+        SocketAddr::new(ip_addr, port)
+    }
+
     /// Convert from socket address
     pub fn from_socketaddr(addr: &SocketAddr) -> PeerAddress {
         PeerAddress::from_ip(&addr.ip())
@@ -228,6 +227,10 @@ impl PeerAddress {
     pub fn to_bin(&self) -> String {
         to_bin(&self.0)
     }
+
+    pub fn pretty_print(&self) -> String {
+        self.to_ipaddr().to_string()
+    }
 }
 
 /// Peer address variants for the Host: header

stackslib/src/net/p2p.rs

@@ -2009,8 +2009,8 @@ impl PeerNetwork {
             self.events.remove(&nk);
             info!("Dropping neighbor!";
                 "event id" => %event_id,
-                "public address" => %pubkh,
-                "public key" => %nk.addrbytes,
+                "public key" => %pubkh,
+                "public addr" => %nk.addrbytes.pretty_print(),
                 "reason" => %reason
             );