rustdesk/rustdesk-server
1
0
Fork 0
mirror of https://github.com/rustdesk/rustdesk-server.git synced 2025-07-03 16:25:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

handle offline

Browse Source
This commit is contained in:
open-trade 2020-04-30 10:57:54 +08:00
parent 6ae8187849
commit 66bbe7baa8
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libs/hbb_common

@ -1 +1 @@
Subproject commit 9cccda60ea8d9e7006b2f5f35898e39c77a6c8d8 Subproject commit 3d3d1bd1432f14341c7b90393206a787b95a1638

14
src/rendezvous_server.rs
View File

@ -2,13 +2,15 @@ use hbb_common::{
allow_err, bytes::BytesMut, log, protobuf::parse_from_bytes, rendezvous_proto::*, allow_err, bytes::BytesMut, log, protobuf::parse_from_bytes, rendezvous_proto::*,
tcp::new_listener, tokio, udp::FramedSocket, AddrMangle, ResultType, tcp::new_listener, tokio, udp::FramedSocket, AddrMangle, ResultType,
}; };
use std::{collections::HashMap, net::SocketAddr}; use std::{collections::HashMap, net::SocketAddr, time::Instant};
pub struct Peer { pub struct Peer {
socket_addr: SocketAddr, socket_addr: SocketAddr,
last_reg_time: Instant,
} }
type PeerMap = HashMap<String, Peer>; type PeerMap = HashMap<String, Peer>;
const REG_TIMEOUT: i32 = 30_000;
pub struct RendezvousServer { pub struct RendezvousServer {
peer_map: PeerMap, peer_map: PeerMap,
@ -47,7 +49,7 @@ impl RendezvousServer {
// B registered // B registered
if rp.id.len() > 0 { if rp.id.len() > 0 {
log::debug!("New peer registered: {:?} {:?}", &rp.id, &addr); log::debug!("New peer registered: {:?} {:?}", &rp.id, &addr);
self.peer_map.insert(rp.id, Peer { socket_addr: addr }); self.peer_map.insert(rp.id, Peer { socket_addr: addr, last_reg_time: Instant::now() });
let mut msg_out = RendezvousMessage::new(); let mut msg_out = RendezvousMessage::new();
msg_out.set_register_peer_response(RegisterPeerResponse::default()); msg_out.set_register_peer_response(RegisterPeerResponse::default());
socket.send(&msg_out, addr).await? socket.send(&msg_out, addr).await?
@ -60,6 +62,14 @@ impl RendezvousServer {
// because punch hole won't work if in the same intranet, // because punch hole won't work if in the same intranet,
// all routers will drop such self-connections. // all routers will drop such self-connections.
if let Some(peer) = self.peer_map.get(&ph.id) { if let Some(peer) = self.peer_map.get(&ph.id) {
if peer.last_reg_time.elapsed().as_millis() as i32 >= REG_TIMEOUT {
let mut msg_out = RendezvousMessage::new();
msg_out.set_punch_hole_response(PunchHoleResponse {
failure: punch_hole_response::Failure::OFFLINE.into(),
..Default::default()
});
return socket.send(&msg_out, addr).await;
}
let mut msg_out = RendezvousMessage::new(); let mut msg_out = RendezvousMessage::new();
let same_intranet = match peer.socket_addr { let same_intranet = match peer.socket_addr {
SocketAddr::V4(a) => match addr { SocketAddr::V4(a) => match addr {