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

remove unnessarey dns call

Browse Source
This commit is contained in:
rustdesk 2021-05-23 00:14:00 +08:00
parent b7ab1405ee
commit bdfb59dd1a
3 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/common.rs
View File

@ -154,6 +154,7 @@ pub fn test_nat_type() {
#[tokio::main(basic_scheduler)] #[tokio::main(basic_scheduler)]
async fn test_nat_type_() -> ResultType<bool> { async fn test_nat_type_() -> ResultType<bool> {
log::info!("Testing nat ...");
let start = std::time::Instant::now(); let start = std::time::Instant::now();
let rendezvous_server = get_rendezvous_server(100).await; let rendezvous_server = get_rendezvous_server(100).await;
let server1 = rendezvous_server; let server1 = rendezvous_server;
@ -206,7 +207,7 @@ async fn test_nat_type_() -> ResultType<bool> {
NatType::SYMMETRIC NatType::SYMMETRIC
}; };
Config::set_nat_type(t as _); Config::set_nat_type(t as _);
log::info!("tested nat type: {:?} in {:?}", t, start.elapsed()); log::info!("Tested nat type: {:?} in {:?}", t, start.elapsed());
} }
Ok(ok) Ok(ok)
} }
@ -235,6 +236,7 @@ pub async fn get_nat_type(ms_timeout: u64) -> i32 {
#[tokio::main(basic_scheduler)] #[tokio::main(basic_scheduler)]
async fn test_rendezvous_server_() { async fn test_rendezvous_server_() {
let servers = Config::get_rendezvous_servers(); let servers = Config::get_rendezvous_servers();
hbb_common::config::ONLINE.lock().unwrap().clear();
let mut futs = Vec::new(); let mut futs = Vec::new();
for host in servers { for host in servers {
futs.push(tokio::spawn(async move { futs.push(tokio::spawn(async move {

3
src/ipc.rs
View File

@ -93,9 +93,6 @@ pub enum Data {
#[tokio::main(basic_scheduler)] #[tokio::main(basic_scheduler)]
pub async fn start(postfix: &str) -> ResultType<()> { pub async fn start(postfix: &str) -> ResultType<()> {
if postfix.is_empty() {
crate::common::test_nat_type();
}
let mut incoming = new_listener(postfix).await?; let mut incoming = new_listener(postfix).await?;
loop { loop {
if let Some(result) = incoming.next().await { if let Some(result) = incoming.next().await {

9
src/rendezvous_mediator.rs
View File

@ -39,11 +39,20 @@ pub struct RendezvousMediator {
impl RendezvousMediator { impl RendezvousMediator {
pub async fn start_all() { pub async fn start_all() {
let mut nat_tested = false;
check_zombie(); check_zombie();
let server = new_server(); let server = new_server();
if Config::get_nat_type() == NatType::UNKNOWN_NAT as i32 {
crate::common::test_nat_type();
nat_tested = true;
}
loop { loop {
Config::reset_online(); Config::reset_online();
if Config::get_option("stop-service").is_empty() { if Config::get_option("stop-service").is_empty() {
if !nat_tested {
crate::common::test_nat_type();
nat_tested = true;
}
let mut futs = Vec::new(); let mut futs = Vec::new();
let servers = Config::get_rendezvous_servers(); let servers = Config::get_rendezvous_servers();
for host in servers.clone() { for host in servers.clone() {