From 1338ab343c083762e29d6617e95c114418281749 Mon Sep 17 00:00:00 2001
From: Luna Yao <40349250+ZnqbuZ@users.noreply.github.com>
Date: Mon, 27 Apr 2026 20:14:53 +0200
Subject: [PATCH] node(election): use guard to protect
 nic_packet_process_pipeline

node: guarden
---
 easytier/src/dns/node.rs | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/easytier/src/dns/node.rs b/easytier/src/dns/node.rs
index eddf0b38..64ac5de9 100644
--- a/easytier/src/dns/node.rs
+++ b/easytier/src/dns/node.rs
@@ -13,10 +13,11 @@ use crate::proto::rpc_impl::standalone::{StandAloneClient, StandAloneServer};
 use crate::proto::rpc_types::controller::BaseController;
 use crate::tunnel::tcp::{TcpTunnelConnector, TcpTunnelListener};
 use crate::utils::task::CancellableTask;
+use guarden::guard;
 use std::io;
 use std::sync::Arc;
 use tokio::sync::{Notify, broadcast};
-use tokio::task::{JoinError, JoinSet};
+use tokio::task::JoinSet;
 use tokio::time::{Instant, sleep, sleep_until};
 use tokio_util::sync::CancellationToken;
 use tracing::instrument;
@@ -76,19 +77,25 @@ impl DnsNodeRuntime {
             ));
 
             server.register(&rpc);
-
             self.global_ctx.set_dns_server(Some(server.clone()));
+
+            let guard = guard! {
+                [
+                    global_ctx = self.global_ctx.clone(),
+                    peer_mgr = self.peer_mgr.clone(),
+                    id = server.id()
+                ]
+                global_ctx.set_dns_server(None);
+                async move { let _ = peer_mgr.remove_nic_packet_process_pipeline(id).await; }
+            };
+
             tokio::join!(
                 self.peer_mgr
                     .add_nic_packet_process_pipeline(Box::new(server.clone())),
                 server.run(token.child_token())
             );
 
-            self.global_ctx.set_dns_server(None);
-            let _ = self
-                .peer_mgr
-                .remove_nic_packet_process_pipeline(server.id())
-                .await;
+            guard.trigger().await;
 
             tracing::warn!("DnsServer exited, will retry election");
         }