From b40823e54809d74f5ae9cdcd32d800ab1f44e7b2 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Sat, 22 May 2021 17:29:46 +0200
Subject: [PATCH] Fix loop detection

---
 luci-app-openmptcprouter/root/bin/omr-routing-loop      | 3 ++-
 mptcp/files/usr/share/omr/post-tracking.d/post-tracking | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/luci-app-openmptcprouter/root/bin/omr-routing-loop b/luci-app-openmptcprouter/root/bin/omr-routing-loop
index 396498470..4cc716602 100755
--- a/luci-app-openmptcprouter/root/bin/omr-routing-loop
+++ b/luci-app-openmptcprouter/root/bin/omr-routing-loop
@@ -1,8 +1,9 @@
 #!/bin/sh
 VPS=$1
 LANIP=$2
+INTF=$3
 
-if [ -n "$(traceroute -q 1 -i eth1 -w 1 -n -m 5 ${VPS} | grep ${LANIP})" ]; then
+if [ -n "$(traceroute -q 1 -i ${INTF} -w 1 -n -m 5 ${VPS} | grep ${LANIP})" ]; then
 	echo "detected"
 else
 	echo "no loop"
diff --git a/mptcp/files/usr/share/omr/post-tracking.d/post-tracking b/mptcp/files/usr/share/omr/post-tracking.d/post-tracking
index cf6b21703..bc87d4f55 100755
--- a/mptcp/files/usr/share/omr/post-tracking.d/post-tracking
+++ b/mptcp/files/usr/share/omr/post-tracking.d/post-tracking
@@ -1139,7 +1139,7 @@ if [ "$(uci -q get openmptcprouter.$OMR_TRACKER_INTERFACE.lc)" = "" ] || [ $(($(
 			loop=0
 			routingloop() {
 				vpsip="$(uci -q get openmptcprouter.$1.ip)"
-				if [ -n "$vpsip" ] && [ "$(omr-routing-loop $vpsip $lanip)" = "detected" ]; then
+				if [ -n "$vpsip" ] && [ "$(omr-routing-loop $vpsip $lanip $OMR_TRACKER_DEVICE)" = "detected" ]; then
 					loop=1
 				fi
 			}