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

fix peer_remove & peer_add event handler (#27)

Browse Source
This commit is contained in:
Sijie.Sun
2024-03-06 23:52:56 +08:00
committed by GitHub
parent 278a4846f1
commit 5f30747f62
3 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
easytier-core/src/connector/manual.rs
View File

@@ -220,8 +220,8 @@ impl ManualConnectorManager {
log::warn!("peer conn removed: {:?}", conn_info); log::warn!("peer conn removed: {:?}", conn_info);
} }
GlobalCtxEvent::PeerAdded(..) => todo!(), GlobalCtxEvent::PeerAdded(..) => {}
GlobalCtxEvent::PeerRemoved(..) => todo!(), GlobalCtxEvent::PeerRemoved(..) => {}
} }
} }

2
easytier-core/src/peers/peer.rs
View File

@@ -146,8 +146,6 @@ impl Peer {
impl Drop for Peer { impl Drop for Peer {
fn drop(&mut self) { fn drop(&mut self) {
self.shutdown_notifier.notify_one(); self.shutdown_notifier.notify_one();
self.global_ctx
.issue_event(GlobalCtxEvent::PeerRemoved(self.peer_node_id));
tracing::info!("peer {} drop", self.peer_node_id); tracing::info!("peer {} drop", self.peer_node_id);
} }
} }

12
easytier-core/src/peers/peer_map.rs
View File

@@ -6,7 +6,10 @@ use tokio::sync::{mpsc, RwLock};
use tokio_util::bytes::Bytes; use tokio_util::bytes::Bytes;
use crate::{ use crate::{
common::{error::Error, global_ctx::ArcGlobalCtx}, common::{
error::Error,
global_ctx::{ArcGlobalCtx, GlobalCtxEvent},
},
rpc::PeerConnInfo, rpc::PeerConnInfo,
tunnels::TunnelError, tunnels::TunnelError,
}; };
@@ -31,7 +34,10 @@ impl PeerMap {
} }
async fn add_new_peer(&self, peer: Peer) { async fn add_new_peer(&self, peer: Peer) {
self.peer_map.insert(peer.peer_node_id, Arc::new(peer)); let peer_id = peer.peer_node_id.clone();
self.peer_map.insert(peer_id.clone(), Arc::new(peer));
self.global_ctx
.issue_event(GlobalCtxEvent::PeerAdded(peer_id));
} }
pub async fn add_new_peer_conn(&self, peer_conn: PeerConn) { pub async fn add_new_peer_conn(&self, peer_conn: PeerConn) {
@@ -174,6 +180,8 @@ impl PeerMap {
pub async fn close_peer(&self, peer_id: &PeerId) -> Result<(), TunnelError> { pub async fn close_peer(&self, peer_id: &PeerId) -> Result<(), TunnelError> {
let remove_ret = self.peer_map.remove(peer_id); let remove_ret = self.peer_map.remove(peer_id);
self.global_ctx
.issue_event(GlobalCtxEvent::PeerRemoved(peer_id.clone()));
tracing::info!( tracing::info!(
?peer_id, ?peer_id,
has_old_value = ?remove_ret.is_some(), has_old_value = ?remove_ret.is_some(),