From 3389d09c23f07853f5be888cb840668aa4c15e6c Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Thu, 2 Sep 2021 19:51:18 +0200
Subject: [PATCH] Add MPTCP upstream support to MPTCP support detection

---
 .../root/bin/omr-mptcp-intf                    | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/luci-app-openmptcprouter/root/bin/omr-mptcp-intf b/luci-app-openmptcprouter/root/bin/omr-mptcp-intf
index d2a74b245..8fac4468b 100755
--- a/luci-app-openmptcprouter/root/bin/omr-mptcp-intf
+++ b/luci-app-openmptcprouter/root/bin/omr-mptcp-intf
@@ -12,9 +12,17 @@ get_mptcp_from_server() {
 	get_mptcp() {
 		serverip=$1
 		if [ "$(echo $serverip | grep :)" ]; then
-			support="$(curl -s -k -6 -m ${timeout} --interface $intf https://[$serverip]:$serverport/mptcpsupport)"
+			if [ -f /proc/sys/net/mptcp/enabled ]; then
+				support="$(mptcpize run curl -s -k -6 -m ${timeout} --interface $intf https://[$serverip]:$serverport/mptcpsupport)"
+			else
+				support="$(curl -s -k -6 -m ${timeout} --interface $intf https://[$serverip]:$serverport/mptcpsupport)"
+			fi
 		else
-			support="$(curl -s -k -4 -m ${timeout} --interface $intf https://$serverip:$serverport/mptcpsupport)"
+			if [ -f /proc/sys/net/mptcp/enabled ]; then
+				support="$(mptcpize run curl -s -k -4 -m ${timeout} --interface $intf https://$serverip:$serverport/mptcpsupport)"
+			else
+				support="$(curl -s -k -4 -m ${timeout} --interface $intf https://$serverip:$serverport/mptcpsupport)"
+			fi
 		fi
 		[ -n "$support" ] && {
 			support=$(echo $support | jsonfilter -e '@.mptcp')
@@ -56,8 +64,10 @@ get_mptcp_from_website6() {
 support=""
 config_load openmptcprouter
 config_foreach get_mptcp_from_server server
-[ -z "$support" ] && [ -n "$(ip -4 a show dev $intf)" ] && get_mptcp_from_website
-[ -z "$support" ] && [ -n "$(ip -6 a show dev $intf)" ] && get_mptcp_from_website6
+if [ ! -f /proc/sys/net/mptcp/enabled ] && [ -z "$support" ]; then
+	[ -n "$(ip -4 a show dev $intf)" ] && get_mptcp_from_website
+	[ -n "$(ip -6 a show dev $intf)" ] && get_mptcp_from_website6
+fi
 if [ "$support" = "working" ]; then
 	echo "MPTCP enabled"
 elif [ "$support" = "not working" ]; then