From 0f94c4549a36024ffacc6bb8567aa9121243fd88 Mon Sep 17 00:00:00 2001 From: gitea-action Date: Sat, 9 Nov 2024 18:03:45 +0800 Subject: [PATCH] luci-app-passwall: sync upstream last commit: https://github.com/xiaorouji/openwrt-passwall/commit/cd67fdb008375572d6681bb305a50580d61267a4 --- .../root/usr/share/passwall/helper_chinadns_add.lua | 8 ++++++++ .../root/usr/share/passwall/helper_dnsmasq_add.lua | 6 ++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/luci-app-passwall/root/usr/share/passwall/helper_chinadns_add.lua b/luci-app-passwall/root/usr/share/passwall/helper_chinadns_add.lua index a9c4d2f1f..127a170ec 100644 --- a/luci-app-passwall/root/usr/share/passwall/helper_chinadns_add.lua +++ b/luci-app-passwall/root/usr/share/passwall/helper_chinadns_add.lua @@ -307,6 +307,14 @@ if DEFAULT_TAG == "none" then table.insert(config_lines, "verdict-cache 5000") end +if DEFAULT_TAG == "chn" then + log(string.format(" - 默认：%s", DNS_LOCAL)) +elseif DEFAULT_TAG == "gfw" then + log(string.format(" - 默认：%s", DNS_TRUST)) +else + log(string.format(" - 默认：%s", "127.0.0.1#" .. LISTEN_PORT)) +end + --输出配置文件 if #config_lines > 0 then for i = 1, #config_lines do diff --git a/luci-app-passwall/root/usr/share/passwall/helper_dnsmasq_add.lua b/luci-app-passwall/root/usr/share/passwall/helper_dnsmasq_add.lua index 991f744cf..9962309ba 100644 --- a/luci-app-passwall/root/usr/share/passwall/helper_dnsmasq_add.lua +++ b/luci-app-passwall/root/usr/share/passwall/helper_dnsmasq_add.lua @@ -354,7 +354,7 @@ if not fs.access(CACHE_DNS_PATH) then end --分流规则 - if uci:get(appname, TCP_NODE, "protocol") == "_shunt" and USE_DEFAULT_DNS ~= "chinadns_ng" and CHINADNS_DNS == "0" then + if uci:get(appname, TCP_NODE, "protocol") == "_shunt" and (USE_DEFAULT_DNS ~= "chinadns_ng" or CHINADNS_DNS == "0") then local t = uci:get_all(appname, TCP_NODE) local default_node_id = t["default_node"] or "_direct" uci:foreach(appname, "shunt_rules", function(s) @@ -476,7 +476,9 @@ if DNSMASQ_CONF_FILE ~= "nil" then conf_out:write("no-poll\n") conf_out:write("no-resolv\n") conf_out:close() - log(string.format(" - 默认：%s", dnsmasq_default_dns)) + if USE_DEFAULT_DNS ~= "chinadns_ng" or CHINADNS_DNS == "0" then + log(string.format(" - 默认：%s", dnsmasq_default_dns)) + end if FLAG == "default" then local f_out = io.open("/tmp/etc/passwall/default_DNS", "a")