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: d978d14d63
This commit is contained in:
actions 2024-05-10 11:30:05 +08:00
parent 63ffcf0f4e
commit 767ede6a16
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
luci-app-passwall/luasrc/passwall/util_xray.lua
View File

@ -767,8 +767,8 @@ function gen_config(var)
end end
if node.protocol == "_shunt" then if node.protocol == "_shunt" then
local proxy_node_id = node["main_node"] local proxy_tag = node.preproxy_enabled == "1" and "main" or nil
local proxy_tag = "main" local proxy_node_id = proxy_tag and node["main_node"] or nil
local proxy_balancer_tag local proxy_balancer_tag
local proxy_nodes local proxy_nodes
@ -862,7 +862,6 @@ function gen_config(var)
end end
return outbound_tag, nil return outbound_tag, nil
elseif _node.protocol == "_balancing" then elseif _node.protocol == "_balancing" then
return nil, gen_balancer(_node, rule_name) return nil, gen_balancer(_node, rule_name)
elseif _node.protocol == "_iface" then elseif _node.protocol == "_iface" then
if _node.iface then if _node.iface then
@ -884,7 +883,7 @@ function gen_config(var)
end end
--proxy_node --proxy_node
if node.preproxy_enabled == "1" and proxy_node_id then if proxy_tag and proxy_node_id then
local proxy_outbound_tag local proxy_outbound_tag
proxy_outbound_tag, proxy_balancer_tag = gen_shunt_node(proxy_tag, proxy_node_id) proxy_outbound_tag, proxy_balancer_tag = gen_shunt_node(proxy_tag, proxy_node_id)
if proxy_balancer_tag then if proxy_balancer_tag then