Mirrors/rustdesk-server
1
0
Fork 0
mirror of https://github.com/rustdesk/rustdesk-server.git synced 2026-03-12 07:04:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into listern-for-unix-signal

Browse Source
This commit is contained in:
RustDesk
2023-01-06 11:09:52 +08:00
committed by GitHub
parent ca2bc99a38 93a89b8ea3
commit 75a40412b4
19 changed files with 1875 additions and 268 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/rendezvous_server.rs
View File

@@ -766,15 +766,11 @@ impl RendezvousServer {
) -> ResultType<()> {
let mut states = BytesMut::zeroed((peers.len() + 7) / 8);
for i in 0..peers.len() {
let peer_id = &peers[i];
// bytes index from left to right
let states_idx = i / 8;
let bit_idx = 7 - i % 8;
if let Some(peer) = self.pm.get_in_memory(&peer_id).await {
let (elapsed, _) = {
let r = peer.read().await;
(r.last_reg_time.elapsed().as_millis() as i32, r.socket_addr)
};
if let Some(peer) = self.pm.get_in_memory(&peers[i]).await {
let elapsed = peer.read().await.last_reg_time.elapsed().as_millis() as i32;
// bytes index from left to right
let states_idx = i / 8;
let bit_idx = 7 - i % 8;
if elapsed < REG_TIMEOUT {
states[states_idx] |= 0x01 << bit_idx;
}
@@ -1213,7 +1209,7 @@ async fn check_relay_servers(rs0: Arc<RelayServers>, tx: Sender) {
let rs = rs.clone();
let x = x.clone();
futs.push(tokio::spawn(async move {
if FramedStream::new(&host, "0.0.0.0:0", CHECK_RELAY_TIMEOUT)
if FramedStream::new(&host, None, CHECK_RELAY_TIMEOUT)
.await
.is_ok()
{