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

Fix misspelled words

Browse Source
This commit is contained in:
Arash Hatami 2021-11-14 19:01:34 +03:30
parent 70a4ee4318
commit 2758f6b7d5
No known key found for this signature in database
GPG Key ID: 7DF90CA27C515736
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/platform/windows.rs
View File

@ -546,7 +546,7 @@ async fn launch_server(session_id: DWORD, close_first: bool) -> ResultType<HANDL
let wstr = wstr.as_ptr(); let wstr = wstr.as_ptr();
let h = unsafe { LaunchProcessWin(wstr, session_id, FALSE) }; let h = unsafe { LaunchProcessWin(wstr, session_id, FALSE) };
if h.is_null() { if h.is_null() {
log::error!("Failed to luanch server: {}", get_error()); log::error!("Failed to launch server: {}", get_error());
} }
Ok(h) Ok(h)
} }
@ -605,7 +605,7 @@ fn send_sas() {
} }
lazy_static::lazy_static! { lazy_static::lazy_static! {
static ref SUPRESS: Arc<Mutex<Instant>> = Arc::new(Mutex::new(Instant::now())); static ref SUPPRESS: Arc<Mutex<Instant>> = Arc::new(Mutex::new(Instant::now()));
} }
pub fn desktop_changed() -> bool { pub fn desktop_changed() -> bool {
@ -617,7 +617,7 @@ pub fn try_change_desktop() -> bool {
if inputDesktopSelected() == FALSE { if inputDesktopSelected() == FALSE {
let res = selectInputDesktop() == TRUE; let res = selectInputDesktop() == TRUE;
if !res { if !res {
let mut s = SUPRESS.lock().unwrap(); let mut s = SUPPRESS.lock().unwrap();
if s.elapsed() > std::time::Duration::from_secs(3) { if s.elapsed() > std::time::Duration::from_secs(3) {
log::error!("Failed to switch desktop: {}", get_error()); log::error!("Failed to switch desktop: {}", get_error());
*s = Instant::now(); *s = Instant::now();

14
src/server/connection.rs
View File

@ -120,13 +120,13 @@ impl Connection {
return; return;
} }
if !conn.keyboard { if !conn.keyboard {
conn.send_permisssion(Permission::Keyboard, false).await; conn.send_permission(Permission::Keyboard, false).await;
} }
if !conn.clipboard { if !conn.clipboard {
conn.send_permisssion(Permission::Clipboard, false).await; conn.send_permission(Permission::Clipboard, false).await;
} }
if !conn.audio { if !conn.audio {
conn.send_permisssion(Permission::Audio, false).await; conn.send_permission(Permission::Audio, false).await;
} }
let mut test_delay_timer = let mut test_delay_timer =
time::interval_at(Instant::now() + TEST_DELAY_TIMEOUT, TEST_DELAY_TIMEOUT); time::interval_at(Instant::now() + TEST_DELAY_TIMEOUT, TEST_DELAY_TIMEOUT);
@ -164,7 +164,7 @@ impl Connection {
log::info!("Change permission {} -> {}", name, enabled); log::info!("Change permission {} -> {}", name, enabled);
if &name == "keyboard" { if &name == "keyboard" {
conn.keyboard = enabled; conn.keyboard = enabled;
conn.send_permisssion(Permission::Keyboard, enabled).await; conn.send_permission(Permission::Keyboard, enabled).await;
if let Some(s) = conn.server.upgrade() { if let Some(s) = conn.server.upgrade() {
s.write().unwrap().subscribe( s.write().unwrap().subscribe(
NAME_CURSOR, NAME_CURSOR,
@ -172,7 +172,7 @@ impl Connection {
} }
} else if &name == "clipboard" { } else if &name == "clipboard" {
conn.clipboard = enabled; conn.clipboard = enabled;
conn.send_permisssion(Permission::Clipboard, enabled).await; conn.send_permission(Permission::Clipboard, enabled).await;
if let Some(s) = conn.server.upgrade() { if let Some(s) = conn.server.upgrade() {
s.write().unwrap().subscribe( s.write().unwrap().subscribe(
super::clipboard_service::NAME, super::clipboard_service::NAME,
@ -180,7 +180,7 @@ impl Connection {
} }
} else if &name == "audio" { } else if &name == "audio" {
conn.audio = enabled; conn.audio = enabled;
conn.send_permisssion(Permission::Audio, enabled).await; conn.send_permission(Permission::Audio, enabled).await;
if let Some(s) = conn.server.upgrade() { if let Some(s) = conn.server.upgrade() {
s.write().unwrap().subscribe( s.write().unwrap().subscribe(
super::audio_service::NAME, super::audio_service::NAME,
@ -331,7 +331,7 @@ impl Connection {
} }
} }
async fn send_permisssion(&mut self, permission: Permission, enabled: bool) { async fn send_permission(&mut self, permission: Permission, enabled: bool) {
let mut misc = Misc::new(); let mut misc = Misc::new();
misc.set_permission_info(PermissionInfo { misc.set_permission_info(PermissionInfo {
permission: permission.into(), permission: permission.into(),

8
src/server/service.rs
View File

@ -34,7 +34,7 @@ pub trait Reset {
pub struct ServiceTmpl<T: Subscriber + From<ConnInner>>(Arc<RwLock<ServiceInner<T>>>); pub struct ServiceTmpl<T: Subscriber + From<ConnInner>>(Arc<RwLock<ServiceInner<T>>>);
pub struct ServiceSwap<T: Subscriber + From<ConnInner>>(ServiceTmpl<T>); pub struct ServiceSwap<T: Subscriber + From<ConnInner>>(ServiceTmpl<T>);
pub type GenericService = ServiceTmpl<ConnInner>; pub type GenericService = ServiceTmpl<ConnInner>;
pub const HIBERATE_TIMEOUT: u64 = 30; pub const HIBERNATE_TIMEOUT: u64 = 30;
pub const MAX_ERROR_TIMEOUT: u64 = 1_000; pub const MAX_ERROR_TIMEOUT: u64 = 1_000;
impl<T: Subscriber + From<ConnInner>> ServiceInner<T> { impl<T: Subscriber + From<ConnInner>> ServiceInner<T> {
@ -191,7 +191,7 @@ impl<T: Subscriber + From<ConnInner>> ServiceTmpl<T> {
let sp = self.clone(); let sp = self.clone();
let mut callback = callback; let mut callback = callback;
let thread = thread::spawn(move || { let thread = thread::spawn(move || {
let mut error_timeout = HIBERATE_TIMEOUT; let mut error_timeout = HIBERNATE_TIMEOUT;
while sp.active() { while sp.active() {
if sp.has_subscribes() { if sp.has_subscribes() {
log::debug!("Enter {} service inner loop", sp.name()); log::debug!("Enter {} service inner loop", sp.name());
@ -199,7 +199,7 @@ impl<T: Subscriber + From<ConnInner>> ServiceTmpl<T> {
if let Err(err) = callback(sp.clone()) { if let Err(err) = callback(sp.clone()) {
log::error!("Error of {} service: {}", sp.name(), err); log::error!("Error of {} service: {}", sp.name(), err);
if tm.elapsed() > time::Duration::from_millis(MAX_ERROR_TIMEOUT) { if tm.elapsed() > time::Duration::from_millis(MAX_ERROR_TIMEOUT) {
error_timeout = HIBERATE_TIMEOUT; error_timeout = HIBERNATE_TIMEOUT;
} else { } else {
error_timeout *= 2; error_timeout *= 2;
} }
@ -213,7 +213,7 @@ impl<T: Subscriber + From<ConnInner>> ServiceTmpl<T> {
log::debug!("Exit {} service inner loop", sp.name()); log::debug!("Exit {} service inner loop", sp.name());
} }
} }
thread::sleep(time::Duration::from_millis(HIBERATE_TIMEOUT)); thread::sleep(time::Duration::from_millis(HIBERNATE_TIMEOUT));
} }
}); });
self.0.write().unwrap().handle = Some(thread); self.0.write().unwrap().handle = Some(thread);