bsbf-resources: update to GIT HEAD of 2026-06-19

Update bsbf-resources to the GIT HEAD of 2026-06-19.

- files/etc/uci-defaults/99-bsbf-bonding:
  - Simplify the script and make sure multiple wan interfaces are processed
    properly.
  - Use routing table 1 instead of 100.
  - Make it able to install the bsbf-bonding package without needing
    bsbf-client-openwrt-installer.

- files/usr/sbin/bsbf-bonding:
  - Move uninstall functionality to makefile.

Signed-off-by: Chester A. Unal <redacted>

diff --git a/net/bsbf-resources/Makefile b/net/bsbf-resources/Makefile
index 72959ac0d7bdecaa3e2d46e4f93b9dd902bafcd1..51703efb55047fb7d81096348506bf78da893cc1 100644 (file)
--- a/net/bsbf-resources/Makefile
+++ b/net/bsbf-resources/Makefile
@@ -11,9 +11,9 @@ PKG_MAINTAINER:=Chester A. Unal <chester.a.unal@arinc9.com>
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/bondingshouldbefree/bsbf-resources.git
-PKG_SOURCE_DATE:=2026-05-16
-PKG_SOURCE_VERSION:=733d3159e4c769a4fdd9e42ced53e346e2582beb
-PKG_MIRROR_HASH:=95c51a6b430f7b68e0b17d581fda7ac524d5e21e66375fdd4d4f830c61b2089a
+PKG_SOURCE_DATE:=2026-06-19
+PKG_SOURCE_VERSION:=254f0088d22bceaf9c57847536fade223b75ea97
+PKG_MIRROR_HASH:=a6138aa711c32fb2d368b5d2166605b8f838f55a6845570bf5174cb8fecd97d2
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -86,6 +86,20 @@ define Package/bsbf-bonding/install
        $(INSTALL_DATA) $(PKG_BUILD_DIR)/resources-client/xray.json $(1)/usr/share/bsbf
 endef
 
+define Package/bsbf-bonding/prerm
+#!/bin/sh
+# Delete nftables rules.
+nft destroy table bsbf_bonding
+
+# Restore xray.
+rm -f /etc/xray/config.json
+uci set xray.enabled.enabled='0'
+uci commit
+service xray restart 2>/dev/null
+
+exit 0
+endef
+
 define Package/bsbf-client-web/install
        $(INSTALL_DIR) $(1)/www/bsbf-client-web
        $(INSTALL_DATA) $(PKG_BUILD_DIR)/resources-client/bsbf-client-web/index.html $(1)/www/bsbf-client-web
@@ -105,6 +119,20 @@ define Package/bsbf-mptcp/install
        $(INSTALL_BIN) $(PKG_BUILD_DIR)/resources-client/bsbf-mptcp-helper $(1)/usr/sbin
 endef
 
+define Package/bsbf-mptcp/prerm
+#!/bin/sh
+# Stop bsbf-mptcp init.d service.
+service bsbf-mptcp stop 2>/dev/null
+
+# Delete bsbf-mptcp files.
+rm -f /run/bsbf-mptcp-*
+
+# Flush the MPTCP endpoint table.
+ip mp e f
+
+exit 0
+endef
+
 define Package/bsbf-netspeed/install
        $(INSTALL_DIR) $(1)/usr/sbin
        $(INSTALL_BIN) $(PKG_BUILD_DIR)/resources-client/bsbf-netspeed $(1)/usr/sbin

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 7f26653e04dd79047129382cf89ea4843d8cfa69..5972e28385fba13dec2cabeb969ad6461604021b 100644 (file)
--- a/net/bsbf-resources/files/etc/uci-defaults/99-bsbf-bonding
+++ b/net/bsbf-resources/files/etc/uci-defaults/99-bsbf-bonding
@@ -1,18 +1,21 @@
 # SPDX-License-Identifier: AGPL-3.0-or-later
 # Copyright (C) 2025-2026 Chester A. Unal <chester.a.unal@arinc9.com>
 
