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

opt: add prefix identifier for each session

Browse Source 
Signed-off-by: Kingtous <kingtous@qq.com>
This commit is contained in:
Kingtous 2022-06-28 22:15:00 +08:00
parent d0422fa87e
commit e0c52b49f3
3 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
flutter/lib/models/model.dart
View File

@ -924,6 +924,7 @@ class FFI {
imageModel._id = id; imageModel._id = id;
cursorModel.id = id; cursorModel.id = id;
} }
id = isFileTransfer ? 'ft_${id}' : id;
final stream = bind.sessionConnect(id: id, isFileTransfer: isFileTransfer); final stream = bind.sessionConnect(id: id, isFileTransfer: isFileTransfer);
final cb = ffiModel.startEventListener(id); final cb = ffiModel.startEventListener(id);
() async { () async {

24
src/flutter.rs
View File

@ -1,5 +1,5 @@
use crate::common::make_fd_to_json;
use crate::{client::*, flutter_ffi::EventToUI}; use crate::{client::*, flutter_ffi::EventToUI};
use crate::common::{make_fd_to_json};
use flutter_rust_bridge::{StreamSink, ZeroCopyBuffer}; use flutter_rust_bridge::{StreamSink, ZeroCopyBuffer};
use hbb_common::{ use hbb_common::{
allow_err, allow_err,
@ -49,16 +49,17 @@ impl Session {
/// ///
/// # Arguments /// # Arguments
/// ///
/// * `id` - The id of the remote session. /// * `id` - The identifier of the remote session with prefix. Regex: [\w]*[\_]*[\d]+
/// * `is_file_transfer` - If the session is used for file transfer. /// * `is_file_transfer` - If the session is used for file transfer.
pub fn start(id: &str, is_file_transfer: bool, events2ui: StreamSink<EventToUI>) { pub fn start(identifier: &str, is_file_transfer: bool, events2ui: StreamSink<EventToUI>) {
LocalConfig::set_remote_id(&id); LocalConfig::set_remote_id(&identifier);
// TODO check same id // TODO check same id
let session_id = get_session_id(identifier.to_owned());
// TODO close // TODO close
// Self::close(); // Self::close();
let events2ui = Arc::new(RwLock::new(events2ui)); let events2ui = Arc::new(RwLock::new(events2ui));
let mut session = Session { let mut session = Session {
id: id.to_owned(), id: session_id.clone(),
sender: Default::default(), sender: Default::default(),
lc: Default::default(), lc: Default::default(),
events2ui, events2ui,
@ -67,11 +68,11 @@ impl Session {
.lc .lc
.write() .write()
.unwrap() .unwrap()
.initialize(id.to_owned(), false, false); .initialize(session_id.clone(), is_file_transfer, false);
SESSIONS SESSIONS
.write() .write()
.unwrap() .unwrap()
.insert(id.to_owned(), session.clone()); .insert(identifier.to_owned(), session.clone());
std::thread::spawn(move || { std::thread::spawn(move || {
Connection::start(session, is_file_transfer); Connection::start(session, is_file_transfer);
}); });
@ -1658,3 +1659,12 @@ pub mod connection_manager {
} }
} }
} }
#[inline]
pub fn get_session_id(id: String) -> String {
return if let Some(index) = id.find('_') {
id[index + 1..].to_string()
} else {
id
};
}

2
src/flutter_ffi.rs
View File

@ -1,7 +1,7 @@
use crate::client::file_trait::FileManager; use crate::client::file_trait::FileManager;
use crate::common::make_fd_to_json;
use crate::flutter::connection_manager::{self, get_clients_length, get_clients_state}; use crate::flutter::connection_manager::{self, get_clients_length, get_clients_state};
use crate::flutter::{self, Session, SESSIONS}; use crate::flutter::{self, Session, SESSIONS};
use crate::common::make_fd_to_json;
use crate::start_server; use crate::start_server;
use crate::ui_interface; use crate::ui_interface;
use flutter_rust_bridge::{StreamSink, SyncReturn, ZeroCopyBuffer}; use flutter_rust_bridge::{StreamSink, SyncReturn, ZeroCopyBuffer};