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

mac wakeup compact code

Browse Source
This commit is contained in:
Nikos Fazakis 2022-12-29 22:22:16 +02:00
parent 08278059ac
commit 944ca510cc
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/server.rs
View File

@ -93,14 +93,6 @@ pub fn new() -> ServerPtr {
Arc::new(RwLock::new(server)) Arc::new(RwLock::new(server))
} }
fn mac_wakeup(){
#[cfg(target_os = "macos")]{
use std::process::Command;
Command::new("/usr/bin/caffeinate").arg("-u").arg("-t 5").spawn().ok();
log::info!("wake up macos");
}
}
async fn accept_connection_(server: ServerPtr, socket: Stream, secure: bool) -> ResultType<()> { async fn accept_connection_(server: ServerPtr, socket: Stream, secure: bool) -> ResultType<()> {
let local_addr = socket.local_addr(); let local_addr = socket.local_addr();
drop(socket); drop(socket);
@ -112,7 +104,6 @@ async fn accept_connection_(server: ServerPtr, socket: Stream, secure: bool) ->
if let Ok((stream, addr)) = timeout(CONNECT_TIMEOUT, listener.accept()).await? { if let Ok((stream, addr)) = timeout(CONNECT_TIMEOUT, listener.accept()).await? {
stream.set_nodelay(true).ok(); stream.set_nodelay(true).ok();
let stream_addr = stream.local_addr()?; let stream_addr = stream.local_addr()?;
mac_wakeup();
create_tcp_connection(server, Stream::from(stream, stream_addr), addr, secure).await?; create_tcp_connection(server, Stream::from(stream, stream_addr), addr, secure).await?;
} }
Ok(()) Ok(())
@ -203,6 +194,11 @@ pub async fn create_tcp_connection(
} }
} }
#[cfg(target_os = "macos")]{
use std::process::Command;
Command::new("/usr/bin/caffeinate").arg("-u").arg("-t 5").spawn().ok();
log::info!("wake up macos");
}
Connection::start(addr, stream, id, Arc::downgrade(&server)).await; Connection::start(addr, stream, id, Arc::downgrade(&server)).await;
Ok(()) Ok(())
} }
@ -261,7 +257,6 @@ async fn create_relay_connection_(
..Default::default() ..Default::default()
}); });
stream.send(&msg_out).await?; stream.send(&msg_out).await?;
mac_wakeup();
create_tcp_connection(server, stream, peer_addr, secure).await?; create_tcp_connection(server, stream, peer_addr, secure).await?;
Ok(()) Ok(())
} }