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

Merge branch 'rustdesk:master' into master

Browse Source
This commit is contained in:
fufesou
2022-01-07 21:30:51 +08:00
committed by GitHub
parent 54269b6f5d a7a4cd7eac
commit 709a2a30bc
10 changed files with 74 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/client.rs
View File

@@ -134,8 +134,7 @@ impl Client {
log::info!("rendezvous server: {}", rendezvous_server);
let mut socket =
socket_client::connect_tcp(&*rendezvous_server, any_addr, RENDEZVOUS_TIMEOUT)
.await?;
socket_client::connect_tcp(&*rendezvous_server, any_addr, RENDEZVOUS_TIMEOUT).await?;
let my_addr = socket.local_addr();
let mut pk = Vec::new();
let mut relay_server = "".to_owned();
@@ -682,6 +681,7 @@ pub struct LoginConfigHandler {
pub port_forward: (String, i32),
pub support_press: bool,
pub support_refresh: bool,
pub internation_keyboard: bool,
}
impl Deref for LoginConfigHandler {
@@ -938,6 +938,7 @@ impl LoginConfigHandler {
if !pi.version.is_empty() {
self.support_press = true;
self.support_refresh = true;
self.internation_keyboard = crate::get_version_number(&pi.version) > 1001008;
}
let serde = PeerInfoSerde {
username,