Remove dumping packet content in Debug...

src/hp/derp/client.rs

@@ -1,4 +1,5 @@
 //! based on tailscale/derp/derp_client.go
+use std::fmt;
 use std::net::SocketAddr;
 use std::sync::Arc;
 use std::time::Duration;
@@ -546,7 +547,7 @@ fn get_key_from_slice(payload: &[u8]) -> Result<PublicKey> {
     Ok(<[u8; PUBLIC_KEY_LENGTH]>::try_from(payload)?.into())
 }
 
-#[derive(Debug, Clone)]
+#[derive(Clone)]
 pub enum ReceivedMessage {
     /// Represents an incoming packet.
     ReceivedPacket {
@@ -605,6 +606,22 @@ pub enum ReceivedMessage {
     },
 }
 
+impl fmt::Debug for ReceivedMessage {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            Self::ReceivedPacket { source, data } => f.debug_struct("ReceivedPacket").field("source", source).field("data", &data.len()).finish(),
+            Self::PeerGone(arg0) => f.debug_tuple("PeerGone").field(arg0).finish(),
+            Self::PeerPresent(arg0) => f.debug_tuple("PeerPresent").field(arg0).finish(),
+            Self::ServerInfo { token_bucket_bytes_per_second, token_bucket_bytes_burst } => f.debug_struct("ServerInfo").field("token_bucket_bytes_per_second", token_bucket_bytes_per_second).field("token_bucket_bytes_burst", token_bucket_bytes_burst).finish(),
+            Self::Ping(arg0) => f.debug_tuple("Ping").field(arg0).finish(),
+            Self::Pong(arg0) => f.debug_tuple("Pong").field(arg0).finish(),
+            Self::KeepAlive => write!(f, "KeepAlive"),
+            Self::Health { problem } => f.debug_struct("Health").field("problem", problem).finish(),
+            Self::ServerRestarting { reconnect_in, try_for } => f.debug_struct("ServerRestarting").field("reconnect_in", reconnect_in).field("try_for", try_for).finish(),
+        }
+    }
+}
+
 pub(crate) async fn send_packet<W: AsyncWrite + Unpin>(
     mut writer: W,
     rate_limiter: &Option<RateLimiter>,

src/hp/magicsock/conn.rs

@@ -1,6 +1,6 @@
 use std::{
     collections::{HashMap, HashSet, VecDeque},
-    fmt::Debug,
+    fmt::{Debug, self},
     io::{self, IoSliceMut},
     mem::MaybeUninit,
     net::{IpAddr, Ipv4Addr, Ipv6Addr, SocketAddr},
@@ -676,14 +676,23 @@ enum NetworkSource {
     Derp,
 }
 
-#[derive(Debug)]
 struct DerpReadResult {
     region_id: u16,
     src: key::node::PublicKey,
     /// packet data
     buf: BytesMut,
 }
 
+impl fmt::Debug for DerpReadResult {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        f.debug_struct("DerpReadResult")
+            .field("region_id", &self.region_id)
+            .field("src", &self.src)
+            .field("buf", &self.buf.len())
+            .finish()
+    }
+}
+
 /// Contains fields for an active DERP connection.
 #[derive(Debug)]
 struct ActiveDerp {