diff --git a/easytier/src/dns/mod.rs b/easytier/src/dns/mod.rs index 29eb0710..74b4822d 100644 --- a/easytier/src/dns/mod.rs +++ b/easytier/src/dns/mod.rs @@ -1,7 +1,8 @@ +pub mod config; mod node; mod node_mgr; -pub mod config; mod peer_mgr; pub mod server; +pub mod system; mod utils; pub mod zone; diff --git a/easytier/src/instance/dns_server/system_config/darwin.rs b/easytier/src/dns/system/darwin.rs similarity index 100% rename from easytier/src/instance/dns_server/system_config/darwin.rs rename to easytier/src/dns/system/darwin.rs diff --git a/easytier/src/instance/dns_server/system_config/linux.rs b/easytier/src/dns/system/linux.rs similarity index 100% rename from easytier/src/instance/dns_server/system_config/linux.rs rename to easytier/src/dns/system/linux.rs diff --git a/easytier/src/instance/dns_server/system_config/mod.rs b/easytier/src/dns/system/mod.rs similarity index 100% rename from easytier/src/instance/dns_server/system_config/mod.rs rename to easytier/src/dns/system/mod.rs diff --git a/easytier/src/instance/dns_server/system_config/windows.rs b/easytier/src/dns/system/windows.rs similarity index 100% rename from easytier/src/instance/dns_server/system_config/windows.rs rename to easytier/src/dns/system/windows.rs diff --git a/easytier/src/instance/dns_server/mod.rs b/easytier/src/instance/dns_server/mod.rs index 1bec8c06..64144c5b 100644 --- a/easytier/src/instance/dns_server/mod.rs +++ b/easytier/src/instance/dns_server/mod.rs @@ -10,11 +10,9 @@ pub mod client_instance; pub mod runner; #[cfg(feature = "magic-dns")] pub mod server_instance; -#[cfg(feature = "magic-dns")] -pub mod system_config; #[cfg(all(test, feature = "tun", feature = "magic-dns"))] -mod tests; +pub mod tests; pub static MAGIC_DNS_INSTANCE_ADDR: &str = "tcp://127.0.0.1:49813"; pub static MAGIC_DNS_FAKE_IP: &str = "100.100.100.101"; diff --git a/easytier/src/instance/dns_server/server_instance.rs b/easytier/src/instance/dns_server/server_instance.rs index 2d3129f1..9699d0bc 100644 --- a/easytier/src/instance/dns_server/server_instance.rs +++ b/easytier/src/instance/dns_server/server_instance.rs @@ -9,9 +9,9 @@ use super::{ config::{GeneralConfigBuilder, RunConfigBuilder}, server::Server, - system_config::{OSConfig, SystemConfig}, MAGIC_DNS_INSTANCE_ADDR, }; +use crate::dns::system::{OSConfig, SystemConfig}; use crate::{ common::{ ifcfg::{IfConfiger, IfConfiguerTrait}, @@ -495,14 +495,14 @@ fn get_system_config( ) -> Result>, anyhow::Error> { #[cfg(target_os = "windows")] { - use super::system_config::windows::WindowsDNSManager; + use crate::dns::system::windows::WindowsDNSManager; let tun_name = _tun_name.ok_or_else(|| anyhow::anyhow!("No tun name"))?; return Ok(Some(Box::new(WindowsDNSManager::new(tun_name)?))); } #[cfg(all(target_os = "macos", not(feature = "macos-ne")))] { - use super::system_config::darwin::DarwinConfigurator; + use crate::dns::system_config::darwin::DarwinConfigurator; return Ok(Some(Box::new(DarwinConfigurator::new()))); }