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

connection: apply the non-video send timeout once the type is known

Browse Source 
`Connection::start` set the send timeout before the login request had
arrived, when `file_transfer`, `port_forward_socket` and `terminal` were
all still unset, so every connection got `SEND_TIMEOUT_VIDEO` (12 s) and
the `SEND_TIMEOUT_OTHER` branch never ran. A file transfer, terminal or
port forward whose peer stopped draining for 12 s — a Wi-Fi roam, a VPN
reconnect — was dropped.

The type-specific timeout is now set in `on_message` right after the
login request's union has been matched; `start` keeps the video figure
for the login phase.

`SEND_TIMEOUT_OTHER` also drops from 120 s to 30 s, the same horizon as
the 30 s read timeout: the timeout wraps a single `send`, so it only
fires when the peer makes no progress at all for that long, and beyond
30 s the read check would declare the same peer dead anyway. The raw
port-forward pipe's write to its local target shares the constant and
moves with it.

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 09:56:47 +08:00
parent 82aa28f129
commit 0d8a52bc5a
1 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/server/connection.rs
View File

@@ -391,7 +391,9 @@ const SEC30: Duration = Duration::from_secs(30);
const H1: Duration = Duration::from_secs(3600); const H1: Duration = Duration::from_secs(3600);
const MILLI1: Duration = Duration::from_millis(1); const MILLI1: Duration = Duration::from_millis(1);
const SEND_TIMEOUT_VIDEO: u64 = 12_000; const SEND_TIMEOUT_VIDEO: u64 = 12_000;
const SEND_TIMEOUT_OTHER: u64 = SEND_TIMEOUT_VIDEO * 10; // 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.
const SEND_TIMEOUT_OTHER: u64 = 30_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.
@@ -585,13 +587,9 @@ impl Connection {
crate::rustdesk_interval(time::interval_at(Instant::now(), TEST_DELAY_TIMEOUT)); crate::rustdesk_interval(time::interval_at(Instant::now(), TEST_DELAY_TIMEOUT));
let mut last_recv_time = Instant::now(); let mut last_recv_time = Instant::now();
conn.stream.set_send_timeout( // The connection type is not known until the login request arrives;
if conn.file_transfer.is_some() || conn.port_forward_socket.is_some() || conn.terminal { // `on_message` picks the type-specific timeout then.
SEND_TIMEOUT_OTHER conn.stream.set_send_timeout(SEND_TIMEOUT_VIDEO);
} else {
SEND_TIMEOUT_VIDEO
},
);
#[cfg(not(any(target_os = "android", target_os = "ios")))] #[cfg(not(any(target_os = "android", target_os = "ios")))]
std::thread::spawn(move || Self::handle_input(_rx_input, tx_cloned)); std::thread::spawn(move || Self::handle_input(_rx_input, tx_cloned));
@@ -2766,6 +2764,17 @@ impl Connection {
} }
} }
self.stream.set_send_timeout(
if self.file_transfer.is_some()
|| self.terminal
|| matches!(self.lr.union, Some(login_request::Union::PortForward(_)))
{
SEND_TIMEOUT_OTHER
} else {
SEND_TIMEOUT_VIDEO
},
);
if !crate::common::is_direct_ip_access(&lr.username) && lr.username != Config::get_id() if !crate::common::is_direct_ip_access(&lr.username) && lr.username != Config::get_id()
{ {
self.send_login_error(crate::client::LOGIN_MSG_OFFLINE) self.send_login_error(crate::client::LOGIN_MSG_OFFLINE)