From d54eb97201eb523a6cb56ce50c9d83a80669e907 Mon Sep 17 00:00:00 2001 From: Luna Yao <40349250+ZnqbuZ@users.noreply.github.com> Date: Sat, 21 Feb 2026 22:45:25 +0100 Subject: [PATCH] server: rename zones dirty flag to catalog --- easytier/src/dns/client_mgr.rs | 4 ++-- easytier/src/dns/server.rs | 8 ++------ 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/easytier/src/dns/client_mgr.rs b/easytier/src/dns/client_mgr.rs index 085609d8..f9a813e0 100644 --- a/easytier/src/dns/client_mgr.rs +++ b/easytier/src/dns/client_mgr.rs @@ -41,7 +41,7 @@ const DNS_CLIENT_TTL: Duration = Duration::from_secs(5); // TODO: same as DnsPeerMgrDirtyState #[derive(Debug, Default, Deref, DerefMut)] pub struct DnsClientMgrDirtyState { - pub(super) zones: DirtyFlag, + pub(super) catalog: DirtyFlag, pub(super) addresses: DirtyFlag, pub(super) listeners: DirtyFlag, #[deref] @@ -141,7 +141,7 @@ impl DnsClientMgrRpc for DnsClientMgr { let new = DnsClientInfo::try_from(snapshot)?; let old = self.clients.get(&id).await.unwrap_or_default(); if new.digest != old.digest { - self.dirty.zones.mark(); + self.dirty.catalog.mark(); if new.addresses != old.addresses { self.dirty.addresses.mark(); } diff --git a/easytier/src/dns/server.rs b/easytier/src/dns/server.rs index a9a6c798..22331971 100644 --- a/easytier/src/dns/server.rs +++ b/easytier/src/dns/server.rs @@ -148,10 +148,6 @@ pub struct DnsServer { const DNS_SERVER_LISTENER_TCP_TIMEOUT: Duration = Duration::from_secs(5); impl DnsServer { - async fn reload_zones(&self) { - self.catalog.replace(self.mgr.catalog()).await; - } - async fn reload_addresses(&self, addresses: impl IntoIterator) { let addresses = addresses.into_iter().collect::>(); @@ -208,8 +204,8 @@ impl DnsServer { loop { dirty.notified().await; - if dirty.zones.reset() { - self.reload_zones(&self.mgr.collect_zones()).await; + if dirty.catalog.reset() { + self.catalog.replace(self.mgr.catalog()).await; } if dirty.addresses.reset() {