hongshaorou/rustdesk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix, win clipboard, remove duplicated state

Browse Source 
Signed-off-by: dignow <linlong1265@gmail.com>
This commit is contained in:
dignow 2023-07-31 20:33:19 +08:00
parent e143493d7b
commit 416cdac1fe
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/ui_cm_interface.rs
View File

@ -68,7 +68,6 @@ struct IpcTaskRunner<T: InvokeUiCM> {
rx: mpsc::UnboundedReceiver<Data>, rx: mpsc::UnboundedReceiver<Data>,
close: bool, close: bool,
running: bool, running: bool,
authorized: bool,
conn_id: i32, conn_id: i32,
#[cfg(windows)] #[cfg(windows)]
file_transfer_enabled: bool, file_transfer_enabled: bool,
@ -162,6 +161,16 @@ impl<T: InvokeUiCM> ConnectionManager<T> {
self.ui_handler.add_connection(&client); self.ui_handler.add_connection(&client);
} }
#[inline]
fn is_authorized(&self, id: i32) -> bool {
CLIENTS
.read()
.unwrap()
.get(&id)
.map(|c| c.authorized)
.unwrap_or(false)
}
fn remove_connection(&self, id: i32, close: bool) { fn remove_connection(&self, id: i32, close: bool) {
if close { if close {
CLIENTS.write().unwrap().remove(&id); CLIENTS.write().unwrap().remove(&id);
@ -316,13 +325,14 @@ impl<T: InvokeUiCM> IpcTaskRunner<T> {
// for tmp use, without real conn id // for tmp use, without real conn id
let mut write_jobs: Vec<fs::TransferJob> = Vec::new(); let mut write_jobs: Vec<fs::TransferJob> = Vec::new();
let is_authorized = self.cm.is_authorized(self.conn_id);
#[cfg(windows)] #[cfg(windows)]
let rx_clip1; let rx_clip1;
let mut rx_clip; let mut rx_clip;
let _tx_clip; let _tx_clip;
#[cfg(windows)] #[cfg(windows)]
if self.conn_id > 0 && self.authorized { if is_authorized {
rx_clip1 = clipboard::get_rx_cliprdr_server(self.conn_id); rx_clip1 = clipboard::get_rx_cliprdr_server(self.conn_id);
rx_clip = rx_clip1.lock().await; rx_clip = rx_clip1.lock().await;
} else { } else {
@ -361,7 +371,6 @@ impl<T: InvokeUiCM> IpcTaskRunner<T> {
Data::Login{id, is_file_transfer, port_forward, peer_id, name, authorized, keyboard, clipboard, audio, file, file_transfer_enabled: _file_transfer_enabled, restart, recording, from_switch} => { Data::Login{id, is_file_transfer, port_forward, peer_id, name, authorized, keyboard, clipboard, audio, file, file_transfer_enabled: _file_transfer_enabled, restart, recording, from_switch} => {
log::debug!("conn_id: {}", id); log::debug!("conn_id: {}", id);
self.cm.add_connection(id, is_file_transfer, port_forward, peer_id, name, authorized, keyboard, clipboard, audio, file, restart, recording, from_switch,self.tx.clone()); self.cm.add_connection(id, is_file_transfer, port_forward, peer_id, name, authorized, keyboard, clipboard, audio, file, restart, recording, from_switch,self.tx.clone());
self.authorized = authorized;
self.conn_id = id; self.conn_id = id;
#[cfg(windows)] #[cfg(windows)]
{ {
@ -413,7 +422,7 @@ impl<T: InvokeUiCM> IpcTaskRunner<T> {
if stop { if stop {
ContextSend::set_is_stopped(); ContextSend::set_is_stopped();
} else { } else {
if !self.authorized { if !is_authorized {
log::debug!("Clipboard message from client peer, but not authorized"); log::debug!("Clipboard message from client peer, but not authorized");
continue; continue;
} }
@ -469,7 +478,6 @@ impl<T: InvokeUiCM> IpcTaskRunner<T> {
} }
} }
Data::Authorize => { Data::Authorize => {
self.authorized = true;
self.running = true; self.running = true;
break; break;
} }
@ -514,7 +522,6 @@ impl<T: InvokeUiCM> IpcTaskRunner<T> {
rx, rx,
close: true, close: true,
running: true, running: true,
authorized: false,
conn_id: 0, conn_id: 0,
#[cfg(windows)] #[cfg(windows)]
file_transfer_enabled: false, file_transfer_enabled: false,