luci-app-passwall: sync upstream

last commit: dd9c9d97cc
This commit is contained in:
actions 2024-08-08 20:30:06 +08:00
parent e25080d7f2
commit 3fbed74eb7

View File

@ -201,26 +201,28 @@ if not fs.access(CACHE_DNS_PATH) then
end end
end end
local fwd_dns
local ipset_flag
local no_ipv6
--始终用国内DNS解析节点域名 --始终用国内DNS解析节点域名
if true then if true then
fwd_dns = LOCAL_DNS
if USE_DEFAULT_DNS == "chinadns_ng" and CHINADNS_DNS ~= "0" then if USE_DEFAULT_DNS == "chinadns_ng" and CHINADNS_DNS ~= "0" then
fwd_dns = nil
else else
uci:foreach(appname, "nodes", function(t) uci:foreach(appname, "nodes", function(t)
local address = t.address local address = t.address
if address == "engage.cloudflareclient.com" then return end if address == "engage.cloudflareclient.com" then return end
if datatypes.hostname(address) then if datatypes.hostname(address) then
set_domain_dns(address, LOCAL_DNS) set_domain_dns(address, fwd_dns)
set_domain_ipset(address, setflag_4 .. "passwall_vpslist," .. setflag_6 .. "passwall_vpslist6") set_domain_ipset(address, setflag_4 .. "passwall_vpslist," .. setflag_6 .. "passwall_vpslist6")
end end
end) end)
end end
log(string.format(" - 节点列表中的域名(vpslist)%s", LOCAL_DNS or "默认")) log(string.format(" - 节点列表中的域名(vpslist)%s", fwd_dns or "默认"))
end end
local fwd_dns
local ipset_flag
local no_ipv6
--直连(白名单)列表 --直连(白名单)列表
if USE_DIRECT_LIST == "1" then if USE_DIRECT_LIST == "1" then
if fs.access("/usr/share/passwall/rules/direct_host") then if fs.access("/usr/share/passwall/rules/direct_host") then