From 1f41ba5261d0cb8e3a13c5706125818127412d82 Mon Sep 17 00:00:00 2001 From: Tiago Batista Cardoso Date: Thu, 22 Jan 2026 00:30:17 +0100 Subject: [PATCH] give up --- client-network/src/lib.rs | 6 +++--- client-network/src/message_handling.rs | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/client-network/src/lib.rs b/client-network/src/lib.rs index 880afa7..b0fab0d 100644 --- a/client-network/src/lib.rs +++ b/client-network/src/lib.rs @@ -522,7 +522,7 @@ fn parse_pack(s: &str) -> Option<[u8; 6]> { } async fn quick_ping(addr: &SocketAddr, timeout_ms: u64, sd: &P2PSharedData) -> bool { - let id = generate_id(); + let id = 42069; let pingreq = construct_message(PING, Vec::new(), id, &sd.shared_cryptopair) .expect("couldn't build ping message"); @@ -542,7 +542,7 @@ async fn quick_ping(addr: &SocketAddr, timeout_ms: u64, sd: &P2PSharedData) -> b let mut pending = sd.pending.lock().expect("couldn't lock pending map"); pending.remove(&id); - matches!(res, Ok(Ok(_))) + matches!(res, Ok(Ok(_))) && !pending.contains_key(&id) } /// @@ -602,7 +602,7 @@ pub async fn get_socket_address( for addr in addresses { println!("trying address : {}", addr); - if quick_ping(&addr, 10000, sd).await { + if quick_ping(&addr, 20000, sd).await { return Some(addr); } diff --git a/client-network/src/message_handling.rs b/client-network/src/message_handling.rs index 4636efe..224f9ba 100644 --- a/client-network/src/message_handling.rs +++ b/client-network/src/message_handling.rs @@ -74,6 +74,7 @@ pub fn handle_recevied_message( let maybe_tx = { let mut map = pending.lock().expect("couldnt lock pending map"); + println!("trying to remove : {}", id); map.remove(&id) };