From 89fb8bd720209ea3e150469483ee4afb59412b1f Mon Sep 17 00:00:00 2001 From: action Date: Wed, 22 Jul 2026 14:23:51 +0800 Subject: [PATCH] update 2026-07-22 14:23:51 --- dae/Makefile | 4 ++-- luci-app-passwall/luasrc/passwall/util_xray.lua | 8 ++++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dae/Makefile b/dae/Makefile index 83e2fea4..314920a4 100644 --- a/dae/Makefile +++ b/dae/Makefile @@ -5,12 +5,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dae -PKG_VERSION:=2026.07.21 +PKG_VERSION:=2026.07.22 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_PROTO:=git -PKG_SOURCE_VERSION:=c65c6bdf87cbe338697004f0a4e3fd212930a60d +PKG_SOURCE_VERSION:=aba844dae7643fbc27a14e69ec2d9ffe5980817c PKG_SOURCE_URL:=https://github.com/olicesx/dae.git PKG_MIRROR_HASH:=skip diff --git a/luci-app-passwall/luasrc/passwall/util_xray.lua b/luci-app-passwall/luasrc/passwall/util_xray.lua index 6c2ae8a5..c0f20f84 100644 --- a/luci-app-passwall/luasrc/passwall/util_xray.lua +++ b/luci-app-passwall/luasrc/passwall/util_xray.lua @@ -1049,7 +1049,7 @@ function gen_config(var) api.log(" - 加载 Xray 负载均衡 节点【" .. (_node.remarks or "") .. "】,子节点数量:" .. #(blc_nodes or {})) - local valid_nodes = {} + local valid_nodes, valid_fallback = {}, true for i = 1, #(blc_nodes or {}) do local blc_node_id = blc_nodes[i] local blc_node_tag = "blc-" .. blc_node_id @@ -1067,12 +1067,16 @@ function gen_config(var) valid_nodes[#valid_nodes + 1] = outboundTag end end + -- Check if balancing node duplicates fallback node + if _node.fallback_node == blc_node_id then + valid_fallback = false + end end if #valid_nodes == 0 then return nil end -- fallback node local fallback_node_id = _node.fallback_node - fallback_node_id = (fallback_node_id and fallback_node_id ~= "") and fallback_node_id or nil + fallback_node_id = (valid_fallback and fallback_node_id and fallback_node_id ~= "") and fallback_node_id or nil local fallback_node_tag = (fallback_node_id == "_direct") and "direct" or "blackhole" if fallback_node_id and fallback_node_id ~= "_direct" then local is_new_node = true