hongshaorou/rustdesk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix nat test, must reuse the local address, to fix #4348

Browse Source
This commit is contained in:
rustdesk 2023-05-14 23:31:32 +08:00
parent 81f548b36e
commit 400aa61c6a
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/common.rs
View File

@ -552,10 +552,14 @@ async fn test_nat_type_() -> ResultType<bool> {
}); });
let mut port1 = 0; let mut port1 = 0;
let mut port2 = 0; let mut port2 = 0;
let mut local_addr = None;
for i in 0..2 { for i in 0..2 {
let server = if i == 0 { &*server1 } else { &*server2 }; let server = if i == 0 { &*server1 } else { &*server2 };
let mut socket = socket_client::connect_tcp(server, CONNECT_TIMEOUT).await?; let mut socket =
socket_client::connect_tcp_local(server, local_addr, CONNECT_TIMEOUT).await?;
if i == 0 { if i == 0 {
// reuse the local addr is required for nat test
local_addr = Some(socket.local_addr());
Config::set_option( Config::set_option(
"local-ip-addr".to_owned(), "local-ip-addr".to_owned(),
socket.local_addr().ip().to_string(), socket.local_addr().ip().to_string(),