zhao/openwrt_helloworld
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

luci-app-passwall: sync upstream

Browse Source 
last commit: cd67fdb008
This commit is contained in:
gitea-action 2024-11-09 18:03:45 +08:00
parent 47b92e29ba
commit 0f94c4549a
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
luci-app-passwall/root/usr/share/passwall/helper_chinadns_add.lua
View File

@ -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

6
luci-app-passwall/root/usr/share/passwall/helper_dnsmasq_add.lua
View File

@ -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")