-# Get the interface of lan network.
+# Exit if there is no wan firewall zone.
+fw_section=$(uci show firewall | grep "name='wan'" | cut -d. -f2)
+[ -z "$fw_section" ] && exit
+
+# Get the interface of lan network entry.
 lan_network_interface="$(uci -q get network.lan.device)"
 
-# If the interface exists, check if it is a bridge.
+# If the lan interface exists, check if it is a bridge.
 [ -n "$lan_network_interface" ] && for section in $(uci show network | grep "name='$lan_network_interface'" | cut -d. -f2); do
        [ "$(uci -q get network.$section.type)" = bridge ] && lan_section="$section" && break
 done
-if [ -n "$lan_section" ]; then
-       # Save all interfaces.
-       lan_interfaces=$(uci get network.$lan_section.ports)
-
-       # Set biggest number interface as lan network.
+# If the lan interface is a bridge, check if there are any interfaces assigned
+# to that bridge.
+if [ -n "$lan_section" ] && lan_interfaces="$(uci -q get network.$lan_section.ports)"; then
+       # Set biggest number interface as lan interface.
        lan_network_interface="$(echo $lan_interfaces | tr ' ' '\n' | grep '[0-9]\+$' | sort -V | tail -n1)"
        # If there are no interfaces with numbers, use the first interface on
        # the list.
@@ -23,50 +26,37 @@ if [ -n "$lan_section" ]; then
        uci delete network.$lan_section
 fi
 
-# Get the interface of wan network.
+# Get the interface of wan network entry.
 wan_network_interface="$(uci -q get network.wan.device)"
 
-# If the interface exists, check if it is a bridge.
+# If the wan interface exists, check if it is a bridge.
 [ -n "$wan_network_interface" ] && for section in $(uci show network | grep "name='$wan_network_interface'" | cut -d. -f2); do
        [ "$(uci -q get network.$section.type)" = bridge ] && wan_section="$section" && break
 done
-if [ -n "$wan_section" ]; then
-       # Save all interfaces.
-       wan_network_interface="$(uci get network.$wan_section.ports)"
-
+# If the wan interface is a bridge, check if there are any interfaces assigned
+# to that bridge.
+if [ -n "$wan_section" ] && wan_network_interface="$(uci -q get network.$wan_section.ports)"; then
        # Remove bridge interface.
        uci delete network.$wan_section
 fi
 
-# Add a wan network entry for wan network's interface(s) and lan network
-# interfaces other than the one used for lan, if there are any.
+# Decide the final wan interfaces. They are all wan and lan interfaces except
+# the decided lan interface.
 final_wan_interfaces="$wan_network_interface $(echo $lan_interfaces | tr ' ' '\n' | grep -v "^$lan_network_interface$")"
 
 # Exit if there are no suitable wan interfaces.
-[ -z "$(echo "$final_wan_interfaces" | tr ' ' '\n')" ] && exit
+[ -z "$(echo "$final_wan_interfaces" | tr ' ' '\n')" ] && uci revert network ; exit 0
 
 # Delete existing wan and wan6 networks.
 uci delete network.wan
 uci -q delete network.wan6
-fw_section=$(uci show firewall | grep "name='wan'" | cut -d. -f2)
-
-if [ -n "$fw_section" ]; then
-       uci -q del_list firewall.$fw_section.network='wan'
-       uci -q del_list firewall.$fw_section.network='wan6'
-# If firewall section for wan doesn't exist, create one.
-else
-       fw_section=$(uci add firewall zone)
-       uci set firewall.@zone[-1].name='wan'
-       uci set firewall.@zone[-1].input='REJECT'
-       uci set firewall.@zone[-1].output='ACCEPT'
-       uci set firewall.@zone[-1].forward='DROP'
-       uci set firewall.@zone[-1].masq='1'
-       uci set firewall.@zone[-1].mtu_fix='1'
-fi
+uci -q del_list firewall.$fw_section.network='wan'
+uci -q del_list firewall.$fw_section.network='wan6'
 
