TheLanc3/rustdesk
1
0
Fork 0
mirror of https://github.com/rustdesk/rustdesk.git synced 2026-04-12 06:11:28 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix connect timeout of udp_nat_connect and udp_nat_listen (#12447)

Browse Source 
Signed-off-by: 21pages <sunboeasy@gmail.com>
This commit is contained in:
21pages
2025-07-28 20:06:30 +08:00
committed by GitHub
parent af53b1e8c9
commit 7a3e67e1d3
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/client.rs
View File

@@ -447,7 +447,8 @@ impl Client {
let addr = AddrMangle::decode(&rr.socket_addr_v6); let addr = AddrMangle::decode(&rr.socket_addr_v6);
if addr.port() > 0 { if addr.port() > 0 {
if s.connect(addr).await.is_ok() { if s.connect(addr).await.is_ok() {
connect_futures.push(udp_nat_connect(s, "IPv6").boxed()); connect_futures
.push(udp_nat_connect(s, "IPv6", CONNECT_TIMEOUT).boxed());
} }
} }
} }
@@ -589,10 +590,10 @@ impl Client {
.boxed(), .boxed(),
); );
if let Some(udp_socket_nat) = udp_socket_nat { if let Some(udp_socket_nat) = udp_socket_nat {
connect_futures.push(udp_nat_connect(udp_socket_nat, "UDP").boxed()); connect_futures.push(udp_nat_connect(udp_socket_nat, "UDP", connect_timeout).boxed());
} }
if let Some(udp_socket_v6) = udp_socket_v6 { if let Some(udp_socket_v6) = udp_socket_v6 {
connect_futures.push(udp_nat_connect(udp_socket_v6, "IPv6").boxed()); connect_futures.push(udp_nat_connect(udp_socket_v6, "IPv6", connect_timeout).boxed());
} }
// Run all connection attempts concurrently, return the first successful one // Run all connection attempts concurrently, return the first successful one
let (mut conn, kcp, mut typ) = match select_ok(connect_futures).await { let (mut conn, kcp, mut typ) = match select_ok(connect_futures).await {
@@ -4009,6 +4010,7 @@ async fn test_udp_uat(
async fn udp_nat_connect( async fn udp_nat_connect(
socket: Arc<UdpSocket>, socket: Arc<UdpSocket>,
typ: &'static str, typ: &'static str,
ms_timeout: u64,
) -> ResultType<(Stream, Option<KcpStream>, &'static str)> { ) -> ResultType<(Stream, Option<KcpStream>, &'static str)> {
crate::punch_udp(socket.clone(), false) crate::punch_udp(socket.clone(), false)
.await .await
@@ -4016,7 +4018,7 @@ async fn udp_nat_connect(
log::debug!("{err}"); log::debug!("{err}");
anyhow!(err) anyhow!(err)
})?; })?;
let res = KcpStream::connect(socket, Duration::from_secs(CONNECT_TIMEOUT as _)) let res = KcpStream::connect(socket, Duration::from_millis(ms_timeout))
.await .await
.map_err(|err| { .map_err(|err| {
log::debug!("Failed to connect KCP stream: {}", err); log::debug!("Failed to connect KCP stream: {}", err);

2
src/rendezvous_mediator.rs
View File

@@ -834,7 +834,7 @@ async fn udp_nat_listen(
let res = crate::punch_udp(socket.clone(), true).await?; let res = crate::punch_udp(socket.clone(), true).await?;
let stream = crate::kcp_stream::KcpStream::accept( let stream = crate::kcp_stream::KcpStream::accept(
socket, socket,
Duration::from_secs(CONNECT_TIMEOUT as _), Duration::from_millis(CONNECT_TIMEOUT as _),
res, res,
) )
.await?; .await?;