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

debug server clipboard enabled

Browse Source 
Signed-off-by: fufesou <shuanglongchen@yeah.net>
This commit is contained in:
fufesou 2023-06-19 21:44:32 +08:00
parent f12e86be3a
commit 2240853633
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libs/clipboard/src/context_send.rs
View File

@ -19,6 +19,7 @@ impl ContextSend {
} }
} }
#[inline]
pub fn is_server_enabled() -> bool { pub fn is_server_enabled() -> bool {
CONTEXT_SEND.lock().unwrap().server_enabled CONTEXT_SEND.lock().unwrap().server_enabled
} }

8
src/server/connection.rs
View File

@ -439,9 +439,10 @@ impl Connection {
#[cfg(windows)] #[cfg(windows)]
ipc::Data::ClipboardFile(clip) => { ipc::Data::ClipboardFile(clip) => {
let is_stopping_allowed = clip.is_stopping_allowed(); let is_stopping_allowed = clip.is_stopping_allowed();
let is_clipboard_enabled = clipboard::ContextSend::is_server_enabled();
let file_transfer_enabled = conn.file_transfer_enabled(); let file_transfer_enabled = conn.file_transfer_enabled();
let stop = is_stopping_allowed && !file_transfer_enabled; let stop = is_stopping_allowed && !(is_clipboard_enabled && file_transfer_enabled);
log::debug!("Process clipboard message from cm, stop: {}, is_stopping_allowed: {}, file_transfer_enabled: {}", stop, is_stopping_allowed, file_transfer_enabled); log::debug!("Process clipboard message from cm, stop: {}, is_stopping_allowed: {}, is_clipboard_enabled: {}, file_transfer_enabled: {}", stop, is_stopping_allowed, is_clipboard_enabled, file_transfer_enabled);
if !stop { if !stop {
allow_err!(conn.stream.send(&clip_2_msg(clip)).await); allow_err!(conn.stream.send(&clip_2_msg(clip)).await);
} }
@ -1639,7 +1640,8 @@ impl Connection {
update_clipboard(_cb, None); update_clipboard(_cb, None);
} }
} }
Some(message::Union::Cliprdr(_clip)) => { Some(message::Union::Cliprdr(_clip)) =>
{
#[cfg(windows)] #[cfg(windows)]
if let Some(clip) = msg_2_clip(_clip) { if let Some(clip) = msg_2_clip(_clip) {
self.send_to_cm(ipc::Data::ClipboardFile(clip)) self.send_to_cm(ipc::Data::ClipboardFile(clip))

10
src/ui_cm_interface.rs
View File

@ -402,9 +402,10 @@ impl<T: InvokeUiCM> IpcTaskRunner<T> {
#[cfg(windows)] #[cfg(windows)]
{ {
let is_stopping_allowed = _clip.is_stopping_allowed(); let is_stopping_allowed = _clip.is_stopping_allowed();
let is_clipboard_enabled = ContextSend::is_server_enabled();
let file_transfer_enabled = self.file_transfer_enabled; let file_transfer_enabled = self.file_transfer_enabled;
let stop = is_stopping_allowed && !file_transfer_enabled; let stop = !is_stopping_allowed && !(is_clipboard_enabled && file_transfer_enabled);
log::debug!("Process clipboard message from peer, stop: {}, is_stopping_allowed: {}, file_transfer_enabled: {}", stop, is_stopping_allowed, file_transfer_enabled); log::debug!("Process clipboard message from peer, stop: {}, is_stopping_allowed: {}, is_clipboard_enabled: {}, file_transfer_enabled: {}", stop, is_stopping_allowed, is_clipboard_enabled, file_transfer_enabled);
if !stop { if !stop {
let conn_id = self.conn_id; let conn_id = self.conn_id;
ContextSend::proc(|context: &mut Box<CliprdrClientContext>| -> u32 { ContextSend::proc(|context: &mut Box<CliprdrClientContext>| -> u32 {
@ -456,9 +457,10 @@ impl<T: InvokeUiCM> IpcTaskRunner<T> {
#[cfg(windows)] #[cfg(windows)]
{ {
let is_stopping_allowed = _clip.is_stopping_allowed(); let is_stopping_allowed = _clip.is_stopping_allowed();
let is_clipboard_enabled = ContextSend::is_server_enabled();
let file_transfer_enabled = self.file_transfer_enabled; let file_transfer_enabled = self.file_transfer_enabled;
let stop = is_stopping_allowed && !file_transfer_enabled; let stop = is_stopping_allowed && !(is_clipboard_enabled && file_transfer_enabled);
log::debug!("Process clipboard message from cm, stop: {}, is_stopping_allowed: {}, file_transfer_enabled: {}", stop, is_stopping_allowed, file_transfer_enabled); log::debug!("Process clipboard message from cm, stop: {}, is_stopping_allowed: {}, is_clipboard_enabled: {}, file_transfer_enabled: {}", stop, is_stopping_allowed, is_clipboard_enabled, file_transfer_enabled);
if !stop { if !stop {
allow_err!(self.tx.send(Data::ClipboardFile(_clip))); allow_err!(self.tx.send(Data::ClipboardFile(_clip)));
} }