mirror/Easytier
1
0
Fork 0
mirror of https://github.com/EasyTier/EasyTier.git synced 2026-05-07 02:09:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

clippy all codes (#1214)

Browse Source 
1. clippy code
2. add fmt and clippy check in ci
This commit is contained in:
Sijie.Sun
2025-08-10 22:56:41 +08:00
committed by GitHub
parent 0087ac3ffc
commit e43537939a
144 changed files with 1475 additions and 1531 deletions
Download Patch File Download Diff File Expand all files Collapse all files
easytier/src/peers/foreign_network_manager.rs
+51 -48
View File
@@ -362,31 +362,32 @@ impl ForeignNetworkEntry {
.get_gateway_peer_id(to_peer_id, NextHopPolicy::LeastHop)
.await;
if gateway_peer_id.is_some() && peer_map.has_peer(gateway_peer_id.unwrap()) {
if let Err(e) = peer_map
.send_msg_directly(zc_packet, gateway_peer_id.unwrap())
.await
{
tracing::error!(
?e,
"send packet to foreign peer inside peer map failed"
match gateway_peer_id {
Some(peer_id) if peer_map.has_peer(peer_id) => {
if let Err(e) = peer_map.send_msg_directly(zc_packet, peer_id).await {
tracing::error!(
?e,
"send packet to foreign peer inside peer map failed"
);
}
}
_ => {
let mut foreign_packet = ZCPacket::new_for_foreign_network(
&network_name,
to_peer_id,
&zc_packet,
);
let via_peer = gateway_peer_id.unwrap_or(to_peer_id);
foreign_packet.fill_peer_manager_hdr(
my_node_id,
via_peer,
PacketType::ForeignNetworkPacket as u8,
);
if let Err(e) = pm_sender.send(foreign_packet).await {
tracing::error!("send packet to peer with pm failed: {:?}", e);
}
}
} else {
let mut foreign_packet = ZCPacket::new_for_foreign_network(
&network_name,
to_peer_id,
&zc_packet,
);
foreign_packet.fill_peer_manager_hdr(
my_node_id,
gateway_peer_id.unwrap_or(to_peer_id),
PacketType::ForeignNetworkPacket as u8,
);
if let Err(e) = pm_sender.send(foreign_packet).await {
tracing::error!("send packet to peer with pm failed: {:?}", e);
}
}
};
}
}
});
@@ -434,9 +435,10 @@ impl ForeignNetworkManagerData {
let _ = v.remove(network_name);
v.is_empty()
});
if let Some(_) = self
if self
.network_peer_maps
.remove_if(network_name, |_, v| v.peer_map.is_empty())
.is_some()
{
self.network_peer_last_update.remove(network_name);
}
@@ -446,7 +448,7 @@ impl ForeignNetworkManagerData {
let Some(peer_map) = self
.network_peer_maps
.get(network_name)
.and_then(|v| Some(v.peer_map.clone()))
.map(|v| v.peer_map.clone())
else {
return;
};
@@ -492,7 +494,7 @@ impl ForeignNetworkManagerData {
self.peer_network_map
.entry(dst_peer_id)
.or_insert_with(|| DashSet::new())
.or_default()
.insert(network_identity.network_name.clone());
self.network_peer_last_update
@@ -553,7 +555,7 @@ impl ForeignNetworkManager {
self.data
.network_peer_maps
.get(network_name)
.and_then(|v| Some(v.my_peer_id))
.map(|v| v.my_peer_id)
}
pub async fn add_peer_conn(&self, peer_conn: PeerConn) -> Result<(), Error> {
@@ -574,7 +576,7 @@ impl ForeignNetworkManager {
&peer_conn.get_network_identity(),
peer_conn.get_my_peer_id(),
peer_conn.get_peer_id(),
!ret.is_err(),
ret.is_ok(),
&self.global_ctx,
&self.packet_sender_to_mgr,
)
@@ -608,22 +610,21 @@ impl ForeignNetworkManager {
if new_added {
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());
}
} 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)
entry.peer_map.add_new_peer_conn(peer_conn).await;
Ok(())
}
async fn start_event_handler(&self, entry: &ForeignNetworkEntry) {
@@ -686,9 +687,11 @@ impl ForeignNetworkManager {
peers: Default::default(),
};
for peer in item.peer_map.list_peers().await {
let mut peer_info = PeerInfo::default();
peer_info.peer_id = peer;
peer_info.conns = item.peer_map.list_peer_conns(peer).await.unwrap_or(vec![]);
let peer_info = PeerInfo {
peer_id: peer,
conns: item.peer_map.list_peer_conns(peer).await.unwrap_or(vec![]),
..Default::default()
};
entry.peers.push(peer_info);
}
@@ -701,7 +704,7 @@ impl ForeignNetworkManager {
self.data
.network_peer_last_update
.get(network_name)
.map(|v| v.clone())
.map(|v| *v)
}
pub async fn send_msg_to_peer(
@@ -820,7 +823,7 @@ pub mod tests {
let pm_center = create_mock_peer_manager_with_mock_stun(NatType::Unknown).await;
tracing::debug!("pm_center: {:?}", pm_center.my_peer_id());
let mut flag = pm_center.get_global_ctx().get_flags();
flag.relay_network_whitelist = vec!["net1".to_string(), "net2*".to_string()].join(" ");
flag.relay_network_whitelist = ["net1".to_string(), "net2*".to_string()].join(" ");
pm_center.get_global_ctx().config.set_flags(flag);
let pma_net1 = create_mock_peer_manager_for_foreign_network(name.as_str()).await;
@@ -1026,7 +1029,7 @@ pub mod tests {
drop(pm_center);
wait_for_condition(
|| async { pma_net1.list_routes().await.len() == 0 },
|| async { pma_net1.list_routes().await.is_empty() },
Duration::from_secs(5),
)
.await;
@@ -1168,7 +1171,7 @@ pub mod tests {
println!("drop pm_center1, id: {:?}", pm_center1.my_peer_id());
drop(pm_center1);
wait_for_condition(
|| async { pma_net1.list_routes().await.len() == 0 },
|| async { pma_net1.list_routes().await.is_empty() },
Duration::from_secs(5),
)
.await;