From c5b19570d5f22c075c7625d4bc7a32d7673908bb Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Tue, 3 Mar 2020 10:49:48 +0100
Subject: [PATCH] No sleep each times

---
 .../share/omr/post-tracking.d/post-tracking   | 30 ++++++++++++-------
 1 file changed, 20 insertions(+), 10 deletions(-)

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 d19bca0d4..70260b3b9 100755
--- a/mptcp/files/usr/share/omr/post-tracking.d/post-tracking
+++ b/mptcp/files/usr/share/omr/post-tracking.d/post-tracking
@@ -172,11 +172,11 @@ dns_flush() {
 	unbound-control flush-bogus >/dev/null 2>&1
 }
 
-if [ -n "$RANDOM" ]; then
-	sleep `expr $RANDOM % 10`
-else
-	sleep `awk 'BEGIN{srand();print int(rand()*9)}'`
-fi
+#if [ -n "$RANDOM" ]; then
+#	sleep `expr $RANDOM % 10`
+#else
+#	sleep `awk 'BEGIN{srand();print int(rand()*9)}'`
+#fi
 
 # Get the current multipath status
 multipath_status="off"
@@ -249,12 +249,22 @@ if [ "$OMR_TRACKER_STATUS" = "ERROR" ]; then
 		fi
 		config_load openmptcprouter
 		config_foreach disable_pihole server
-		config_foreach set_server_default_route server
+		if [ "$(uci -q get openmptcprouter.settings.master)" != "redundant" ]; then
+			config_foreach set_server_default_route server
+		fi
 	fi
 	dns_flush
 	uci -q delete openmptcprouter.$OMR_TRACKER_INTERFACE.lc
 	uci -q commit openmptcprouter
 	#ubus call network reload
+
+	# Set a little sleep after an interface error
+	if [ -n "$RANDOM" ]; then
+		sleep `expr $RANDOM % 10`
+	else
+		sleep `awk 'BEGIN{srand();print int(rand()*9)}'`
+	fi
+
 	exit 0
 fi
 
@@ -308,7 +318,7 @@ if [ "$OMR_TRACKER_INTERFACE" = "glorytun" ] || [ "$OMR_TRACKER_INTERFACE" = "om
 	piholeenabled=0
 	config_load openmptcprouter
 	config_foreach enable_pihole server
-	config_foreach delete_server_default_route server
+	#config_foreach delete_server_default_route server
 	[ "$nbserver" = "$piholeenabled" ] && /etc/init.d/openmptcprouter-vps set_pihole
 	#ubus call network reload
 	exit 0
@@ -338,8 +348,8 @@ if [ "$multipath_config" = "master" ]; then
 			config_load openmptcprouter
 			if [ "$(uci -q get openmptcprouter.settings.master)" = "redundant" ]; then
 				config_foreach set_server_all_routes server
-	#		else
-	#			config_foreach set_server_default_route server
+			elif [ "$(uci -q get openmptcprouter.settings.master)" != "failover" ]; then
+				config_foreach set_server_default_route server
 			fi
 		fi
 		ip route replace default via $OMR_TRACKER_DEVICE_GATEWAY dev $OMR_TRACKER_DEVICE table 991337
@@ -350,7 +360,7 @@ if [ -n "$OMR_TRACKER_DEVICE_IP" ] && [ -n "$OMR_TRACKER_DEVICE_GATEWAY" ]; then
 	config_load openmptcprouter
 	if [ "$(uci -q get openmptcprouter.settings.master)" = "redundant" ]; then
 		config_foreach set_server_all_routes server
-	else
+	elif [ "$(uci -q get openmptcprouter.settings.master)" != "failover" ]; then
 		config_foreach set_server_route server
 	fi
 fi