From 66bbe7baa88f0244483630a2f481458402634895 Mon Sep 17 00:00:00 2001
From: open-trade <info@opentradesolutions.com>
Date: Thu, 30 Apr 2020 10:57:54 +0800
Subject: [PATCH] handle offline

---
 libs/hbb_common          |  2 +-
 src/rendezvous_server.rs | 14 ++++++++++++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/libs/hbb_common b/libs/hbb_common
index 9cccda6..3d3d1bd 160000
--- a/libs/hbb_common
+++ b/libs/hbb_common
@@ -1 +1 @@
-Subproject commit 9cccda60ea8d9e7006b2f5f35898e39c77a6c8d8
+Subproject commit 3d3d1bd1432f14341c7b90393206a787b95a1638
diff --git a/src/rendezvous_server.rs b/src/rendezvous_server.rs
index 922c427..18301b6 100644
--- a/src/rendezvous_server.rs
+++ b/src/rendezvous_server.rs
@@ -2,13 +2,15 @@ use hbb_common::{
     allow_err, bytes::BytesMut, log, protobuf::parse_from_bytes, rendezvous_proto::*,
     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 {
     socket_addr: SocketAddr,
+    last_reg_time: Instant,
 }
 
 type PeerMap = HashMap<String, Peer>;
+const REG_TIMEOUT: i32 = 30_000;
 
 pub struct RendezvousServer {
     peer_map: PeerMap,
@@ -47,7 +49,7 @@ impl RendezvousServer {
                     // B registered
                     if rp.id.len() > 0 {
                         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();
                         msg_out.set_register_peer_response(RegisterPeerResponse::default());
                         socket.send(&msg_out, addr).await?
@@ -60,6 +62,14 @@ impl RendezvousServer {
                     // because punch hole won't work if in the same intranet,
                     // all routers will drop such self-connections.
                     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 same_intranet = match peer.socket_addr {
                             SocketAddr::V4(a) => match addr {