diff --git a/easytier/src/dns/node.rs b/easytier/src/dns/node.rs index d7de8fa1..a71afc7b 100644 --- a/easytier/src/dns/node.rs +++ b/easytier/src/dns/node.rs @@ -2,7 +2,6 @@ use crate::common::global_ctx::{ArcGlobalCtx, GlobalCtxEvent}; use crate::dns::config::{DnsGlobalCtxExt, DNS_SERVER_ELECTION_INTERVAL, DNS_SERVER_RPC_ADDR}; use crate::dns::peer_mgr::DnsPeerMgr; use crate::dns::server::DnsServer; -use crate::instance::instance::ArcNicCtx; use crate::peers::peer_manager::PeerManager; use crate::peers::NicPacketFilter; use crate::proto::dns::{DnsNodeMgrRpcClientFactory, DnsPeerMgrRpcServer, HeartbeatRequest}; @@ -19,6 +18,9 @@ use tokio_util::sync::CancellationToken; use tracing::instrument; use uuid::Uuid; +#[cfg(feature = "tun")] +use crate::instance::instance::ArcNicCtx; + #[derive(Debug, Clone)] pub struct DnsNode { mgr: Arc, @@ -51,6 +53,7 @@ impl DnsNode { Self { mgr, + #[cfg(feature = "tun")] nic_ctx, peer_mgr, global_ctx, diff --git a/easytier/src/dns/server.rs b/easytier/src/dns/server.rs index 10e9aa00..5b932e46 100644 --- a/easytier/src/dns/server.rs +++ b/easytier/src/dns/server.rs @@ -3,7 +3,6 @@ use crate::dns::node_mgr::DnsNodeMgr; use crate::dns::system; use crate::dns::utils::addr::NameServerAddr; use crate::dns::utils::response::ResponseHandle; -use crate::instance::instance::{ArcNicCtx, NicCtx}; use crate::peer_center::instance::PeerCenterPeerManagerTrait; use crate::peers::peer_manager::PeerManager; use crate::peers::NicPacketFilter; @@ -34,6 +33,9 @@ use std::{sync::Arc, time::Duration}; use tokio_util::sync::CancellationToken; use tracing::{instrument, Instrument}; +#[cfg(feature = "tun")] +use crate::instance::instance::{ArcNicCtx, NicCtx}; + #[derive(Clone)] pub struct DynamicCatalog { inner: Arc>, @@ -94,6 +96,7 @@ impl DnsServer { ) -> Self { Self { mgr: Arc::new(DnsNodeMgr::new()), + #[cfg(feature = "tun")] nic_ctx, peer_mgr, global_ctx, diff --git a/easytier/src/instance/instance.rs b/easytier/src/instance/instance.rs index 7ecae865..922a289d 100644 --- a/easytier/src/instance/instance.rs +++ b/easytier/src/instance/instance.rs @@ -562,6 +562,7 @@ impl Instance { let dns = Arc::new(DnsNode::new( peer_manager.clone(), global_ctx.clone(), + #[cfg(feature = "tun")] nic_ctx.clone(), ));