From 09e18fcec1b27920fda35e6234b0e7315742b6a9 Mon Sep 17 00:00:00 2001 From: phink Date: Thu, 20 Feb 2025 09:55:04 +0100 Subject: [PATCH 1/3] Gossipsub: pp the distant peer who sends the Ping message --- src/lib_dal_node/gossipsub/gs_logging.ml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/lib_dal_node/gossipsub/gs_logging.ml b/src/lib_dal_node/gossipsub/gs_logging.ml index f1ab08263968..7e085c7b33df 100644 --- a/src/lib_dal_node/gossipsub/gs_logging.ml +++ b/src/lib_dal_node/gossipsub/gs_logging.ml @@ -133,7 +133,13 @@ module Events = struct ("topic", Types.Topic.encoding) let ping = - declare_0 ~section ~name:(prefix "ping") ~msg:"Process Ping" ~level:Info () + declare_1 + ~section + ~name:(prefix "ping") + ~msg:"Process Ping from {peer}" + ~level:Info + ~pp1:P2p_peer.Id.pp + ("peer", P2p_peer.Id.encoding) let unsubscribe = declare_2 @@ -216,7 +222,7 @@ let event ~verbose = | Disconnection {peer} -> emit disconnection peer | In_message {from_peer; p2p_message} -> ( match p2p_message with - | Ping -> emit ping () + | Ping -> emit ping from_peer.peer_id | Message_with_header {message = _; topic; message_id} -> emit message_with_header (from_peer.peer_id, topic, message_id) | Subscribe {topic} -> emit subscribe (from_peer.peer_id, topic) -- GitLab From 843d709eb7385e89843c6f15026433c5588958ec Mon Sep 17 00:00:00 2001 From: phink Date: Thu, 20 Feb 2025 15:12:31 +0100 Subject: [PATCH 2/3] Gossipsub: only emit Ping event when verbose mode is true --- src/lib_dal_node/gossipsub/gs_logging.ml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/lib_dal_node/gossipsub/gs_logging.ml b/src/lib_dal_node/gossipsub/gs_logging.ml index 7e085c7b33df..cb124451d5f9 100644 --- a/src/lib_dal_node/gossipsub/gs_logging.ml +++ b/src/lib_dal_node/gossipsub/gs_logging.ml @@ -222,7 +222,9 @@ let event ~verbose = | Disconnection {peer} -> emit disconnection peer | In_message {from_peer; p2p_message} -> ( match p2p_message with - | Ping -> emit ping from_peer.peer_id + | Ping -> + if not verbose then Lwt.return_unit + else emit ping from_peer.peer_id | Message_with_header {message = _; topic; message_id} -> emit message_with_header (from_peer.peer_id, topic, message_id) | Subscribe {topic} -> emit subscribe (from_peer.peer_id, topic) -- GitLab From c32a11f65aa70cf03c670fcd3890f3bd8a25e240 Mon Sep 17 00:00:00 2001 From: phink Date: Thu, 20 Feb 2025 15:20:20 +0100 Subject: [PATCH 3/3] Gossipsub: rename emit_pings into may_emit_pings --- src/lib_gossipsub/gossipsub_worker.ml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib_gossipsub/gossipsub_worker.ml b/src/lib_gossipsub/gossipsub_worker.ml index dfdd743b48aa..7cb53c56d9fa 100644 --- a/src/lib_gossipsub/gossipsub_worker.ml +++ b/src/lib_gossipsub/gossipsub_worker.ml @@ -633,7 +633,7 @@ module Make (C : Gossipsub_intf.WORKER_CONFIGURATION) : Add more verification/attacks protections as done in Rust. *) - let emit_pings state = + let may_emit_pings state = let gstate = state.gossip_state in let gstate_view = View.view gstate in let heartbeat_ping_interval = @@ -655,7 +655,7 @@ module Make (C : Gossipsub_intf.WORKER_CONFIGURATION) : | state, GS.Heartbeat {to_graft; to_prune; noPX_peers} -> let gstate = state.gossip_state in let gstate_view = View.view gstate in - emit_pings state ; + may_emit_pings state ; let iter pmap mk_msg = Peer.Map.iter (fun peer topicset -> -- GitLab