🌈 Sync 2026-06-09 08:42:09

This commit is contained in:
github-actions[bot] 2026-06-09 08:42:09 +08:00
parent 1171f0796d
commit 8a8c9be282
2 changed files with 5 additions and 1 deletions

View File

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

View File

@ -273,6 +273,7 @@ interface_multipath_settings() {
elif [ "$proto" != "gre" ]; then
network_get_ipaddr ipaddr $config
[ -z "$ipaddr" ] && ipaddr=$(ip -4 addr show dev $iface | awk '/inet / {print $2; exit}' | cut -d/ -f1 | tr -d "\n")
[ -z "$ipaddr" ] && ipaddr=$(uci -q get "network.$config.ipaddr" | cut -d/ -f1 | tr -d "\n")
network_get_gateway gateway $config true
[ -z "$gateway" ] && gateway=$(ip -4 r list dev $iface | grep -v default | awk '/proto static/ {print $1}' | tr -d "\n")
[ -z "$gateway" ] && gateway=$(uci -q get "network.$config.gateway")
@ -297,6 +298,9 @@ interface_multipath_settings() {
[ -n "$netmask" ] && [ "$(echo $netmask | grep '/')" != "" ] && netmask=""
[ -z "$netmask" ] && netmask=$(ip -4 addr show dev $iface | awk '/peer/ {print $4; exit}' | cut -d/ -f2 | tr -d "\n")
[ -z "$netmask" ] && netmask=$(ip -4 addr show dev $iface | awk '/inet / {print $2;exit}' | cut -d/ -f2 | tr -d "\n")
[ -z "$netmask" ] && netmask=$(uci -q get "network.$config.netmask")
[ -z "$netmask" ] && [ -n "$ipaddr" ] && [ -n "$gateway" ] && \
[ "$(echo $ipaddr | cut -d. -f1-3)" = "$(echo $gateway | cut -d. -f1-3)" ] && netmask="24"
[ -n "$ipaddr" ] && ipaddr=$(echo $ipaddr | cut -d/ -f1 | tr -d "\n")
[ -n "$ipaddr" ] && [ -n "$netmask" ] && netmask=`ipcalc.sh $ipaddr/$netmask | sed -n '/PREFIX=/{;s/.*=//;s/ .*//;p;}'`
[ -n "$ipaddr" ] && [ -n "$netmask" ] && network=`ipcalc.sh $ipaddr/$netmask | sed -n '/NETWORK=/{;s/.*=//;s/ .*//;p;}'`