From 8a48a6d0cbfa1e5eece37fd9d5d1dc3cefe7f3d2 Mon Sep 17 00:00:00 2001 From: "Chester A. Unal" Date: Mon, 11 May 2026 21:17:29 +0100 Subject: [PATCH] bsbf-resources: update to GIT HEAD of 2026-05-11 Update bsbf-resources to the GIT HEAD of 2026-05-11. - Do not add more than 8 WANs with files/etc/uci-defaults/99-bsbf-bonding. - resources-client/bsbf_bonding.nft now destroys the bsbf_bonding table before adding it. Therefore, no need to delete the table anymore. And use the destroy command to successfully exit even when the table doesn't exist. Signed-off-by: Chester A. Unal --- net/bsbf-resources/Makefile | 6 +++--- net/bsbf-resources/files/etc/uci-defaults/99-bsbf-bonding | 3 +++ net/bsbf-resources/files/usr/sbin/bsbf-bonding | 5 ++--- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/net/bsbf-resources/Makefile b/net/bsbf-resources/Makefile index 6cb0a6ed22..cb2cb4da6e 100644 --- a/net/bsbf-resources/Makefile +++ b/net/bsbf-resources/Makefile @@ -11,9 +11,9 @@ PKG_MAINTAINER:=Chester A. Unal PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/bondingshouldbefree/bsbf-resources.git -PKG_SOURCE_DATE:=2026-05-06 -PKG_SOURCE_VERSION:=e80c165c77765f297aa47742de450c5dcb0f43d3 -PKG_MIRROR_HASH:=8518847ef901034548abc17317a37055c5894242b576ba64da519e4aa51b2494 +PKG_SOURCE_DATE:=2026-05-11 +PKG_SOURCE_VERSION:=d4bad00854218e3ac8490ad288da6db9baf6cf1a +PKG_MIRROR_HASH:=0927c07f092375db09d1911bd516c466f3eff6a0aca4e78332dc1837e966c1a2 include $(INCLUDE_DIR)/package.mk diff --git a/net/bsbf-resources/files/etc/uci-defaults/99-bsbf-bonding b/net/bsbf-resources/files/etc/uci-defaults/99-bsbf-bonding index 6a41faa8dc..34653f0e35 100644 --- a/net/bsbf-resources/files/etc/uci-defaults/99-bsbf-bonding +++ b/net/bsbf-resources/files/etc/uci-defaults/99-bsbf-bonding @@ -66,6 +66,9 @@ fi index=1 for dev in $final_wan_interfaces; do + # Only metrics 1 to 8 must be allocated for WAN so do not add any more. + [ "$index" -gt 8 ] && break + uci -q delete network.wan$index uci set network.wan$index=interface uci set network.wan$index.device="$dev" diff --git a/net/bsbf-resources/files/usr/sbin/bsbf-bonding b/net/bsbf-resources/files/usr/sbin/bsbf-bonding index 225107e62d..781ffd9f6d 100644 --- a/net/bsbf-resources/files/usr/sbin/bsbf-bonding +++ b/net/bsbf-resources/files/usr/sbin/bsbf-bonding @@ -51,12 +51,11 @@ case "$1" in service xray restart 2>/dev/null # (Re-)add nftables rules. - nft delete table bsbf_bonding 2>/dev/null nft -f /usr/share/bsbf/bsbf_bonding.nft ;; --disable) # Delete nftables rules. - nft delete table bsbf_bonding 2>/dev/null + nft destroy table bsbf_bonding # Disable and stop init.d services. service bsbf-bonding-nft disable @@ -76,7 +75,7 @@ case "$1" in apk del bsbf-bonding bsbf-client-web bsbf-mptcp bsbf-rate-limiting # Delete nftables rules. - nft delete table bsbf_bonding 2>/dev/null + nft destroy table bsbf_bonding # Restore xray. rm -f /etc/xray/config.json