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

more log

Browse Source
This commit is contained in:
open-trade 2021-03-24 16:12:54 +08:00
parent 825a9b5b59
commit 723e43f5d0
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main.rs
View File

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

6
src/rendezvous_server.rs
View File

@ -169,6 +169,7 @@ impl RendezvousServer {
) -> ResultType<()> { ) -> ResultType<()> {
log::info!("Listening on tcp/udp {}", addr); log::info!("Listening on tcp/udp {}", addr);
log::info!("Listening on tcp {}, extra port for NAT test", addr2); log::info!("Listening on tcp {}, extra port for NAT test", addr2);
log::info!("relay-servers={:?}", relay_servers);
let mut socket = FramedSocket::new(addr).await?; let mut socket = FramedSocket::new(addr).await?;
let (tx, mut rx) = mpsc::unbounded_channel::<(RendezvousMessage, SocketAddr)>(); let (tx, mut rx) = mpsc::unbounded_channel::<(RendezvousMessage, SocketAddr)>();
let version = hbb_common::get_version_from_url(&software_url); let version = hbb_common::get_version_from_url(&software_url);
@ -223,6 +224,9 @@ impl RendezvousServer {
Ok((stream, addr)) = listener.accept() => { Ok((stream, addr)) = listener.accept() => {
log::debug!("Tcp connection from {:?}", addr); log::debug!("Tcp connection from {:?}", addr);
if let Ok(local_addr) = stream.local_addr() { if let Ok(local_addr) = stream.local_addr() {
if PUBLIC_IP.write().unwrap().is_empty() {
log::info!("Public ip is {}", local_addr.ip().to_string());
}
*PUBLIC_IP.write().unwrap() = local_addr.ip().to_string(); *PUBLIC_IP.write().unwrap() = local_addr.ip().to_string();
} }
let (a, mut b) = Framed::new(stream, BytesCodec::new()).split(); 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> {
fn check_relay_server(addr: &str) -> String { fn check_relay_server(addr: &str) -> String {
if addr.contains("0.0.0.0") { if addr.contains("0.0.0.0") {
return addr.replace("0.0.0.0", &*PUBLIC_IP.read().unwrap()); return addr.replace("0.0.0.0", &PUBLIC_IP.read().unwrap());
} }
addr.to_owned() addr.to_owned()
} }