TheLanc3/lan-mouse
1
0
Fork 0
mirror of https://github.com/feschber/lan-mouse.git synced 2026-03-23 13:10:56 +03:00
Code Issues Packages Projects Releases Wiki Activity

improve logging, remove failed connection

Browse Source
This commit is contained in:
Ferdinand Schober
2024-09-07 18:01:08 +02:00
parent 7186ae40b1
commit 7f0815facf
4 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/capture.rs
View File

@@ -142,7 +142,7 @@ async fn handle_capture_event(
}; };
if let Err(e) = conn.send(event, handle).await { if let Err(e) = conn.send(event, handle).await {
log::warn!("failed to connect, releasing capture: {e}"); log::warn!("releasing capture: {e}");
capture.release().await?; capture.release().await?;
} }
Ok(()) Ok(())

6
src/connect.rs
View File

@@ -90,6 +90,8 @@ impl LanMouseConnection {
Ok(_) => return Ok(()), Ok(_) => return Ok(()),
Err(e) => { Err(e) => {
log::warn!("failed to connect: {e}"); log::warn!("failed to connect: {e}");
self.conns.lock().await.remove(&addr);
self.server.set_active_addr(handle, None);
} }
} }
} }
@@ -117,8 +119,10 @@ impl LanMouseConnection {
.into_iter() .into_iter()
.map(|a| SocketAddr::new(a, port)) .map(|a| SocketAddr::new(a, port))
.collect::<Vec<_>>(); .collect::<Vec<_>>();
log::info!("client ({handle}) connecting ... (ips: {addrs:?})");
let (conn, addr) = connect_any(&addrs).await?; let (conn, addr) = connect_any(&addrs).await?;
server.set_active_addr(handle, addr); log::info!("client ({handle}) connected @ {addr}");
server.set_active_addr(handle, Some(addr));
conns.lock().await.insert(addr, conn); conns.lock().await.insert(addr, conn);
connecting.lock().await.remove(&handle); connecting.lock().await.remove(&handle);
} }

4
src/listen.rs
View File

@@ -51,13 +51,14 @@ impl LanMouseListener {
let _listen_task: JoinHandle<()> = spawn_local(async move { let _listen_task: JoinHandle<()> = spawn_local(async move {
loop { loop {
let (conn, _addr) = match listener.accept().await { let (conn, addr) = match listener.accept().await {
Ok(c) => c, Ok(c) => c,
Err(e) => { Err(e) => {
log::warn!("accept: {e}"); log::warn!("accept: {e}");
continue; continue;
} }
}; };
log::info!("dtls client connected, ip: {addr}");
let mut conns = conns_clone.lock().await; let mut conns = conns_clone.lock().await;
conns.push(conn.clone()); conns.push(conn.clone());
spawn_local(read_loop(conns_clone.clone(), conn, listen_tx.clone())); spawn_local(read_loop(conns_clone.clone(), conn, listen_tx.clone()));
@@ -120,6 +121,7 @@ async fn read_loop(
} }
} }
} }
log::info!("dtls client disconnected {:?}", conn.remote_addr());
let mut conns = conns.lock().await; let mut conns = conns.lock().await;
let index = conns let index = conns
.iter() .iter()

4
src/server.rs
View File

@@ -485,9 +485,9 @@ impl Server {
self.client_manager.borrow().get(handle).map(|(c, _)| c.pos) self.client_manager.borrow().get(handle).map(|(c, _)| c.pos)
} }
pub(crate) fn set_active_addr(&self, handle: ClientHandle, addr: SocketAddr) { pub(crate) fn set_active_addr(&self, handle: ClientHandle, addr: Option<SocketAddr>) {
if let Some((_, s)) = self.client_manager.borrow_mut().get_mut(handle) { if let Some((_, s)) = self.client_manager.borrow_mut().get_mut(handle) {
s.active_addr.replace(addr); s.active_addr = addr;
} }
} }