|
|
@@ -66,10 +66,6 @@ struct PeerMap {
|
|
66
|
66
|
db: super::SledAsync,
|
|
67
|
67
|
}
|
|
68
|
68
|
|
|
69
|
|
-lazy_static::lazy_static! {
|
|
70
|
|
- static ref PUBLIC_IP: Arc<RwLock<String>> = Default::default();
|
|
71
|
|
-}
|
|
72
|
|
-
|
|
73
|
69
|
pub const DEFAULT_PORT: &'static str = "21116";
|
|
74
|
70
|
|
|
75
|
71
|
impl PeerMap {
|
|
|
@@ -223,12 +219,6 @@ impl RendezvousServer {
|
|
223
|
219
|
}
|
|
224
|
220
|
Ok((stream, addr)) = listener.accept() => {
|
|
225
|
221
|
log::debug!("Tcp connection from {:?}", addr);
|
|
226
|
|
- if let Ok(local_addr) = stream.local_addr() {
|
|
227
|
|
- if PUBLIC_IP.write().unwrap().is_empty() {
|
|
228
|
|
- log::info!("Public ip is {}", local_addr.ip().to_string());
|
|
229
|
|
- }
|
|
230
|
|
- *PUBLIC_IP.write().unwrap() = local_addr.ip().to_string();
|
|
231
|
|
- }
|
|
232
|
222
|
let (a, mut b) = Framed::new(stream, BytesCodec::new()).split();
|
|
233
|
223
|
let tcp_punch = rs.tcp_punch.clone();
|
|
234
|
224
|
let mut rs = rs.clone();
|
|
|
@@ -604,7 +594,7 @@ impl RendezvousServer {
|
|
604
|
594
|
};
|
|
605
|
595
|
msg_out.set_fetch_local_addr(FetchLocalAddr {
|
|
606
|
596
|
socket_addr,
|
|
607
|
|
- relay_server: check_relay_server(&self.relay_servers[i]),
|
|
|
597
|
+ relay_server: self.relay_servers[i].clone(),
|
|
608
|
598
|
..Default::default()
|
|
609
|
599
|
});
|
|
610
|
600
|
} else {
|
|
|
@@ -621,7 +611,7 @@ impl RendezvousServer {
|
|
621
|
611
|
msg_out.set_punch_hole(PunchHole {
|
|
622
|
612
|
socket_addr,
|
|
623
|
613
|
nat_type: ph.nat_type,
|
|
624
|
|
- relay_server: check_relay_server(&self.relay_servers[i]),
|
|
|
614
|
+ relay_server: self.relay_servers[i].clone(),
|
|
625
|
615
|
..Default::default()
|
|
626
|
616
|
});
|
|
627
|
617
|
}
|
|
|
@@ -709,10 +699,3 @@ pub fn test_if_valid_server(host: &str, name: &str) -> ResultType<SocketAddr> {
|
|
709
|
699
|
}
|
|
710
|
700
|
res
|
|
711
|
701
|
}
|
|
712
|
|
-
|
|
713
|
|
-fn check_relay_server(addr: &str) -> String {
|
|
714
|
|
- if addr.contains("0.0.0.0") {
|
|
715
|
|
- return addr.replace("0.0.0.0", &PUBLIC_IP.read().unwrap());
|
|
716
|
|
- }
|
|
717
|
|
- addr.to_owned()
|
|
718
|
|
-}
|