From f2a63492039697b2e357152e1fcc1d627de20df8 Mon Sep 17 00:00:00 2001 From: QuantumEntangledAndy Date: Sun, 22 Aug 2021 17:20:36 +0700 Subject: [PATCH] Adjust how neoliknk handles udp resend --- crates/core/src/bc_protocol/connection/udpconn/transmit.rs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/crates/core/src/bc_protocol/connection/udpconn/transmit.rs b/crates/core/src/bc_protocol/connection/udpconn/transmit.rs index a925e71..d11665f 100644 --- a/crates/core/src/bc_protocol/connection/udpconn/transmit.rs +++ b/crates/core/src/bc_protocol/connection/udpconn/transmit.rs @@ -172,8 +172,10 @@ impl UdpTransmit { let camera_has = self.camera_acknowledged.load(Ordering::Relaxed); let client_sent = self.client_sent.load(Ordering::Relaxed); if camera_has < client_sent { - for packet_id in camera_has..(client_sent + 1) { + debug!("Resending {:?}", (camera_has + 1)..(client_sent + 1)); + for packet_id in (camera_has + 1)..(client_sent + 1) { if let Some(payload) = &outgoing_history.get(&packet_id) { + debug!(" - Sending {}", packet_id); socket .send(payload) .map_err(|e| TransmitError::SocketSend { err: e })?; @@ -208,7 +210,7 @@ impl UdpTransmit { if client_wants > 0 { let bcack_msg = BcUdp::Ack(UdpAck { connection_id: discovery_result.camera_id, - packet_id: client_wants - 1, + packet_id: client_wants, }); let mut buf = vec![];