mirror/rustdesk
1
0
Fork 0
mirror of https://github.com/rustdesk/rustdesk.git synced 2024-11-25 13:19:04 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Merge pull request #1128 from Kingtous/bugfix/connection_peer_version

Browse Source 
fix: add version key to detect specific send/recv logic
This commit is contained in:
RustDesk 2022-08-01 10:43:32 +08:00 committed by GitHub
commit 2762f541e2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libs/hbb_common/protos/message.proto
View File

@ -64,6 +64,7 @@ message LoginRequest {
}
bool video_ack_required = 9;
uint64 session_id = 10;
string version = 11;
}
message ChatMessage { string text = 1; }

8
libs/hbb_common/src/fs.rs
View File

@ -276,7 +276,7 @@ impl TransferJob {
show_hidden: bool,
is_remote: bool,
files: Vec<FileEntry>,
enable_override_detection: bool,
enable_overwrite_detection: bool,
) -> Self {
log::info!("new write {}", path);
let total_size = files.iter().map(|x| x.size as u64).sum();
@ -289,7 +289,7 @@ impl TransferJob {
is_remote,
files,
total_size,
enable_overwrite_detection: enable_override_detection,
enable_overwrite_detection,
..Default::default()
}
}
@ -301,7 +301,7 @@ impl TransferJob {
file_num: i32,
show_hidden: bool,
is_remote: bool,
enable_override_detection: bool,
enable_overwrite_detection: bool,
) -> ResultType<Self> {
log::info!("new read {}", path);
let files = get_recursive_files(&path, show_hidden)?;
@ -315,7 +315,7 @@ impl TransferJob {
is_remote,
files,
total_size,
enable_overwrite_detection: enable_override_detection,
enable_overwrite_detection,
..Default::default()
})
}

1
src/client.rs
View File

@ -1151,6 +1151,7 @@ impl LoginConfigHandler {
my_name: crate::username(),
option: self.get_option_message(true).into(),
session_id: self.session_id,
version: crate::VERSION.to_string(),
..Default::default()
};
if self.is_file_transfer {

1
src/ipc.rs
View File

@ -57,6 +57,7 @@ pub enum FS {
id: i32,
file_num: i32,
files: Vec<(String, u64)>,
overwrite_detection: bool,
},
CancelWrite {
id: i32,

5
src/mobile.rs
View File

@ -1377,9 +1377,8 @@ pub mod connection_manager {
id,
file_num,
mut files,
overwrite_detection
} => {
// in mobile, can_enable_override_detection is always true
let od = true;
WRITE_JOBS.lock().unwrap().push(fs::TransferJob::new_write(
id,
"".to_string(),
@ -1395,7 +1394,7 @@ pub mod connection_manager {
..Default::default()
})
.collect(),
true,
overwrite_detection
));
}
ipc::FS::CancelWrite { id } => {

11
src/server/connection.rs
View File

@ -1099,8 +1099,9 @@ impl Connection {
}
Some(file_action::Union::Send(s)) => {
let id = s.id;
let od =
can_enable_overwrite_detection(get_version_number(VERSION));
let od = can_enable_overwrite_detection(get_version_number(
&self.lr.version,
));
let path = s.path.clone();
match fs::TransferJob::new_read(
id,
@ -1123,6 +1124,11 @@ impl Connection {
}
}
Some(file_action::Union::Receive(r)) => {
// note: 1.1.10 introduced identical file detection, which breaks original logic of send/recv files
// whenever got send/recv request, check peer version to ensure old version of rustdesk
let od = can_enable_overwrite_detection(get_version_number(
&self.lr.version,
));
self.send_fs(ipc::FS::NewWrite {
path: r.path,
id: r.id,
@ -1133,6 +1139,7 @@ impl Connection {
.drain(..)
.map(|f| (f.name, f.modified_time))
.collect(),
overwrite_detection: od,
});
}
Some(file_action::Union::RemoveDir(d)) => {

4
src/ui/cm.rs
View File

@ -160,8 +160,8 @@ impl ConnectionManager {
id,
file_num,
mut files,
overwrite_detection
} => {
let od = can_enable_overwrite_detection(get_version_number(VERSION));
// cm has no show_hidden context
// dummy remote, show_hidden, is_remote
write_jobs.push(fs::TransferJob::new_write(
@ -179,7 +179,7 @@ impl ConnectionManager {
..Default::default()
})
.collect(),
od,
overwrite_detection,
));
}
ipc::FS::CancelWrite { id } => {