From 35d3936816da7153b2f5eaf78a4b311de80e0c7b Mon Sep 17 00:00:00 2001
From: Ycarus <ycarus@zugaina.org>
Date: Mon, 5 Mar 2018 08:26:45 +0100
Subject: [PATCH] Fix MPTCP with DHCP

---
 mptcp/files/etc/init.d/mptcp      | 1 +
 omr-tracker/files/bin/omr-tracker | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/mptcp/files/etc/init.d/mptcp b/mptcp/files/etc/init.d/mptcp
index 30ce1fe29..a249d6a91 100755
--- a/mptcp/files/etc/init.d/mptcp
+++ b/mptcp/files/etc/init.d/mptcp
@@ -59,6 +59,7 @@ interface_multipath_settings() {
 		ipaddr=$(ip -4 addr show dev $iface | grep inet | awk '{print $2}' | cut -d/ -f1 | tr -d "\n")
 		gateway=$(ip -4 r list dev $iface | grep -v default | awk '/proto static/ {print $1}' | tr -d "\n")
 		[ -z "$gateway" ] && gateway=$(ubus call network.interface.$iface status | jsonfilter -e '@.route[0].nexthop' | tr -d "\n")
+		[ -z "$gateway" ] && gateway=$(ubus call network.interface.$iface status | jsonfilter -e '@.inactive.route[0].nexthop' | tr -d "\n")
 		netmask=$(ip -4 addr show dev $iface | grep inet | awk '{print $2}' | cut -d/ -f2 | tr -d "\n")
 		network=`ipcalc.sh $ipaddr $netmask | sed -n '/NETWORK=/{;s/.*=//;s/ .*//;p;}'`
 	fi
diff --git a/omr-tracker/files/bin/omr-tracker b/omr-tracker/files/bin/omr-tracker
index 7fd16e010..bd9fc72d9 100755
--- a/omr-tracker/files/bin/omr-tracker
+++ b/omr-tracker/files/bin/omr-tracker
@@ -131,6 +131,9 @@ while true; do
 		if [ -z "$OMR_TRACKER_DEVICE_GATEWAY" ]; then
 			OMR_TRACKER_DEVICE_GATEWAY=$(ubus call network.interface.$OMR_TRACKER_DEVICE status | jsonfilter -e '@.route[0].nexthop' | tr -d "\n")
 		fi
+		if [ -z "$OMR_TRACKER_DEVICE_GATEWAY" ]; then
+			OMR_TRACKER_DEVICE_GATEWAY=$(ubus call network.interface.$OMR_TRACKER_DEVICE status | jsonfilter -e '@.inactive.route[0].nexthop' | tr -d "\n")
+		fi
 
 		# execute specific tracker
 		if [ -n "$OMR_TRACKER_DEVICE_IP" ] && [ -n "$OMR_TRACKER_DEVICE_GATEWAY" ]; then