open-trade лет назад: 4
Родитель
Сommit
723e43f5d0
2 измененных файлов с 5 добавлено и 2 удалено
  1. 0 1
      src/main.rs
  2. 5 1
      src/rendezvous_server.rs

+ 0 - 1
src/main.rs

@@ -74,7 +74,6 @@ fn main() -> ResultType<()> {
74
         .collect();
74
         .collect();
75
     let addr = format!("0.0.0.0:{}", port);
75
     let addr = format!("0.0.0.0:{}", port);
76
     let addr2 = format!("0.0.0.0:{}", port.parse::<i32>().unwrap_or(0) - 1);
76
     let addr2 = format!("0.0.0.0:{}", port.parse::<i32>().unwrap_or(0) - 1);
77
-    log::info!("relay-servers={:?}", relay_servers);
78
     log::info!("serial={}", serial);
77
     log::info!("serial={}", serial);
79
     log::info!("rendezvous-servers={:?}", rendezvous_servers);
78
     log::info!("rendezvous-servers={:?}", rendezvous_servers);
80
     let stop: Arc<Mutex<bool>> = Default::default();
79
     let stop: Arc<Mutex<bool>> = Default::default();

+ 5 - 1
src/rendezvous_server.rs

@@ -169,6 +169,7 @@ impl RendezvousServer {
169
     ) -> ResultType<()> {
169
     ) -> ResultType<()> {
170
         log::info!("Listening on tcp/udp {}", addr);
170
         log::info!("Listening on tcp/udp {}", addr);
171
         log::info!("Listening on tcp {}, extra port for NAT test", addr2);
171
         log::info!("Listening on tcp {}, extra port for NAT test", addr2);
172
+        log::info!("relay-servers={:?}", relay_servers);
172
         let mut socket = FramedSocket::new(addr).await?;
173
         let mut socket = FramedSocket::new(addr).await?;
173
         let (tx, mut rx) = mpsc::unbounded_channel::<(RendezvousMessage, SocketAddr)>();
174
         let (tx, mut rx) = mpsc::unbounded_channel::<(RendezvousMessage, SocketAddr)>();
174
         let version = hbb_common::get_version_from_url(&software_url);
175
         let version = hbb_common::get_version_from_url(&software_url);
@@ -223,6 +224,9 @@ impl RendezvousServer {
223
                 Ok((stream, addr)) = listener.accept() => {
224
                 Ok((stream, addr)) = listener.accept() => {
224
                     log::debug!("Tcp connection from {:?}", addr);
225
                     log::debug!("Tcp connection from {:?}", addr);
225
                     if let Ok(local_addr) = stream.local_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
+                        }
226
                         *PUBLIC_IP.write().unwrap() = local_addr.ip().to_string();
230
                         *PUBLIC_IP.write().unwrap() = local_addr.ip().to_string();
227
                     }
231
                     }
228
                     let (a, mut b) = Framed::new(stream, BytesCodec::new()).split();
232
                     let (a, mut b) = Framed::new(stream, BytesCodec::new()).split();
@@ -708,7 +712,7 @@ pub fn test_if_valid_server(host: &str, name: &str) -> ResultType<SocketAddr> {
708
 
712
 
709
 fn check_relay_server(addr: &str) -> String {
713
 fn check_relay_server(addr: &str) -> String {
710
     if addr.contains("0.0.0.0") {
714
     if addr.contains("0.0.0.0") {
711
-        return addr.replace("0.0.0.0", &*PUBLIC_IP.read().unwrap());
715
+        return addr.replace("0.0.0.0", &PUBLIC_IP.read().unwrap());
712
     }
716
     }
713
     addr.to_owned()
717
     addr.to_owned()
714
 }
718
 }