+# Add a wan network entry for every wan interface.
 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.
+       # 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
@@ -84,25 +74,36 @@ done
 # Configure xray.
 uci set xray.enabled.enabled='1'
 
-# Add rule to use routing table 100 for transparent proxy traffic.
+# Add rule to use routing table 1 for transparent proxy traffic.
 rule_section=$(uci show network | grep "mark='1'" | cut -d. -f2)
 [ -n "$rule_section" ] && uci delete network.$rule_section
-uci add network rule
+uci add network rule >/dev/null
 uci set network.@rule[-1].priority='0'
-uci set network.@rule[-1].lookup='100'
+uci set network.@rule[-1].lookup='1'
 uci set network.@rule[-1].mark='1'
 
 # Add route to route transparent proxy traffic to the loopback interface.
-route_section=$(uci show network | grep "table='100'" | cut -d. -f2)
+route_section=$(uci show network | grep "table='1'" | cut -d. -f2)
 [ -n "$route_section" ] && uci delete network.$route_section
-uci add network route
+uci add network route >/dev/null
 uci set network.@route[-1].interface='loopback'
 uci set network.@route[-1].type='local'
 uci set network.@route[-1].target='0.0.0.0/0'
-uci set network.@route[-1].table='100'
+uci set network.@route[-1].table='1'
 
 # Commit changes.
 uci commit
 
-# Enable bonding and ignore the non-zero exit code of bsbf-bonding.
-bsbf-bonding --enable || true
+# Enable bonding.
+bsbf-bonding --enable
+
+echo "Installation successful. Plug in to $(uci get network.lan.device) to access LAN."
+lan_ip=$(uci get network.lan.ipaddr)
+lan_ip=${lan_ip%% *}
+lan_ip=${lan_ip%%/*}
+echo "Head to http://$lan_ip/bsbf-client-web to access the BSBF Client Monitor."
+
+echo "Reloading network."
+service network reload
+
+exit 0

diff --git a/net/bsbf-resources/files/usr/sbin/bsbf-bonding b/net/bsbf-resources/files/usr/sbin/bsbf-bonding
index fee68f01d4a4a084b3d25dd3eba9f04fc32c51e5..75aa518886a1e38f827cff7bc7a641c892b26225 100644 (file)
--- a/net/bsbf-resources/files/usr/sbin/bsbf-bonding
+++ b/net/bsbf-resources/files/usr/sbin/bsbf-bonding
@@ -3,7 +3,7 @@
 # Copyright (C) 2026 Chester A. Unal <chester.a.unal@arinc9.com>
 
 usage() {
-       echo "Usage: $0 --status | --enable | --disable | --uninstall"
+       echo "Usage: $0 --status | --enable | --disable"
        exit 1
 }
 
@@ -70,29 +70,6 @@ case "$1" in
        # Flush the MPTCP endpoint table.
        ip mp e f
        ;;
---uninstall)
-       # Delete nftables rules.
-       nft destroy table bsbf_bonding
-
-       # Stop bsbf-mptcp init.d service.
-       service bsbf-mptcp stop 2>/dev/null
-
-       # Delete bsbf-mptcp files.
-       rm -f /run/bsbf-mptcp-*
-
-       # Flush the MPTCP endpoint table.
-       ip mp e f
-
-       # Restore xray.
-       rm -f /etc/xray/config.json
-       uci set xray.enabled.enabled='0'
-       uci commit
-       service xray restart 2>/dev/null
-
-       # Uninstall bsbf-bonding, bsbf-client-web, bsbf-mptcp, and
-       # bsbf-rate-limiting.
-       apk del bsbf-bonding bsbf-client-web bsbf-mptcp bsbf-rate-limiting
-       ;;
 *)
        usage
        ;;