💋 Sync 2026-07-21 05:26:16

This commit is contained in:
github-actions[bot]
2026-07-21 05:26:16 +08:00
parent 3f7a1329eb
commit 9f2092b4f2
8 changed files with 16 additions and 8 deletions
+1 -1
View File
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=mptcp
PKG_VERSION:=6.1
PKG_RELEASE:=7
PKG_RELEASE:=8
PKG_MAINTAINER:=Ycarus (Yannick Chabanois) <ycarus@zugaina.org>
PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
+5
View File
@@ -140,6 +140,9 @@ interface_multipath_settings() {
local mode iface proto metric ip4table qdisc
local config="$1"
local intf="$2"
# DHCPv6 companion interfaces (<intf>_6) share the parent's device:
# processing them here would clobber the parent's multipath state
case "$config" in *_6) return 0 ;; esac
local enabled uci_route
uci_route=$(uci -q get openmptcprouter.settings.uci_route)
@@ -435,6 +438,8 @@ interface_multipath_settings() {
[ -z "$gateway6" ] && gateway6=$(ip -6 r list dev $iface | grep -v default | awk '/proto static/ {print $1; exit}' | tr -d "\n")
[ -z "$gateway6" ] && gateway6=$(uci -q get "network.$config.ip6gw")
[ -z "$gateway6" ] && gateway6=$(ubus call network.interface.$config status | jsonfilter -q -l 1 -e '@.inactive.route[@.target="::"].nexthop' | tr -d "\n")
[ -z "$gateway6" ] && gateway6=$(ubus call network.interface.${config}_6 status 2>/dev/null | jsonfilter -q -l 1 -e '@.inactive.route[@.target="::"].nexthop' | tr -d "\n")
[ -z "$gateway6" ] && gateway6=$(ubus call network.interface.${config}_6 status 2>/dev/null | jsonfilter -q -l 1 -e '@.route[@.target="::"].nexthop' | tr -d "\n")
#if [ -z "$gateway6" ] || [ "$( valid_subnet6 $gateway6 )" != "ok" ]; then
# gateway6=$(ubus call network.interface.$config status | jsonfilter -q -l 1 -e '@.route[@.target="::"].nexthop' | tr -d "\n")
#fi