mirror of
https://github.com/kiddin9/op-packages.git
synced 2026-11-01 04:43:56 +08:00
🌴 Sync 2026-09-09 14:20:42
This commit is contained in:
1 parent
99e36fe9b0
commit
e45467bc23
77 files changed
+2534
-2032
No files matched your search
+1
-1
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=mptcp
|
||||
PKG_VERSION:=6.1
|
||||
PKG_RELEASE:=14
|
||||
PKG_RELEASE:=15
|
||||
|
||||
PKG_MAINTAINER:=Ycarus (Yannick Chabanois) <ycarus@zugaina.org>
|
||||
PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
|
||||
|
||||
@@ -616,23 +616,23 @@ interface_multipath_settings() {
|
||||
fi
|
||||
|
||||
if [ "$(uci -q get openmptcprouter.settings.force_multipath)" != "0" ] && [ -n "$(ip a show dev $iface | grep inet)" ]; then
|
||||
if ([ "$mode" = "master" ] || [ "$mode" = "on" ]) && [ -z "$(multipath $iface | grep default)" ]; then
|
||||
if [ "$(uci -q get openmptcprouter.${config}.state)" = "down" ]; then
|
||||
# omr-tracker still considers this interface down (it only
|
||||
# flips state to "up" once its recovery counter is
|
||||
# satisfied): this reload was triggered by netifd's own
|
||||
# ifup/link-up event, independent of that check, so keep the
|
||||
# endpoint as backup instead of promoting it straight to
|
||||
# master/on - the tracker's own post-tracking (003-up) will
|
||||
# do the real promotion once recovery is actually confirmed.
|
||||
# Prevents re-promoting a still-flaky WAN right after link
|
||||
# recovery (issue #4355).
|
||||
logger -t "MPTCP" "$iface tracker state is down, keep as backup instead of $mode from $(multipath $iface)"
|
||||
multipath "$iface" "backup" "$id"
|
||||
else
|
||||
logger -t "MPTCP" "Set $iface to $mode from $(multipath $iface)"
|
||||
multipath "$iface" "on" "$id"
|
||||
fi
|
||||
local tracker_state
|
||||
tracker_state="$(uci -q get openmptcprouter.${config}.state)"
|
||||
if [ "$tracker_state" = "down" ] && [ -n "$mode" ] && [ "$mode" != "off" ]; then
|
||||
# omr-tracker still considers this interface down: it only flips state
|
||||
# to "up" once its recovery counter (tries_up) is satisfied, and
|
||||
# post-tracking's 002-error has already taken the endpoint out of
|
||||
# MPTCP. This reload comes from netifd's own ifup/ifupdate/link-up
|
||||
# event, which knows nothing about that check, so leave the endpoint
|
||||
# alone instead of putting the interface back into MPTCP: adding it
|
||||
# back - even as backup - makes the kernel keep opening subflows over
|
||||
# a link OMR knows is dead, and on a flapping modem that re-add ran on
|
||||
# every ifup (discussion #4368). 003-up adds the endpoint back in the
|
||||
# configured mode as soon as the recovery is confirmed (issue #4355).
|
||||
logger -t "MPTCP" "$iface tracker state is down, not adding it to MPTCP ($(multipath $iface))"
|
||||
elif ([ "$mode" = "master" ] || [ "$mode" = "on" ]) && [ -z "$(multipath $iface | grep default)" ]; then
|
||||
logger -t "MPTCP" "Set $iface to $mode from $(multipath $iface)"
|
||||
multipath "$iface" "on" "$id"
|
||||
elif ([ "$mode" = "off" ] || [ -z "$mode" ]) && [ -z "$(multipath $iface | grep deactivated)" ]; then
|
||||
logger -t "MPTCP" "Set $iface to $mode from $(multipath $iface)"
|
||||
multipath "$iface" "$mode" "$id"
|
||||
|
||||
Reference in new issue
Block a user