use more accurate regex for {domain}:{port}

This commit is contained in:
qiushiyang
2023-01-18 06:08:46 +00:00
parent 12d446b217
commit aa2cd37fb3
2 changed files with 29 additions and 23 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,14 +181,10 @@ impl Client {
true,
));
}
// Allow connect to {hostname}:{port}
if hbb_common::is_hostname_port_str(peer) {
// Allow connect to {domain}:{port}
if hbb_common::is_domain_port_str(peer) {
return Ok((
socket_client::connect_tcp(
peer,
RENDEZVOUS_TIMEOUT,
)
.await?,
socket_client::connect_tcp(peer, RENDEZVOUS_TIMEOUT).await?,
true,
));
}