From 281652a673df85dd9a54ce94b7f84a7cbaab44cd Mon Sep 17 00:00:00 2001
From: selsta <selsta@sent.at>
Date: Thu, 30 Jul 2026 20:53:03 +0200
Subject: [PATCH] p2p: use connection state to detect duplicate handshakes

(cherry picked from commit 57068111aa0dd1e6816d598d1fedb21e2f8cf6c6)
---
 src/p2p/net_node.inl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/p2p/net_node.inl b/src/p2p/net_node.inl
index d124d2c30..e6158d862 100644
--- a/src/p2p/net_node.inl
+++ b/src/p2p/net_node.inl
@@ -2607,9 +2607,9 @@ namespace nodetool
       return 1;
     }
 
-    if(context.peer_id)
+    if(context.handshake_complete())
     {
-      LOG_WARNING_CC(context, "COMMAND_HANDSHAKE came, but seems that connection already have associated peer_id (double COMMAND_HANDSHAKE?)");
+      LOG_WARNING_CC(context, "COMMAND_HANDSHAKE came, but connection already completed a handshake (double COMMAND_HANDSHAKE?)");
       drop_connection(context);
       return 1;
     }