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

luci-app-passwall2: sync upstream

Browse Source
This commit is contained in:
actions 2024-04-12 00:30:08 +08:00
parent 174fc1ed8d
commit 947bb7d968
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
luci-app-passwall2/luasrc/passwall2/util_xray.lua
View File

@ -812,7 +812,7 @@ function gen_config(var)
if not _node then return nil, nil end if not _node then return nil, nil end
if api.is_normal_node(_node) then if api.is_normal_node(_node) then
local _proxy_node = uci:get_all(appname, proxy_node_id) or nil local _proxy_node = (proxy_node and proxy_node_id) and uci:get_all(appname, proxy_node_id) or nil
local use_proxy = _proxy_node and node[rule_name .. "_proxy_tag"] == proxy_tag and _node_id ~= proxy_node_id local use_proxy = _proxy_node and node[rule_name .. "_proxy_tag"] == proxy_tag and _node_id ~= proxy_node_id
if use_proxy and proxy_balancerTag then if use_proxy and proxy_balancerTag then
for _, blc_node_id in ipairs(_proxy_node.balancing_node) do for _, blc_node_id in ipairs(_proxy_node.balancing_node) do
@ -1114,6 +1114,8 @@ function gen_config(var)
end end
end) end)
end end
local _remote_dns_ip = nil
local _remote_dns = { local _remote_dns = {
_flag = "remote", _flag = "remote",
@ -1124,12 +1126,14 @@ function gen_config(var)
_remote_dns.address = remote_dns_udp_server _remote_dns.address = remote_dns_udp_server
_remote_dns.port = tonumber(remote_dns_udp_port) or 53 _remote_dns.port = tonumber(remote_dns_udp_port) or 53
_remote_dns_proto = "udp" _remote_dns_proto = "udp"
_remote_dns_ip = remote_dns_udp_server
end end
if remote_dns_tcp_server then if remote_dns_tcp_server then
_remote_dns.address = "tcp://" .. remote_dns_tcp_server _remote_dns.address = "tcp://" .. remote_dns_tcp_server
_remote_dns.port = tonumber(remote_dns_tcp_port) or 53 _remote_dns.port = tonumber(remote_dns_tcp_port) or 53
_remote_dns_proto = "tcp" _remote_dns_proto = "tcp"
_remote_dns_ip = remote_dns_tcp_server
end end
if remote_dns_doh_url and remote_dns_doh_host then if remote_dns_doh_url and remote_dns_doh_host then
@ -1138,6 +1142,7 @@ function gen_config(var)
end end
_remote_dns.address = remote_dns_doh_url _remote_dns.address = remote_dns_doh_url
_remote_dns.port = tonumber(remote_dns_doh_port) or 443 _remote_dns.port = tonumber(remote_dns_doh_port) or 443
_remote_dns_ip = remote_dns_doh_ip
end end
if _remote_dns.address then if _remote_dns.address then
@ -1146,7 +1151,7 @@ function gen_config(var)
table.insert(routing.rules, 1, { table.insert(routing.rules, 1, {
type = "field", type = "field",
ip = { ip = {
_remote_dns.address _remote_dns_ip
}, },
port = _remote_dns.port, port = _remote_dns.port,
network = _remote_dns_proto, network = _remote_dns_proto,