TheLanc3/rustdesk
1
0
Fork 0
mirror of https://github.com/rustdesk/rustdesk.git synced 2026-04-21 22:43:19 +03:00
Code Issues Packages Projects Releases Wiki Activity

try to fix reboot not working because retry too slow

Browse Source
This commit is contained in:
rustdesk
2025-07-28 11:16:04 +08:00
parent e9692b94ca
commit 0646a5b313
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/rendezvous_mediator.rs
View File

@@ -93,6 +93,7 @@ impl RendezvousMediator {
} }
scrap::codec::test_av1(); scrap::codec::test_av1();
loop { loop {
let mut timeout = CONNECT_TIMEOUT;
let conn_start_time = Instant::now(); let conn_start_time = Instant::now();
*SOLVING_PK_MISMATCH.lock().await = "".to_owned(); *SOLVING_PK_MISMATCH.lock().await = "".to_owned();
if !config::option2bool("stop-service", &Config::get_option("stop-service")) if !config::option2bool("stop-service", &Config::get_option("stop-service"))
@@ -106,7 +107,15 @@ impl RendezvousMediator {
let server = server.clone(); let server = server.clone();
futs.push(tokio::spawn(async move { futs.push(tokio::spawn(async move {
if let Err(err) = Self::start(server, host).await { if let Err(err) = Self::start(server, host).await {
log::error!("rendezvous mediator error: {err}"); let err = format!("rendezvous mediator error: {err}");
// When user reboot, there might be below error, waiting too long
// (CONNECT_TIMEOUT 18s) will make user think there is bug
if err.contains("10054") || err.contains("11001") {
// No such host is known. (os error 11001)
// An existing connection was forcibly closed by the remote host. (os error 10054): also happens for UDP
timeout = 3000;
}
log::error!("{err}");
} }
// SHOULD_EXIT here is to ensure once one exits, the others also exit. // SHOULD_EXIT here is to ensure once one exits, the others also exit.
SHOULD_EXIT.store(true, Ordering::SeqCst); SHOULD_EXIT.store(true, Ordering::SeqCst);
@@ -119,8 +128,8 @@ impl RendezvousMediator {
Config::reset_online(); Config::reset_online();
if !MANUAL_RESTARTED.load(Ordering::SeqCst) { if !MANUAL_RESTARTED.load(Ordering::SeqCst) {
let elapsed = conn_start_time.elapsed().as_millis() as u64; let elapsed = conn_start_time.elapsed().as_millis() as u64;
if elapsed < CONNECT_TIMEOUT { if elapsed < timeout{
sleep(((CONNECT_TIMEOUT - elapsed) / 1000) as _).await; sleep(((timeout - elapsed) / 1000) as _).await;
} }
} else { } else {
// https://github.com/rustdesk/rustdesk/issues/12233 // https://github.com/rustdesk/rustdesk/issues/12233
@@ -204,7 +213,7 @@ impl RendezvousMediator {
log::debug!("Non-protobuf message bytes received: {:?}", bytes); log::debug!("Non-protobuf message bytes received: {:?}", bytes);
} }
}, },
Some(Err(e)) => bail!("Failed to receive next {}", e), // maybe socks5 tcp disconnected Some(Err(e)) => bail!("Failed to receive next: {}", e), // maybe socks5 tcp disconnected
None => { None => {
bail!("Socket receive none. Maybe socks5 server is down."); bail!("Socket receive none. Maybe socks5 server is down.");
}, },