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

node: save global_ctx as a field

Browse Source
This commit is contained in:
Luna Yao
2026-04-06 11:54:02 +02:00
parent a44a98d7c4
commit 833ed8d8b8
1 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
easytier/src/dns/node.rs
+13 -10
View File
@@ -1,4 +1,4 @@
use crate::common::global_ctx::GlobalCtxEvent; use crate::common::global_ctx::{ArcGlobalCtx, GlobalCtxEvent};
use crate::common::PeerId; use crate::common::PeerId;
use crate::dns::config::{DNS_SERVER_ELECTION_INTERVAL, DNS_SERVER_RPC_ADDR}; use crate::dns::config::{DNS_SERVER_ELECTION_INTERVAL, DNS_SERVER_RPC_ADDR};
use crate::dns::peer_mgr::DnsPeerMgr; use crate::dns::peer_mgr::DnsPeerMgr;
@@ -20,11 +20,12 @@ use uuid::Uuid;
pub struct DnsNode { pub struct DnsNode {
mgr: Arc<DnsPeerMgr>, mgr: Arc<DnsPeerMgr>,
global_ctx: ArcGlobalCtx,
peer_mgr: Arc<PeerManager>, peer_mgr: Arc<PeerManager>,
} }
impl DnsNode { impl DnsNode {
pub fn new(peer_mgr: Arc<PeerManager>) -> Self { pub fn new(global_ctx: ArcGlobalCtx, peer_mgr: Arc<PeerManager>) -> Self {
let mgr = Arc::new(DnsPeerMgr::new(peer_mgr.clone())); let mgr = Arc::new(DnsPeerMgr::new(peer_mgr.clone()));
peer_mgr peer_mgr
.get_peer_rpc_mgr() .get_peer_rpc_mgr()
@@ -32,14 +33,18 @@ impl DnsNode {
.registry() .registry()
.register( .register(
DnsPeerMgrRpcServer::new_arc(mgr.clone()), DnsPeerMgrRpcServer::new_arc(mgr.clone()),
&peer_mgr.get_global_ctx_ref().get_network_name(), &global_ctx.get_network_name(),
); );
Self { mgr, peer_mgr } Self {
mgr,
global_ctx,
peer_mgr,
}
} }
pub fn id(&self) -> Uuid { pub fn id(&self) -> Uuid {
self.peer_mgr.get_global_ctx_ref().get_id() self.global_ctx.get_id()
} }
pub async fn run(&self) { pub async fn run(&self) {
@@ -68,16 +73,14 @@ impl DnsNode {
let server = Arc::new(DnsServer::new(self.peer_mgr.clone(), rpc)); let server = Arc::new(DnsServer::new(self.peer_mgr.clone(), rpc));
self.peer_mgr self.global_ctx.set_dns(Some(server.clone()));
.get_global_ctx_ref()
.set_dns(Some(server.clone()));
tokio::join!( tokio::join!(
self.peer_mgr self.peer_mgr
.add_nic_packet_process_pipeline(Box::new(server.clone())), .add_nic_packet_process_pipeline(Box::new(server.clone())),
server.run() server.run()
); );
self.peer_mgr.get_global_ctx_ref().set_dns(None); self.global_ctx.set_dns(None);
let _ = self let _ = self
.peer_mgr .peer_mgr
.remove_nic_packet_process_pipeline(server.id()) .remove_nic_packet_process_pipeline(server.id())
@@ -99,7 +102,7 @@ impl DnsNode {
let sleep = sleep_until(last_heartbeat); let sleep = sleep_until(last_heartbeat);
tokio::pin!(sleep); tokio::pin!(sleep);
let mut subscriber = self.peer_mgr.get_global_ctx_ref().subscribe(); let mut subscriber = self.global_ctx.subscribe();
let mut tasks = JoinSet::new(); let mut tasks = JoinSet::new();
loop { loop {