From 48c5b000852af9013348d5157319bc3e0041578d Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Tue, 5 Nov 2019 21:19:07 +0100
Subject: [PATCH] Fix getting server IP for MPTCP over VPN

---
 openmptcprouter/files/etc/init.d/mptcpovervpn | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/openmptcprouter/files/etc/init.d/mptcpovervpn b/openmptcprouter/files/etc/init.d/mptcpovervpn
index ac702b6f2..7a7d2d5d3 100755
--- a/openmptcprouter/files/etc/init.d/mptcpovervpn
+++ b/openmptcprouter/files/etc/init.d/mptcpovervpn
@@ -8,6 +8,10 @@
 	USE_PROCD=1
 }
 
+_getremoteip() {
+	[ "$(uci -q get openmptcprouter.$1.master)" = "1" ] && remoteip=$(uci -q get openmptcprouter.$1.ip)
+}
+
 mptcp_over_vpn() {
 	local interface=$1
 	nbintf=$(($nbintf+1))
@@ -15,7 +19,9 @@ mptcp_over_vpn() {
 		nbintfvpn=$(($nbintfvpn+1))
 		logger -t "MPTCPoverVPN" "Enable MPTCP over VPN for ${interface}"
 		id=$(uci -q get network.${interface}.metric)
-		remoteip=$(uci -q get openmptcprouter.vps.ip)
+		remoteip=""
+		config_load_openmptcprouter
+		config_foreach _getremoteip server
 		localip=$(ubus call network.interface.$interface status | jsonfilter -e '@["ipv4-address"][0].address' | tr -d "\n")
 		multipath=$(uci -q get network.${interface}.multipath)
 		[ -z "$multipath" ] && multipath="on"