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

make sure conn_id > 0

Browse Source
This commit is contained in:
rustdesk 2023-07-02 01:27:34 +08:00
parent 7408a4b5e6
commit ffb11dce61
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/server.rs
View File

@ -72,6 +72,7 @@ lazy_static::lazy_static! {
// for all initiative connections. // for all initiative connections.
// //
// [Note] // [Note]
// ugly
// Now we use this [`CLIENT_SERVER`] to do following operations: // Now we use this [`CLIENT_SERVER`] to do following operations:
// - record local audio, and send to remote // - record local audio, and send to remote
pub static ref CLIENT_SERVER: ServerPtr = new(); pub static ref CLIENT_SERVER: ServerPtr = new();
@ -90,7 +91,7 @@ pub fn new() -> ServerPtr {
let mut server = Server { let mut server = Server {
connections: HashMap::new(), connections: HashMap::new(),
services: HashMap::new(), services: HashMap::new(),
id_count: hbb_common::rand::random::<i32>() % 1000, id_count: hbb_common::rand::random::<i32>() % 1000 + 1000, // ensure positive
}; };
server.add_service(Box::new(audio_service::new())); server.add_service(Box::new(audio_service::new()));
server.add_service(Box::new(video_service::new())); server.add_service(Box::new(video_service::new()));
@ -128,11 +129,7 @@ pub async fn create_tcp_connection(
secure: bool, secure: bool,
) -> ResultType<()> { ) -> ResultType<()> {
let mut stream = stream; let mut stream = stream;
let id = { let id = server.write().unwrap().get_new_id();
let mut w = server.write().unwrap();
w.id_count += 1;
w.id_count
};
let (sk, pk) = Config::get_key_pair(); let (sk, pk) = Config::get_key_pair();
if secure && pk.len() == sign::PUBLICKEYBYTES && sk.len() == sign::SECRETKEYBYTES { if secure && pk.len() == sign::PUBLICKEYBYTES && sk.len() == sign::SECRETKEYBYTES {
let mut sk_ = [0u8; sign::SECRETKEYBYTES]; let mut sk_ = [0u8; sign::SECRETKEYBYTES];
@ -305,9 +302,8 @@ impl Server {
// get a new unique id // get a new unique id
pub fn get_new_id(&mut self) -> i32 { pub fn get_new_id(&mut self) -> i32 {
let new_id = self.id_count;
self.id_count += 1; self.id_count += 1;
new_id self.id_count
} }
} }