From 3236f88713ca20f5b5a787eb020a532f1ff7524c Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Tue, 20 Apr 2021 19:15:06 +0200
Subject: [PATCH] Fix force an interface to be master when not set

---
 mptcp/files/etc/init.d/mptcp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/mptcp/files/etc/init.d/mptcp b/mptcp/files/etc/init.d/mptcp
index 82ba8c7cc..334cc0632 100755
--- a/mptcp/files/etc/init.d/mptcp
+++ b/mptcp/files/etc/init.d/mptcp
@@ -116,6 +116,7 @@ interface_multipath_settings() {
 	[ "$mode" != "off" ] && {
 		[ -n "$mptcpintf" ] && mptcpintf="$mptcpintf $iface"
 		[ -z "$mptcpintf" ] && mptcpintf="$iface"
+		[ -z "$mptcpmintf" ] && mptcpmintf="$config"
 		uci -q set network.${config}.defaultroute=0
 		uci -q set network.${config}.peerdns=0
 	}
@@ -435,6 +436,7 @@ start_service() {
 	}
 
 	mptcpintf=""
+	mptcpmintf=""
 	master=""
 	count="0"
 	config_load openmptcprouter
@@ -459,7 +461,7 @@ start_service() {
 	config_foreach add_route route6
 	# If no master is defined, one interface is defined as master
 	if [ "$master" = "" ] && [ "$intf" = "" ]; then
-		intfmaster="$(echo $mptcpintf | cut -d' ' -f1 | tr -d '\n')"
+		intfmaster="$mptcpmintf"
 		[ "$intfmaster" != "" ] && {
 			logger -t "MPTCP" "No master multipath defined, setting it to $intfmaster"
 			uci -q set network.${intfmaster}.multipath="master"