From a0b5b2a1a0ef43710984e8869cf10e5176379c57 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Wed, 16 Dec 2020 10:05:25 +0100
Subject: [PATCH] Fix glorytun settings apply

---
 glorytun-udp/init                                 | 15 +++++++--------
 .../root/etc/hotplug.d/iface/30-glorytun-udp      |  3 ++-
 .../usr/share/omr/post-tracking.d/post-tracking   |  6 +++---
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/glorytun-udp/init b/glorytun-udp/init
index 5bb5a9a5d..5e50d59df 100755
--- a/glorytun-udp/init
+++ b/glorytun-udp/init
@@ -20,14 +20,13 @@ _err() {
 
 validate_section() {
 	uci_validate_section glorytun-udp glorytun-udp "${1}" \
-		'enable:bool:0'       \
-		'mode:string'          \
-		'key:string'          \
-		'host:host'           \
-		'port:port'           \
-		'proto:string'        \
-		'mtuauto:bool:0'      \
-		'chacha:bool:0'       \
+		'enable:bool:0'            \
+		'mode:string'              \
+		'key:string'               \
+		'host:host'                \
+		'port:port'                \
+		'mtuauto:bool:0'           \
+		'chacha:bool:0'            \
 		'dev:string'
 }
 
diff --git a/luci-app-glorytun-udp/root/etc/hotplug.d/iface/30-glorytun-udp b/luci-app-glorytun-udp/root/etc/hotplug.d/iface/30-glorytun-udp
index a1ac50669..1ccf10b8c 100644
--- a/luci-app-glorytun-udp/root/etc/hotplug.d/iface/30-glorytun-udp
+++ b/luci-app-glorytun-udp/root/etc/hotplug.d/iface/30-glorytun-udp
@@ -25,8 +25,9 @@ set_default() {
 		config_get keepalive "$config" keepalive "25s"
 		[ "$remoteip" != "" ] && [ "$localip" != "" ] &&  ifconfig $DEVICE $localip pointopoint $remoteip up
 		while [ -z "$(glorytun-udp list | grep $iface)" ]; do
-			glorytun-udp set dev $iface kxtimeout $kxtimeout timetolerance $timetolerance keepalive $keepalive
+			sleep 1
 		done
+		glorytun-udp set dev $iface kxtimeout $kxtimeout timetolerance $timetolerance keepalive $keepalive
 	}
 }
 
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 bdedd275a..b3ce9fa8e 100755
--- a/mptcp/files/usr/share/omr/post-tracking.d/post-tracking
+++ b/mptcp/files/usr/share/omr/post-tracking.d/post-tracking
@@ -592,9 +592,9 @@ if [ "$multipath_config" = "on" ] || [ "$multipath_config" = "backup" ]; then
 			fi
 		fi
 	fi
-	if [ "$(uci -q get openmptcprouter.$OMR_TRACKER_INTERFACE.vpn)" != "1" ] && [ "$(pgrep glorytun-udp)" != "" ] && [ "$(glorytun-udp set | grep 'kxtimeout 7d')" = "" ]; then
-		glorytun-udp set dev tun0 kxtimeout 7d > /dev/null 2>&1
-	fi
+#	if [ "$(uci -q get openmptcprouter.$OMR_TRACKER_INTERFACE.vpn)" != "1" ] && [ "$(pgrep glorytun-udp)" != "" ] && [ "$(glorytun-udp set | grep 'kxtimeout 7d')" = "" ]; then
+#		glorytun-udp set dev tun0 kxtimeout 7d > /dev/null 2>&1
+#	fi
 	[ "$multipath_config" = "backup" ] && [ "$(pgrep glorytun-udp)" != "" ] && glorytun-udp path addr $OMR_TRACKER_DEVICE_IP dev tun0 set pref 500 > /dev/null 2>&1
 fi
 [ "$(uci -q get openmptcprouter.$OMR_TRACKER_INTERFACE.multipathvpn)" != "1" ] && {