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

ignore requests with capture / emulation disabled

Browse Source 
otherwise the server would hang when trying to enable clients
This commit is contained in:
Ferdinand Schober
2024-07-14 12:02:14 +02:00
parent bba9400ab1
commit 8e94a64570
3 changed files with 25 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/server/capture_task.rs
View File

@@ -61,9 +61,12 @@ async fn capture_task(
}
// allow cancellation
tokio::select! {
_ = server.capture_notified() => {},
_ = server.cancelled() => break,
loop {
tokio::select! {
_ = notify_rx.recv() => continue, /* need to ignore requests here! */
_ = server.capture_notified() => break,
_ = server.cancelled() => return,
}
}
}
}

22
src/server/emulation_task.rs
View File

@@ -57,26 +57,22 @@ async fn emulation_task(
capture_tx: Sender<CaptureEvent>,
) {
loop {
match do_emulation(&server, &mut rx, &mut udp_rx, &sender_tx, &capture_tx).await {
Ok(()) => {}
Err(e) => {
log::warn!("input emulation exited: {e}");
}
if let Err(e) = do_emulation(&server, &mut rx, &mut udp_rx, &sender_tx, &capture_tx).await {
log::warn!("input emulation exited: {e}");
}
server.set_emulation_status(Status::Disabled);
if server.notifies.cancel.is_cancelled() {
if server.is_cancelled() {
break;
}
log::info!("waiting for user to request input emulation ...");
// allow cancellation
tokio::select! {
_ = server.emulation_notified() => {},
_ = server.cancelled() => break,
loop {
tokio::select! {
_ = rx.recv() => continue, /* need to ignore requests here! */
_ = server.emulation_notified() => break,
_ = server.cancelled() => return,
}
}
log::info!("... done");
}
}