🌴 Sync 2026-11-16 12:09:10

This commit is contained in:
github-actions[bot] committed 2026-11-16 12:09:10 +08:00
1 parent 30cbf03f19
commit 9947095834
13 files changed
+108 -144

No files matched your search

@@ -506,7 +506,7 @@ _apply_dnsmasq_config() {
setup_dns() {
local enabled=$(uci -q get "$UCI_CONFIG.global.enabled")
local dns_proxy_enabled=$(uci -q get "$UCI_CONFIG.global.dns_proxy_enabled")
local proxy_server_dns_port=$(uci -q get "$UCI_CONFIG.global.proxy_server_dns_port"); proxy_server_dns_port="${proxy_server_dns_port:-5353}"
local proxy_server_dns_port=$(uci -q get "$UCI_CONFIG.global.proxy_server_dns_port"); proxy_server_dns_port="${proxy_server_dns_port:-53}"
local proxy_server_ip_addr=$(uci -q get "$UCI_CONFIG.global.proxy_server_ip_addr")
# Only apply DNS proxy if BOTH main service and DNS proxy are enabled
@@ -93,10 +93,12 @@ const methods = {
running: (real_running || degraded_active) ? 1 : 0,
degraded: degraded_active,
dns_running: dns_running,
watchdog_running: watchdog_running ? 1 : 0,
enabled: int(uci_cursor.get(UCI_CONFIG, 'global', 'enabled') || '0'),
monitor_enabled: monitor_enabled,
monitor_interval: int(uci_cursor.get(UCI_CONFIG, 'global', 'monitor_interval') || '5'),
proxy_server_ip_addr: proxy_server_ip_addr,
proxy_server_dns_port: uci_cursor.get(UCI_CONFIG, 'global', 'proxy_server_dns_port') || '5353',
proxy_server_dns_port: uci_cursor.get(UCI_CONFIG, 'global', 'proxy_server_dns_port') || '53',
lan_ip: safe_trim(lan_ip),
interface: uci_cursor.get(UCI_CONFIG, 'global', 'interface') || 'auto',
traffic_mark: uci_cursor.get(UCI_CONFIG, 'global', 'traffic_mark') || '0x666',