From 5c73615f90a7058800437ce711ee5c015cdce120 Mon Sep 17 00:00:00 2001 From: QuantumEntangledAndy Date: Thu, 14 Sep 2023 13:20:06 +0700 Subject: [PATCH] First try reconnect on the same port --- .../src/bc_protocol/connection/udpsource.rs | 22 ++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/crates/core/src/bc_protocol/connection/udpsource.rs b/crates/core/src/bc_protocol/connection/udpsource.rs index fc22629..a839612 100644 --- a/crates/core/src/bc_protocol/connection/udpsource.rs +++ b/crates/core/src/bc_protocol/connection/udpsource.rs @@ -62,6 +62,7 @@ impl UdpSource { ) -> Result { // Ensure that the discovery keep alive are all stopped here // We now handle all coms in UdpSource + discovery.socket.set_broadcast(false)?; Self::new_from_socket( discovery.socket, discovery.addr, @@ -351,7 +352,7 @@ impl UdpPayloadInner { }, packet = socket_in_rx.next() => { let packet = packet.ok_or(Error::DroppedConnection)?; - match tokio::time::timeout(tokio::time::Duration::from_millis(200), inner.send((packet, thread_camera_addr))).await { + match tokio::time::timeout(tokio::time::Duration::from_millis(250), inner.send((packet, thread_camera_addr))).await { Ok(written) => { written?; } @@ -359,8 +360,8 @@ impl UdpPayloadInner { // Socket is (maybe) broken // Seems to happen with network reconnects like over // a lossy cellular network - log::info!("Reconnect: Due to socket failure"); - let stream = Arc::new(connect().await?); + log::debug!("Quick reconnect: Due to socket timeout"); + let stream = Arc::new(connect_try_port(inner.inner.get_ref().local_addr()?.port()).await?); inner = BcUdpSource::new_from_socket(stream, inner.addr).await?; } } @@ -759,3 +760,18 @@ async fn connect() -> Result { Ok(socket) } + +async fn connect_try_port(port: u16) -> Result { + let mut ports: Vec = (53500..54000).collect(); + let mut rng = thread_rng(); + ports.shuffle(&mut rng); + + let addrs: Vec<_> = vec![port] + .iter() + .chain(ports.iter()) + .map(|&port| SocketAddr::from(([0, 0, 0, 0], port))) + .collect(); + let socket = UdpSocket::bind(&addrs[..]).await?; + + Ok(socket) +}