mirrors/rustdesk
1
0
Fork 0
mirror of https://github.com/rustdesk/rustdesk.git synced 2025-05-11 10:26:19 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

refactor
Some checks are pending
CI / x86_64-unknown-linux-gnu (ubuntu-22.04) (push) Waiting to run
Details
Full Flutter CI / run-ci (push) Waiting to run
Details

Browse source
This commit is contained in:
rustdesk 2025-05-09 01:15:12 +08:00
parent 4f6818477f
commit 86bbdf7a5d
1 changed files with 3 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/common.rs
View file

@ -524,9 +524,8 @@ pub fn test_nat_type() {
} }
let mut i = 0; let mut i = 0;
let (rendezvous_server, _, _) = get_rendezvous_server_sync(1_000);
loop { loop {
match test_nat_type_(&rendezvous_server) { match test_nat_type_() {
Ok(true) => break, Ok(true) => break,
Err(err) => { Err(err) => {
log::error!("test nat: {}", err); log::error!("test nat: {}", err);
@ -548,10 +547,10 @@ pub fn test_nat_type() {
} }
#[tokio::main(flavor = "current_thread")] #[tokio::main(flavor = "current_thread")]
async fn test_nat_type_(rendezvous_server: &str) -> ResultType<bool> { async fn test_nat_type_() -> ResultType<bool> {
log::info!("Testing nat ..."); log::info!("Testing nat ...");
let start = std::time::Instant::now(); let start = std::time::Instant::now();
let server1 = rendezvous_server; let server1 = Config::get_rendezvous_server();
let server2 = crate::increase_port(&server1, -1); let server2 = crate::increase_port(&server1, -1);
let mut msg_out = RendezvousMessage::new(); let mut msg_out = RendezvousMessage::new();
let serial = Config::get_serial(); let serial = Config::get_serial();
@ -608,11 +607,6 @@ async fn test_nat_type_(rendezvous_server: &str) -> ResultType<bool> {
Ok(ok) Ok(ok)
} }
#[tokio::main(flavor = "current_thread")]
async fn get_rendezvous_server_sync(ms_timeout: u64) -> (String, Vec<String>, bool) {
get_rendezvous_server(ms_timeout).await
}
pub async fn get_rendezvous_server(ms_timeout: u64) -> (String, Vec<String>, bool) { pub async fn get_rendezvous_server(ms_timeout: u64) -> (String, Vec<String>, bool) {
#[cfg(any(target_os = "android", target_os = "ios"))] #[cfg(any(target_os = "android", target_os = "ios"))]
let (mut a, mut b) = get_rendezvous_server_(ms_timeout); let (mut a, mut b) = get_rendezvous_server_(ms_timeout);