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

close all connections if cm exit unexpected, and allow retry

Browse Source 
Signed-off-by: 21pages <pages21@163.com>
This commit is contained in:
21pages 2023-11-07 17:19:33 +08:00
parent 557773144b
commit 36b574a5f8
2 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/ipc.rs
View File

@ -236,6 +236,7 @@ pub enum Data {
FileTransferLog((String, String)), FileTransferLog((String, String)),
#[cfg(windows)] #[cfg(windows)]
ControlledSessionCount(usize), ControlledSessionCount(usize),
CmErr(String),
} }
#[tokio::main(flavor = "current_thread")] #[tokio::main(flavor = "current_thread")]

32
src/server/connection.rs
View File

@ -3,6 +3,8 @@ use super::{input_service::*, *};
use crate::clipboard_file::*; use crate::clipboard_file::*;
#[cfg(not(any(target_os = "android", target_os = "ios")))] #[cfg(not(any(target_os = "android", target_os = "ios")))]
use crate::common::update_clipboard; use crate::common::update_clipboard;
#[cfg(target_os = "android")]
use crate::keyboard::client::map_key_to_control_key;
#[cfg(all(target_os = "linux", feature = "linux_headless"))] #[cfg(all(target_os = "linux", feature = "linux_headless"))]
#[cfg(not(any(feature = "flatpak", feature = "appimage")))] #[cfg(not(any(feature = "flatpak", feature = "appimage")))]
use crate::platform::linux_desktop_manager; use crate::platform::linux_desktop_manager;
@ -32,18 +34,17 @@ use hbb_common::{
get_time, get_version_number, get_time, get_version_number,
message_proto::{option_message::BoolOption, permission_info::Permission}, message_proto::{option_message::BoolOption, permission_info::Permission},
password_security::{self as password, ApproveMode}, password_security::{self as password, ApproveMode},
protobuf::EnumOrUnknown,
sleep, timeout, sleep, timeout,
tokio::{ tokio::{
net::TcpStream, net::TcpStream,
sync::mpsc, sync::mpsc,
time::{self, Duration, Instant, Interval}, time::{self, Duration, Instant, Interval},
}, },
tokio_util::codec::{BytesCodec, Framed}, protobuf::EnumOrUnknown, tokio_util::codec::{BytesCodec, Framed},
}; };
#[cfg(any(target_os = "android", target_os = "ios"))] #[cfg(any(target_os = "android", target_os = "ios"))]
use scrap::android::{call_main_service_pointer_input, call_main_service_key_event}; use scrap::android::{call_main_service_key_event, call_main_service_pointer_input};
#[cfg(target_os = "android")]
use crate::keyboard::client::map_key_to_control_key;
use serde_derive::Serialize; use serde_derive::Serialize;
use serde_json::{json, value::Value}; use serde_json::{json, value::Value};
use sha2::{Digest, Sha256}; use sha2::{Digest, Sha256};
@ -439,6 +440,13 @@ impl Connection {
conn.on_close("connection manager", true).await; conn.on_close("connection manager", true).await;
break; break;
} }
ipc::Data::CmErr(e) => {
if e != "expected" {
// cm closed before connection
conn.on_close(&format!("connection manager error: {}", e), false).await;
break;
}
}
ipc::Data::ChatMessage{text} => { ipc::Data::ChatMessage{text} => {
let mut misc = Misc::new(); let mut misc = Misc::new();
misc.set_chat_message(ChatMessage { misc.set_chat_message(ChatMessage {
@ -816,7 +824,11 @@ impl Connection {
Some(data) = rx_from_cm.recv() => { Some(data) = rx_from_cm.recv() => {
match data { match data {
ipc::Data::Close => { ipc::Data::Close => {
bail!("Close requested from selection manager"); bail!("Close requested from connection manager");
}
ipc::Data::CmErr(e) => {
log::error!("Connection manager error: {e}");
bail!("{e}");
} }
_ => {} _ => {}
} }
@ -1383,15 +1395,15 @@ impl Connection {
} }
fn is_recent_session(&mut self) -> bool { fn is_recent_session(&mut self) -> bool {
SESSIONS
.lock()
.unwrap()
.retain(|_, s| s.last_recv_time.lock().unwrap().elapsed() < SESSION_TIMEOUT);
let session = SESSIONS let session = SESSIONS
.lock() .lock()
.unwrap() .unwrap()
.get(&self.lr.my_id) .get(&self.lr.my_id)
.map(|s| s.to_owned()); .map(|s| s.to_owned());
SESSIONS
.lock()
.unwrap()
.retain(|_, s| s.last_recv_time.lock().unwrap().elapsed() < SESSION_TIMEOUT);
// last_recv_time is a mutex variable shared with connection, can be updated lively. // last_recv_time is a mutex variable shared with connection, can be updated lively.
if let Some(session) = session { if let Some(session) = session {
if session.name == self.lr.my_name if session.name == self.lr.my_name
@ -1461,6 +1473,7 @@ impl Connection {
fn try_start_cm_ipc(&mut self) { fn try_start_cm_ipc(&mut self) {
if let Some(p) = self.start_cm_ipc_para.take() { if let Some(p) = self.start_cm_ipc_para.take() {
tokio::spawn(async move { tokio::spawn(async move {
let tx_from_cm_clone = p.tx_from_cm.clone();
if let Err(err) = start_ipc( if let Err(err) = start_ipc(
p.rx_to_cm, p.rx_to_cm,
p.tx_from_cm, p.tx_from_cm,
@ -1470,6 +1483,7 @@ impl Connection {
.await .await
{ {
log::error!("ipc to connection manager exit: {}", err); log::error!("ipc to connection manager exit: {}", err);
allow_err!(tx_from_cm_clone.send(Data::CmErr(err.to_string())));
} }
}); });
#[cfg(all(windows, feature = "flutter"))] #[cfg(all(windows, feature = "flutter"))]