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

Revert "temp commit"

Browse Source 
This reverts commit 2e03ca19f6.
This commit is contained in:
chenbaiyu
2022-01-13 16:07:18 +08:00
parent 1995f9fa4e
commit e51e5ac4b1
9 changed files with 119 additions and 356 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
src/ipc.rs
View File

@@ -1,10 +1,19 @@
use hbb_common::{allow_err, bail, bytes, bytes_codec::BytesCodec, config::{self, Config}, futures::StreamExt as _, futures_util::sink::SinkExt, log, timeout, tokio, tokio::io::{AsyncRead, AsyncWrite}, tokio_util::codec::Framed, ResultType};
use hbb_common::{
allow_err, bail, bytes,
bytes_codec::BytesCodec,
config::{self, Config},
futures::StreamExt as _,
futures_util::sink::SinkExt,
log, timeout, tokio,
tokio::io::{AsyncRead, AsyncWrite},
tokio_util::codec::Framed,
ResultType,
};
use parity_tokio_ipc::{
Connection as Conn, ConnectionClient as ConnClient, Endpoint, Incoming, SecurityAttributes,
};
use serde_derive::{Deserialize, Serialize};
use std::collections::HashMap;
use std::path::PathBuf;
#[cfg(not(windows))]
use std::{fs::File, io::prelude::*};
@@ -83,11 +92,6 @@ pub enum Data {
Socks(Option<config::Socks5Server>),
FS(FS),
Test,
ConfigCopyReq {
target_username: String,
dir_path: String,
},
ConfigCopyResp(Option<bool>),
}
#[tokio::main(flavor = "current_thread")]
@@ -125,7 +129,7 @@ pub async fn start(postfix: &str) -> ResultType<()> {
pub async fn new_listener(postfix: &str) -> ResultType<Incoming> {
let path = Config::ipc_path(postfix);
#[cfg(not(windows))]
check_pid(postfix).await;
check_pid(postfix).await;
let mut endpoint = Endpoint::new(path.clone());
match SecurityAttributes::allow_everyone_create() {
Ok(attr) => endpoint.set_security_attributes(attr),
@@ -135,11 +139,11 @@ pub async fn new_listener(postfix: &str) -> ResultType<Incoming> {
Ok(incoming) => {
log::info!("Started ipc{} server at path: {}", postfix, &path);
#[cfg(not(windows))]
{
use std::os::unix::fs::PermissionsExt;
std::fs::set_permissions(&path, std::fs::Permissions::from_mode(0o0777)).ok();
write_pid(postfix);
}
{
use std::os::unix::fs::PermissionsExt;
std::fs::set_permissions(&path, std::fs::Permissions::from_mode(0o0777)).ok();
write_pid(postfix);
}
Ok(incoming)
}
Err(err) => {
@@ -248,23 +252,6 @@ async fn handle(data: Data, stream: &mut Connection) {
let t = Config::get_nat_type();
allow_err!(stream.send(&Data::NatType(Some(t))).await);
}
Data::ConfigCopyReq { target_username, dir_path } => {
let from = PathBuf::from(dir_path);
if !from.exists() {
allow_err!(stream.send(&Data::ConfigCopyResp(None)).await);
return;
}
match Config::copy_and_reload_config_dir(target_username, from) {
Ok(result) => {
allow_err!(stream.send(&Data::ConfigCopyResp(Some(result))).await);
}
Err(e) => {
log::error!("copy_and_reload_config_dir failed: {:?}",e);
allow_err!(stream.send(&Data::ConfigCopyResp(Some(false))).await);
}
}
}
_ => {}
}
}
@@ -325,8 +312,8 @@ pub struct ConnectionTmpl<T> {
pub type Connection = ConnectionTmpl<Conn>;
impl<T> ConnectionTmpl<T>
where
T: AsyncRead + AsyncWrite + std::marker::Unpin,
where
T: AsyncRead + AsyncWrite + std::marker::Unpin,
{
pub fn new(conn: T) -> Self {
Self {