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: 7838cb3152
This commit is contained in:
gitea-action 2024-11-24 23:00:29 +08:00
parent 4121ac2d66
commit 56f85dbcd6
1 changed files with 33 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
luci-app-passwall/root/usr/share/passwall/helper_smartdns_add.lua
View File

@ -104,19 +104,42 @@ if LOCAL_GROUP == "nil" then
log(" * 注意：国内分组名未设置，可能会导致 DNS 分流错误！") log(" * 注意：国内分组名未设置，可能会导致 DNS 分流错误！")
else else
--从smartdns配置中读取参数 --从smartdns配置中读取参数
local custom_conf_path = "/etc/smartdns/custom.conf"
local options = { local options = {
{key = "dualstack_ip_selection", value = "1", arg = "-d no", invert = true}, {key = "dualstack_ip_selection", config_key = "dualstack-ip-selection", yes_no = true, arg_yes = "-d yes", arg_no = "-d no", default = "yes"},
{key = "speed_check_mode", prefix = "-c "}, {key = "speed_check_mode", config_key = "speed-check-mode", prefix = "-c ", default = "ping,tcp:80,tcp:443"},
{key = "serve_expired", value = "1", arg = "-no-serve-expired", invert = true}, {key = "serve_expired", config_key = "serve-expired", yes_no = true, arg_yes = "", arg_no = "-no-serve-expired", default = "yes"},
{key = "response_mode", prefix = "-r "}, {key = "response_mode", config_key = "response-mode", prefix = "-r ", default = "first-ping"},
{key = "rr_ttl", prefix = "-rr-ttl "}, {key = "rr_ttl", config_key = "rr-ttl", prefix = "-rr-ttl "},
{key = "rr_ttl_min", prefix = "-rr-ttl-min "}, {key = "rr_ttl_min", config_key = "rr-ttl-min", prefix = "-rr-ttl-min "},
{key = "rr_ttl_max", prefix = "-rr-ttl-max "} {key = "rr_ttl_max", config_key = "rr-ttl-max", prefix = "-rr-ttl-max "}
} }
-- 从 custom.conf 中读取值，以最后出现的值为准
local custom_config = {}
local f_in = io.open(custom_conf_path, "r")
if f_in then
for line in f_in:lines() do
line = line:match("^%s*(.-)%s*$")
if line ~= "" and not line:match("^#") then
local param, value = line:match("^(%S+)%s+(%S+)$")
if param and value then custom_config[param] = value end
end
end
f_in:close()
end
-- 从 smartdns 配置中读取值，优先级以 custom.conf 为准
for _, opt in ipairs(options) do for _, opt in ipairs(options) do
local val = uci:get("smartdns", "@smartdns[0]", opt.key) local val = custom_config[opt.config_key] or uci:get("smartdns", "@smartdns[0]", opt.key) or opt.default
if val and (not opt.value or (opt.invert and val ~= opt.value) or (not opt.invert and val == opt.value)) then if val == "yes" then val = "1" elseif val == "no" then val = "0" end
LOCAL_EXTEND_ARG = LOCAL_EXTEND_ARG .. (LOCAL_EXTEND_ARG ~= "" and " " or "") .. (opt.prefix or "") .. (opt.arg or val) if opt.yes_no then
local arg = (val == "1" and opt.arg_yes or opt.arg_no)
if arg and arg ~= "" then
LOCAL_EXTEND_ARG = LOCAL_EXTEND_ARG .. (LOCAL_EXTEND_ARG ~= "" and " " or "") .. arg
end
else
if val and (not opt.value or (opt.invert and val ~= opt.value) or (not opt.invert and val == opt.value)) then
LOCAL_EXTEND_ARG = LOCAL_EXTEND_ARG .. (LOCAL_EXTEND_ARG ~= "" and " " or "") .. (opt.prefix or "") .. (opt.arg or val)
end
end end
end end
end end