RustDesk/rustdesk
1
0
Fork 0
mirror of https://github.com/rustdesk/rustdesk.git synced 2026-02-17 22:11:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: rdp (#11670)

Browse Source 
Signed-off-by: fufesou <linlong1266@gmail.com>
This commit is contained in:
fufesou
2025-05-07 21:24:14 +08:00
committed by GitHub
parent 419bb3f0b0
commit 61cdb60362
2 changed files with 41 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/ipc.rs
View File

@@ -280,6 +280,8 @@ pub enum Data {
not(any(target_os = "android", target_os = "ios"))
))]
ControllingSessionCount(usize),
#[cfg(target_os = "windows")]
PortForwardSessionCount(Option<usize>),
}
#[tokio::main(flavor = "current_thread")]
@@ -692,6 +694,25 @@ async fn handle(data: Data, stream: &mut Connection) {
// This branch is left blank for unification and further use.
}
},
#[cfg(target_os = "windows")]
Data::PortForwardSessionCount(c) => match c {
None => {
let count = crate::server::AUTHED_CONNS
.lock()
.unwrap()
.iter()
.filter(|c| c.conn_type == crate::server::AuthConnType::PortForward)
.count();
allow_err!(
stream
.send(&Data::PortForwardSessionCount(Some(count)))
.await
);
}
_ => {
// Port forward session count is only a get value.
}
},
_ => {}
}
}
@@ -1201,6 +1222,16 @@ pub async fn notify_server_to_check_hwcodec() -> ResultType<()> {
Ok(())
}
#[cfg(target_os = "windows")]
pub async fn get_port_forward_session_count(ms_timeout: u64) -> ResultType<usize> {
let mut c = connect(ms_timeout, "").await?;
c.send(&Data::PortForwardSessionCount(None)).await?;
if let Some(Data::PortForwardSessionCount(Some(count))) = c.next_timeout(ms_timeout).await? {
return Ok(count);
}
bail!("Failed to get port forward session count");
}
#[cfg(feature = "hwcodec")]
#[cfg(not(any(target_os = "android", target_os = "ios")))]
#[tokio::main(flavor = "current_thread")]

13
src/platform/windows.rs
View File

@@ -573,7 +573,11 @@ async fn run_service(_arguments: Vec<OsString>) -> ResultType<()> {
let current_active_session = unsafe { get_current_session(share_rdp()) };
if session_id != current_active_session {
session_id = current_active_session;
h_process = launch_server(session_id, true).await.unwrap_or(NULL);
// https://github.com/rustdesk/rustdesk/discussions/10039
let count = ipc::get_port_forward_session_count(1000).await.unwrap_or(0);
if count == 0 {
h_process = launch_server(session_id, true).await.unwrap_or(NULL);
}
}
}
let res = timeout(super::SERVICE_INTERVAL, incoming.next()).await;
@@ -622,8 +626,11 @@ async fn run_service(_arguments: Vec<OsString>) -> ResultType<()> {
if tmp != session_id && stored_usid != Some(session_id) {
log::info!("session changed from {} to {}", session_id, tmp);
session_id = tmp;
send_close_async("").await.ok();
close_sent = true;
let count = ipc::get_port_forward_session_count(1000).await.unwrap_or(0);
if count == 0 {
send_close_async("").await.ok();
close_sent = true;
}
}
let mut exit_code: DWORD = 0;
if h_process.is_null()