suhoan/EasyTier
1
0
Fork 0
mirror of https://mirror.suhoan.cn/https://github.com/EasyTier/EasyTier.git synced 2025-12-16 14:47:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

connector should set bind addrs correctly (#696)

Browse Source
This commit is contained in:
Sijie.Sun
2025-03-19 10:47:43 +08:00
committed by GitHub
parent 81490d0662
commit b46a200f8d
14 changed files with 97 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
easytier/src/connector/direct.rs
View File

@@ -24,6 +24,7 @@ use crate::{
},
rpc_types::controller::BaseController,
},
tunnel::IpVersion,
};
use crate::proto::cli::PeerConnInfo;
@@ -175,7 +176,7 @@ impl DirectConnectorManager {
dst_peer_id: PeerId,
addr: String,
) -> Result<(), Error> {
let connector = create_connector_by_url(&addr, &data.global_ctx).await?;
let connector = create_connector_by_url(&addr, &data.global_ctx, IpVersion::Both).await?;
let (peer_id, conn_id) = timeout(
std::time::Duration::from_secs(3),
data.peer_manager.try_direct_connect(connector),
@@ -271,7 +272,7 @@ impl DirectConnectorManager {
let mut tasks = bounded_join_set::JoinSet::new(2);
let listener_host = listener.socket_addrs(|| None).unwrap().pop();
let listener_host = listener.socket_addrs(|| None)?.pop();
match listener_host {
Some(SocketAddr::V4(s_addr)) => {
if s_addr.ip().is_unspecified() {