TheLanc3/rustdesk
1
0
Fork 0
mirror of https://github.com/rustdesk/rustdesk.git synced 2026-09-12 07:21:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

connection: keep the raw port-forward local write at 120 s

Browse Source 
`SEND_TIMEOUT_OTHER` also bounded `forward.send` in
`try_port_forward_loop`, the write to the local target, whose own idle
timeout is an hour. Lowering it to 30 s made a target that stops
draining for half a minute drop the whole tunnel. That write gets its
own constant at the value it always had.

Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01EZ49AbZJYfm8NTp5yDPMab
This commit is contained in:
rustdesk
2026-09-04 16:54:57 +08:00
parent 0d8a52bc5a
commit ac0b226568
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/server/connection.rs
View File

@@ -394,6 +394,10 @@ const SEND_TIMEOUT_VIDEO: u64 = 12_000;
// The same horizon as the 30 s read timeout: a peer that has not drained a // The same horizon as the 30 s read timeout: a peer that has not drained a
// single message for that long is the same dead peer that check would catch. // single message for that long is the same dead peer that check would catch.
const SEND_TIMEOUT_OTHER: u64 = 30_000; const SEND_TIMEOUT_OTHER: u64 = 30_000;
// The raw port-forward loop's write to the local target: that loop idles for
// an hour before giving up, and a target that stops draining is not a dead
// peer, so this keeps the value the write always had.
const PORT_FORWARD_LOCAL_SEND_TIMEOUT: u64 = 120_000;
const SESSION_TIMEOUT: Duration = Duration::from_secs(30); const SESSION_TIMEOUT: Duration = Duration::from_secs(30);
/// Whether the DRM backend can serve a Wayland login screen here. /// Whether the DRM backend can serve a Wayland login screen here.
@@ -1236,7 +1240,7 @@ impl Connection {
res = self.stream.next() => { res = self.stream.next() => {
if let Some(res) = res { if let Some(res) = res {
last_recv_time = Instant::now(); last_recv_time = Instant::now();
timeout(SEND_TIMEOUT_OTHER, forward.send(res?)).await??; timeout(PORT_FORWARD_LOCAL_SEND_TIMEOUT, forward.send(res?)).await??;
} else { } else {
bail!("Stream reset by the peer"); bail!("Stream reset by the peer");
} }