apps/EasyTier
1
0
Fork 0
mirror of https://github.com/EasyTier/EasyTier.git synced 2025-09-27 04:56:07 +08:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

limit max conn count in foreign network manager (#1041)

Browse Source
This commit is contained in:
Sijie.Sun
2025-06-22 19:11:27 +08:00
committed by GitHub
parent 762d5cd392
commit fded8b1de0
2 changed files with 43 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
easytier/src/common/constants.rs
View File

@@ -25,6 +25,8 @@ define_global_var!(OSPF_UPDATE_MY_GLOBAL_FOREIGN_NETWORK_INTERVAL_SEC, u64, 10);
define_global_var!(MACHINE_UID, Option<String>, None); define_global_var!(MACHINE_UID, Option<String>, None);
define_global_var!(MAX_DIRECT_CONNS_PER_PEER_IN_FOREIGN_NETWORK, u32, 3);
pub const UDP_HOLE_PUNCH_CONNECTOR_SERVICE_ID: u32 = 2; pub const UDP_HOLE_PUNCH_CONNECTOR_SERVICE_ID: u32 = 2;
pub const WIN_SERVICE_WORK_DIR_REG_KEY: &str = "SOFTWARE\\EasyTier\\Service\\WorkDir"; pub const WIN_SERVICE_WORK_DIR_REG_KEY: &str = "SOFTWARE\\EasyTier\\Service\\WorkDir";

41
easytier/src/peers/foreign_network_manager.rs
View File

@@ -36,6 +36,7 @@ use crate::{
peer_rpc::DirectConnectorRpcServer, peer_rpc::DirectConnectorRpcServer,
}, },
tunnel::packet_def::{PacketType, ZCPacket}, tunnel::packet_def::{PacketType, ZCPacket},
use_global_var,
}; };
use super::{ use super::{
@@ -553,6 +554,19 @@ impl ForeignNetworkManager {
if new_added { if new_added {
self.start_event_handler(&entry).await; self.start_event_handler(&entry).await;
} else {
if let Some(peer) = entry.peer_map.get_peer_by_id(peer_conn.get_peer_id()) {
let direct_conns_len = peer.get_directly_connections().len();
let max_count = use_global_var!(MAX_DIRECT_CONNS_PER_PEER_IN_FOREIGN_NETWORK);
if direct_conns_len >= max_count as usize {
return Err(anyhow::anyhow!(
"too many direct conns, cur: {}, max: {}",
direct_conns_len,
max_count
)
.into());
}
}
} }
Ok(entry.peer_map.add_new_peer_conn(peer_conn).await) Ok(entry.peer_map.add_new_peer_conn(peer_conn).await)
@@ -1205,4 +1219,31 @@ mod tests {
assert_eq!(1, pmb_net4.list_routes().await.len()); assert_eq!(1, pmb_net4.list_routes().await.len());
assert_eq!(1, pmc_net4.list_routes().await.len()); assert_eq!(1, pmc_net4.list_routes().await.len());
} }
#[tokio::test]
async fn test_foreign_network_manager_cluster_max_direct_conns() {
set_global_var!(MAX_DIRECT_CONNS_PER_PEER_IN_FOREIGN_NETWORK, 1);
let pm_center1 = create_mock_peer_manager_with_mock_stun(NatType::Unknown).await;
let pma_net1 = create_mock_peer_manager_for_foreign_network("net1").await;
connect_peer_manager(pma_net1.clone(), pm_center1.clone()).await;
wait_for_condition(
|| async { pma_net1.list_routes().await.len() == 1 },
Duration::from_secs(5),
)
.await;
println!("routes: {:?}", pma_net1.list_routes().await);
let (a_ring, b_ring) = crate::tunnel::ring::create_ring_tunnel_pair();
let a_mgr_copy = pma_net1.clone();
tokio::spawn(async move {
a_mgr_copy.add_client_tunnel(a_ring, false).await.unwrap();
});
let b_mgr_copy = pm_center1.clone();
assert!(b_mgr_copy.add_tunnel_as_server(b_ring, true).await.is_err());
}
} }