From cfbdc301234db89e69ea2e05f30e4397aa00a423 Mon Sep 17 00:00:00 2001
From: Thomas Eizinger <thomas@eizinger.io>
Date: Wed, 1 Oct 2025 04:16:41 +0000
Subject: [PATCH] refactor(connlib): move log into state (#10498)

Instead of logging this inside the event-loop, it is better to move it
into the corresponding handler function to free up the event-loop from
as much "logic" as possible. It should ideally only be concerned with
linking the state machine with the IO components that actually cause the
side-effects.
---
 rust/connlib/tunnel/src/client.rs  | 4 ++++
 rust/connlib/tunnel/src/gateway.rs | 4 ++++
 rust/connlib/tunnel/src/lib.rs     | 8 --------
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/rust/connlib/tunnel/src/client.rs b/rust/connlib/tunnel/src/client.rs
index d6e11b367..ddbee2794 100644
--- a/rust/connlib/tunnel/src/client.rs
+++ b/rust/connlib/tunnel/src/client.rs
@@ -393,6 +393,10 @@ impl ClientState {
         packet: IpPacket,
         now: Instant,
     ) -> Option<snownet::Transmit> {
+        if packet.is_fz_p2p_control() {
+            tracing::warn!("Packet matches heuristics of FZ p2p control protocol");
+        }
+
         let non_dns_packet = match self.try_handle_dns(packet, now) {
             ControlFlow::Break(()) => return None,
             ControlFlow::Continue(non_dns_packet) => non_dns_packet,
diff --git a/rust/connlib/tunnel/src/gateway.rs b/rust/connlib/tunnel/src/gateway.rs
index 6e693b9bd..ddf9b0e91 100644
--- a/rust/connlib/tunnel/src/gateway.rs
+++ b/rust/connlib/tunnel/src/gateway.rs
@@ -92,6 +92,10 @@ impl GatewayState {
         packet: IpPacket,
         now: Instant,
     ) -> Result<Option<snownet::Transmit>> {
+        if packet.is_fz_p2p_control() {
+            tracing::warn!("Packet matches heuristics of FZ p2p control protocol");
+        }
+
         let dst = packet.destination();
 
         if !crate::is_peer(dst) {
diff --git a/rust/connlib/tunnel/src/lib.rs b/rust/connlib/tunnel/src/lib.rs
index 1678e5020..d2eba066b 100644
--- a/rust/connlib/tunnel/src/lib.rs
+++ b/rust/connlib/tunnel/src/lib.rs
@@ -222,10 +222,6 @@ impl ClientTunnel {
 
                 if let Some(packets) = device {
                     for packet in packets {
-                        if packet.is_fz_p2p_control() {
-                            tracing::warn!("Packet matches heuristics of FZ p2p control protocol");
-                        }
-
                         let ecn = packet.ecn();
 
                         match self.role_state.handle_tun_input(packet, now) {
@@ -404,10 +400,6 @@ impl GatewayTunnel {
 
                 if let Some(packets) = device {
                     for packet in packets {
-                        if packet.is_fz_p2p_control() {
-                            tracing::warn!("Packet matches heuristics of FZ p2p control protocol");
-                        }
-
                         let ecn = packet.ecn();
 
                         match self.role_state.handle_tun_input(packet, now) {