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

luci-app-passwall2: sync upstream

Browse Source 
last commit: 99ab1417e5
This commit is contained in:
gitea-action 2024-11-19 00:30:32 +08:00
parent 5d0f7dd0ee
commit 3114e52247
2 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
luci-app-passwall2/Makefile
View File

@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=luci-app-passwall2
PKG_VERSION:=24.11.18
PKG_RELEASE:=1
PKG_RELEASE:=2
PKG_CONFIG_DEPENDS:= \
CONFIG_PACKAGE_$(PKG_NAME)_Iptables_Transparent_Proxy \

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

@ -781,13 +781,15 @@ function gen_config(var)
if #valid_nodes == 0 then return nil end
-- fallback node
local fallback_node_tag = nil
local fallback_node_id = _node.fallback_node
if fallback_node_id == "" then fallback_node_id = nil end
if fallback_node_id == "" or fallback_node_id == "nil" then fallback_node_id = nil end
if fallback_node_id then
local is_new_node = true
for _, outbound in ipairs(outbounds) do
if outbound.tag == fallback_node_id then
if outbound.tag:find("^" .. fallback_node_id) == 1 then
is_new_node = false
fallback_node_tag = outbound.tag
break
end
end
@ -798,12 +800,7 @@ function gen_config(var)
if outbound then
outbound.tag = outbound.tag .. ":" .. fallback_node.remarks
table.insert(outbounds, outbound)
else
fallback_node_id = nil
end
else
if not gen_balancer(fallback_node) then
fallback_node_id = nil
fallback_node_tag = outbound.tag
end
end
end
@ -811,10 +808,10 @@ function gen_config(var)
table.insert(balancers, {
tag = balancer_tag,
selector = valid_nodes,
fallbackTag = fallback_node_id,
fallbackTag = fallback_node_tag,
strategy = { type = _node.balancingStrategy or "random" }
})
if _node.balancingStrategy == "leastPing" or fallback_node_id then
if _node.balancingStrategy == "leastPing" or fallback_node_tag then
if not observatory then
observatory = {
subjectSelector = { "blc-" },
@ -1366,7 +1363,7 @@ function gen_config(var)
end
local default_dns_flag = "remote"
if not COMMON.default_outbound_tag or COMMON.default_outbound_tag == "direct" then
if (not COMMON.default_balancer_tag and COMMON.default_balancer_tag) or COMMON.default_outbound_tag == "direct" then
default_dns_flag = "direct"
end