store DnsServer in GlobalCtx, load routes from DnsServer in ProxyCidrsMonitor

easytier/src/dns/mod.rs

@@ -2,6 +2,6 @@ mod node;
 mod node_mgr;
 pub mod config;
 mod peer_mgr;
-mod server;
+pub mod server;
 mod utils;
 pub mod zone;

easytier/src/dns/node.rs

@@ -68,12 +68,16 @@ impl DnsNode {
 
             let server = Arc::new(DnsServer::new(self.peer_mgr.clone(), rpc));
 
+            self.peer_mgr
+                .get_global_ctx_ref()
+                .set_dns(Some(server.clone()));
             tokio::join!(
                 self.peer_mgr
                     .add_nic_packet_process_pipeline(Box::new(server.clone())),
                 server.run()
             );
 
+            self.peer_mgr.get_global_ctx_ref().set_dns(None);
             let _ = self
                 .peer_mgr
                 .remove_nic_packet_process_pipeline(server.id())

easytier/src/dns/server.rs

@@ -177,8 +177,8 @@ impl DnsServer {
         }
     }
 
-    pub fn routes(&self) -> HashSet<IpAddr> {
-        self.addresses.read().iter().map(|a| a.addr.ip()).collect()
+    pub fn addresses(&self) -> HashSet<SocketAddr> {
+        self.addresses.read().iter().map(|a| a.addr).collect()
     }
 
     async fn reload_listeners(