mirror/Easytier
1
0
Fork 0
mirror of https://github.com/EasyTier/EasyTier.git synced 2026-09-01 08:49:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

config: add disabled flag

Browse Source
This commit is contained in:
Luna Yao
2026-04-29 03:33:32 +02:00
parent 92af568d8b
commit 8c0652a2e2
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
easytier/src/dns/config/dns.rs
+1
View File
@@ -12,6 +12,7 @@ use std::collections::HashMap;
#[optional_struct(DnsConfigRaw)] #[optional_struct(DnsConfigRaw)]
#[derive(Debug, Clone, Default, PartialEq, Deserialize, Serialize)] #[derive(Debug, Clone, Default, PartialEq, Deserialize, Serialize)]
pub struct DnsConfigParsed { pub struct DnsConfigParsed {
pub disabled: bool,
#[serde(rename = "zone")] #[serde(rename = "zone")]
pub zones: Vec<ZoneConfig>, pub zones: Vec<ZoneConfig>,
#[optional_skip_wrap] #[optional_skip_wrap]
easytier/src/instance/instance.rs
+8 -9
View File
@@ -7,6 +7,12 @@ use std::sync::{Arc, Weak};
#[cfg(feature = "tun")] #[cfg(feature = "tun")]
use std::time::Duration; use std::time::Duration;
use super::listeners::ListenerManager;
use super::public_ipv6_provider::{
reconcile_public_ipv6_provider_runtime, run_public_ipv6_provider_reconcile_task,
should_run_public_ipv6_provider_reconcile, validate_public_ipv6_config,
validate_public_ipv6_config_values,
};
use crate::common::PeerId; use crate::common::PeerId;
use crate::common::acl_processor::AclRuleBuilder; use crate::common::acl_processor::AclRuleBuilder;
use crate::common::config::ConfigLoader; use crate::common::config::ConfigLoader;
@@ -17,7 +23,7 @@ use crate::connector::manual::{ConnectorManagerRpcService, ManualConnectorManage
use crate::connector::tcp_hole_punch::TcpHolePunchConnector; use crate::connector::tcp_hole_punch::TcpHolePunchConnector;
use crate::connector::udp_hole_punch::UdpHolePunchConnector; use crate::connector::udp_hole_punch::UdpHolePunchConnector;
#[cfg(feature = "magic-dns")] #[cfg(feature = "magic-dns")]
use crate::dns::node::DnsNode; use crate::dns::{config::DnsConfigLoaderExt, node::DnsNode};
use crate::gateway::icmp_proxy::IcmpProxy; use crate::gateway::icmp_proxy::IcmpProxy;
#[cfg(feature = "kcp")] #[cfg(feature = "kcp")]
use crate::gateway::kcp_proxy::{KcpProxyDst, KcpProxyDstRpcService, KcpProxySrc}; use crate::gateway::kcp_proxy::{KcpProxyDst, KcpProxyDstRpcService, KcpProxySrc};
@@ -60,13 +66,6 @@ use tokio::sync::{Mutex, Notify};
use tokio::{sync::oneshot, task::JoinSet}; use tokio::{sync::oneshot, task::JoinSet};
use tokio_util::task::AbortOnDropHandle; use tokio_util::task::AbortOnDropHandle;
use super::listeners::ListenerManager;
use super::public_ipv6_provider::{
reconcile_public_ipv6_provider_runtime, run_public_ipv6_provider_reconcile_task,
should_run_public_ipv6_provider_reconcile, validate_public_ipv6_config,
validate_public_ipv6_config_values,
};
#[cfg(feature = "socks5")] #[cfg(feature = "socks5")]
use crate::gateway::socks5::Socks5Server; use crate::gateway::socks5::Socks5Server;
@@ -930,7 +929,7 @@ impl Instance {
} }
#[cfg(feature = "magic-dns")] #[cfg(feature = "magic-dns")]
{ if !self.global_ctx.config.get_dns().disabled {
let mut node = DnsNode::new( let mut node = DnsNode::new(
self.get_peer_manager(), self.get_peer_manager(),
self.get_global_ctx(), self.get_global_ctx(),