weyne/rustdesk
1
0
Fork 0
mirror of https://github.com/weyne85/rustdesk.git synced 2025-10-29 17:00:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

enable serde feature of bytes, modify struct WriteBlock using Bytes

Browse Source
This commit is contained in:
tom
2022-07-21 16:07:19 +08:00
parent 16b7c7c716
commit 9ab955bb8e
5 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/ipc.rs
View File

@@ -17,6 +17,7 @@ use parity_tokio_ipc::{
};
use serde_derive::{Deserialize, Serialize};
use std::{collections::HashMap, sync::atomic::Ordering};
use bytes::Bytes;
#[cfg(not(windows))]
use std::{fs::File, io::prelude::*};
@@ -63,7 +64,7 @@ pub enum FS {
WriteBlock {
id: i32,
file_num: i32,
data: Vec<u8>,
data: Bytes,
compressed: bool,
},
WriteDone {

6
src/server/connection.rs
View File

@@ -1063,7 +1063,7 @@ impl Connection {
self.send_fs(ipc::FS::WriteBlock {
id: block.id,
file_num: block.file_num,
data: block.data.into(),
data: block.data,
compressed: block.compressed,
});
}
@@ -1363,8 +1363,8 @@ async fn start_ipc(
file_num,
data,
compressed}) = data {
stream.send(&Data::FS(ipc::FS::WriteBlock{id, file_num, data: Vec::new(), compressed})).await?;
stream.send_raw(data).await?;
stream.send(&Data::FS(ipc::FS::WriteBlock{id, file_num, data: Bytes::new(), compressed})).await?;
stream.send_raw(data.into()).await?;
} else {
stream.send(&data).await?;
}

2
src/ui/cm.rs
View File

@@ -263,7 +263,7 @@ impl ConnectionManager {
FileTransferBlock {
id,
file_num,
data: data.into(),
data,
compressed,
..Default::default()
},