From 7b787403272f7a789a4d37fe09e2ade8aac53be4 Mon Sep 17 00:00:00 2001
From: Simon Wicky <simon@nymtech.net>
Date: Wed, 21 Jan 2026 10:40:11 +0100
Subject: [PATCH] revert faulty drop changes (#6346)

---
 gateway/src/node/lp_listener/handler.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gateway/src/node/lp_listener/handler.rs b/gateway/src/node/lp_listener/handler.rs
index 7c98bd0f13..9b7f231e27 100644
--- a/gateway/src/node/lp_listener/handler.rs
+++ b/gateway/src/node/lp_listener/handler.rs
@@ -424,6 +424,7 @@ where
                     .session()
                     .ok()
                     .and_then(|s| s.outer_aead_key());
+                drop(state_entry); // Release borrow before send
                 Some((response_packet, outer_key))
             }
             LpAction::HandshakeComplete => {
@@ -443,6 +444,7 @@ where
                 // Move state machine to session_states (already in Transport state)
                 // We keep the state machine (not just session) to enable
                 // subsession/rekeying support during transport phase
+                drop(state_entry); // Release mutable borrow
 
                 let (_receiver_idx, timestamped_state) = self
                     .state
@@ -470,13 +472,11 @@ where
             }
             other => {
                 debug!("Received action during handshake: {:?}", other);
+                drop(state_entry);
                 None
             }
         };
 
-        // Release mutable borrow
-        drop(state_entry);
-
         // Send response packet if needed
         if let Some((packet, outer_key)) = should_send {
             self.send_lp_packet(packet, outer_key.as_ref()).await?;