🎈 Sync 2026-10-08 00:15:00

luci-theme-vantage/Makefile

@@ -11,7 +11,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=luci-theme-vantage
 PKG_VERSION:=1.0.1
-PKG_RELEASE:=12
+PKG_RELEASE:=13
 PKG_LICENSE:=GPL-3.0-or-later
 
 LUCI_TITLE:=Vantage theme

luci-theme-vantage/htdocs/luci-static/vantage/vantage.css

@@ -16,7 +16,7 @@
 	--font: system-ui, -apple-system, "Segoe UI", Roboto, Inter, "Helvetica Neue", Arial, sans-serif;
 	--mono: ui-monospace, "JetBrains Mono", "SFMono-Regular", "Cascadia Mono", system-ui, Menlo, Consolas, monospace;
 
-	--fs-micro: 11px;
+	--fs-micro: 11.5px;
 	--fs-sm: 12px;
 	--fs-base: 13px;
 	--fs-md: 14px;

mptcp/Makefile

@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=mptcp
 PKG_VERSION:=6.1
-PKG_RELEASE:=20
+PKG_RELEASE:=21
 
 PKG_MAINTAINER:=Ycarus (Yannick Chabanois) <ycarus@zugaina.org>
 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)

mptcp/files/etc/init.d/mptcp

@@ -8,6 +8,7 @@ USE_PROCD=1
 
 . /usr/lib/unbound/iptools.sh
 . /lib/functions/network.sh
+. /usr/lib/mptcp/init_helpers.sh
 
 restart_scheduler_dependent_services() {
 	local proxy vpn
@@ -799,11 +800,13 @@ start_service() {
 		config_foreach add_route6 route6
 		[ -z "$intf" ] && set_multipath
 	
-		# If no master is defined, one interface is defined as master
+		# If the master interface is disabled, another one is set as master.
+		# Not when no interface is set as master: the interfaces then share
+		# the balancing routes evenly, instead of 100 to 1 for a master.
 		if [ "$master" = "" ] && [ -z "$intf" ]; then
 			intfmaster="$mptcpmintf"
-			[ "$intfmaster" != "" ] && [ -z "$(uci -q show network | grep \"multipath='master'\")" ] && {
-				logger -t "MPTCP" "No master multipath defined, setting it to $intfmaster"
+			[ "$intfmaster" != "" ] && mptcp_has_master_multipath && {
+				logger -t "MPTCP" "Master multipath interface disabled, setting it to $intfmaster"
 				uci -q set network.${intfmaster}.multipath="master"
 				uci -q set openmptcprouter.${intfmaster}.multipath="master"
 			}
@@ -824,8 +827,12 @@ start_service() {
 
 stop_service() {
 	local pin_dir="/sys/fs/bpf/mptcp"
+	# Deleting the pinned link unregisters the scheduler, as in
+	# global_multipath_settings: "bpftool struct_ops unregister" takes a map
+	# id or name, not a pinned path, so it failed and the pins were kept.
 	for pin in "$pin_dir"/*; do
-		[ -e "$pin" ] && bpftool struct_ops unregister pinned "$pin" >/dev/null 2>&1 && rm -f "$pin"
+		[ -e "$pin" ] || continue
+		rm -f "$pin"
 	done
 }
 

mptcp/files/usr/bin/multipath

@@ -7,7 +7,8 @@
 # Released under GPL 3 or later
 
 if [ -d "/proc/sys/net/mptcp" ]; then
-        if ([ -f /proc/sys/net/mptcp/mptcp_enabled ] && [ `cat /proc/sys/net/mptcp/mptcp_enabled` = 0 ]) || ([ -f /proc/sys/net/mptcp/enabled ] && [ `cat /proc/sys/net/mptcp/enabled` = 0 ]); then
+        # read, not `cat` in two subshells: this runs on every call
+        if { [ -f /proc/sys/net/mptcp/mptcp_enabled ] && read -r mptcp_enabled < /proc/sys/net/mptcp/mptcp_enabled && [ "$mptcp_enabled" = 0 ]; } || { [ -f /proc/sys/net/mptcp/enabled ] && read -r mptcp_enabled < /proc/sys/net/mptcp/enabled && [ "$mptcp_enabled" = 0 ]; }; then
                 echo "MPTCP is disabled!"
                 exit 1
         fi
@@ -188,9 +189,32 @@ else
 		}
 	fi
 	if [ -n "$endpoint" ]; then
-        ID=$(echo "${endpoint}" | sort | grep -F "dev $DEVICE " | awk '{print $3}')
-        IFF=$(echo "${endpoint}" | sort | grep -F -m 1 "dev $DEVICE " | awk '{print $4; exit}')
-        IFF2=$(echo "${endpoint}" | sort | grep -F -m 1 "dev $DEVICE " | awk '{print $5; exit}')
+		# The ids of the device's endpoints, and the flags of its first
+		# endpoint in sorted order. A sort|grep|awk pipeline for each of the
+		# three cost 15 processes per call, and a status query runs for every
+		# device ("multipath" alone lists them all): one pass over the list
+		# gives the same values without any when the device has one endpoint.
+		ep_count=0
+		while IFS= read -r ep_line; do
+			case "$ep_line" in
+				*"dev $DEVICE "*)
+					ep_first="$ep_line"
+					ep_count=$((ep_count + 1))
+					;;
+			esac
+		done <<EOF
+$endpoint
+EOF
+		if [ "$ep_count" -gt 1 ]; then
+			ID=$(echo "${endpoint}" | sort | grep -F "dev $DEVICE " | awk '{print $3}')
+			ep_first=$(echo "${endpoint}" | sort | grep -F -m 1 "dev $DEVICE ")
+		fi
+		if [ "$ep_count" -gt 0 ]; then
+			read -r ep_addr ep_idkw ep_id IFF IFF2 ep_rest <<EOF
+$ep_first
+EOF
+			[ "$ep_count" -gt 1 ] || ID="$ep_id"
+		fi
 	fi
 	if [ -n "$TYPE" ]; then
 		#IP=$(ip a show $DEVICE | sed -En 's/127.0.0.1//;s/.*inet (addr:)?(([0-9]*\.){3}[0-9]*).*/\2/p')