Merge pull request #2851 from AutumnSun1996/master

Allow direct connect to {hostname}:{port}
This commit is contained in:
RustDesk
2023-01-18 14:35:50 +08:00
committed by GitHub
2 changed files with 41 additions and 1 deletions

View File

@@ -7,10 +7,10 @@ use cpal::{
use magnum_opus::{Channels::*, Decoder as AudioDecoder};
use sha2::{Digest, Sha256};
use std::{
str::FromStr,
collections::HashMap,
net::SocketAddr,
ops::{Deref, Not},
str::FromStr,
sync::{atomic::AtomicBool, mpsc, Arc, Mutex, RwLock},
};
use uuid::Uuid;
@@ -181,6 +181,13 @@ impl Client {
true,
));
}
// Allow connect to {domain}:{port}
if hbb_common::is_domain_port_str(peer) {
return Ok((
socket_client::connect_tcp(peer, RENDEZVOUS_TIMEOUT).await?,
true,
));
}
let (mut rendezvous_server, servers, contained) = crate::get_rendezvous_server(1_000).await;
let mut socket = socket_client::connect_tcp(&*rendezvous_server, RENDEZVOUS_TIMEOUT).await;
debug_assert!(!servers.contains(&rendezvous_server));