From 7561ee1dfea3f0641440f02a3eb8bcee11499627 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Thu, 8 Aug 2024 20:53:32 +0200
Subject: [PATCH 1/3] Move unbound check before dnsmasq and add more tries

---
 .../usr/share/omr/schedule.d/010-services     | 25 ++++++++++---------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/omr-schedule/files/usr/share/omr/schedule.d/010-services b/omr-schedule/files/usr/share/omr/schedule.d/010-services
index 4a389f10d..830c41d90 100755
--- a/omr-schedule/files/usr/share/omr/schedule.d/010-services
+++ b/omr-schedule/files/usr/share/omr/schedule.d/010-services
@@ -28,28 +28,29 @@ if [ -f /etc/init.d/glorytun-udp ] && [ "$(pgrep glorytun-udp)" = "" ] && [ "$(u
 	sleep 5
 fi
 
+if [ -f /etc/init.d/unbound ] && [ "$(uci -q get unbound.@unbound[0].enabled)" = "1" ] && [ -n "$(uci -q get dnsmasq1.server | grep 127.0.0.1#5353)" ]; then
+	if [ "$(pgrep -f unbound)" = "" ]; then
+		_log "Can't find unbound, restart it..."
+		/etc/init.d/unbound restart >/dev/null 2>&1
+		sleep 5
+	elif [ "$(uci -q get openmptcprouter.settings.external_check)" != "0" ] && [ "$(uci -q get unbound.ub_main.listen_port)" = "5353" ] && [ -n "$(dig +timeout=4 +tries=2 openmptcprouter.com -p 5353 | grep 'ANSWER: 0')" ]; then
+		_log "Can't resolve via unbound, restart it..."
+		/etc/init.d/unbound restart >/dev/null 2>&1
+		sleep 5
+	fi
+fi
+
 if [ -f /etc/init.d/dnsmasq ]; then
 	if [ "$(pgrep -f dnsmasq)" = "" ]; then
 		_log "Can't find dnsmasq, restart it..."
 		/etc/init.d/dnsmasq restart >/dev/null 2>&1
 		sleep 5
-	elif [ "$(uci -q get openmptcprouter.settings.external_check)" != "0" ] && [ -n "$(dig +timeout=4 +tries=1 openmptcprouter.com 2>&1 | grep -i 'connection refused')" ]; then
+	elif [ "$(uci -q get openmptcprouter.settings.external_check)" != "0" ] && [ -n "$(dig +timeout=4 +tries=2 openmptcprouter.com 2>&1 | grep -i 'connection refused')" ]; then
 		_log "Can't resolve via dnsmasq, restart it..."
 		/etc/init.d/dnsmasq restart >/dev/null 2>&1
 		sleep 5
 	fi
 fi
-if [ -f /etc/init.d/unbound ] && [ "$(uci -q get unbound.@unbound[0].enabled)" = "1" ]; then
-	if [ "$(pgrep -f unbound)" = "" ]; then
-		_log "Can't find unbound, restart it..."
-		/etc/init.d/unbound restart >/dev/null 2>&1
-		sleep 5
-	elif [ "$(uci -q get openmptcprouter.settings.external_check)" != "0" ] && [ "$(uci -q get unbound.ub_main.listen_port)" = "5353" ] && [ -n "$(dig +timeout=4 +tries=1 openmptcprouter.com -p 5353 | grep 'ANSWER: 0')" ]; then
-		_log "Can't resolve via unbound, restart it..."
-		/etc/init.d/unbound restart >/dev/null 2>&1
-		sleep 5
-	fi
-fi
 
 if [ "$(pgrep openvpn)" = "" ] && [ -f /etc/init.d/openvpn ]; then
 	openvpn_enable=0

From 2008998bf8fb2c5c1cf7576b2be9a9feecb89ddd Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Thu, 8 Aug 2024 20:53:59 +0200
Subject: [PATCH 2/3] Remove not needed line in omr-tracker-server

---
 omr-tracker/files/bin/omr-tracker-server | 1 -
 1 file changed, 1 deletion(-)

diff --git a/omr-tracker/files/bin/omr-tracker-server b/omr-tracker/files/bin/omr-tracker-server
index 474f2f7b8..8732d31bf 100755
--- a/omr-tracker/files/bin/omr-tracker-server
+++ b/omr-tracker/files/bin/omr-tracker-server
@@ -39,7 +39,6 @@ _ping_server() {
 
 _ping_server_intf() {
 	local host=$1
-	local valid_ip6=$(valid_subnet6 "$host")
 	for intf in $(multipath 2>/dev/null | awk '/default/ {print $1}'); do
 		local k=0
 		while [ "$server_ping" = false ] && [ "$k" -le "$retry" ]; do

From 6bd5ca722f06fb9a58e6a602688f97ca3d0bbcc6 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Thu, 8 Aug 2024 20:54:30 +0200
Subject: [PATCH 3/3] Increase timeout on unknown server for unbound

---
 openmptcprouter/files/etc/uci-defaults/1940-omr-dns | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/openmptcprouter/files/etc/uci-defaults/1940-omr-dns b/openmptcprouter/files/etc/uci-defaults/1940-omr-dns
index ab2102541..5f567e3a2 100755
--- a/openmptcprouter/files/etc/uci-defaults/1940-omr-dns
+++ b/openmptcprouter/files/etc/uci-defaults/1940-omr-dns
@@ -236,6 +236,10 @@ if [ -z "$(grep nameserver /etc/resolv.conf)" ]; then
 	echo "nameserver 127.0.0.1" > /etc/resolv.conf
 fi
 
+if [ -z "$(grep unknown-server-time-limit /etc/unbound/unbound_srv.conf)" ]; then
+	echo "unknown-server-time-limit: 2500" > /etc/unbound/unbound_srv.conf
+fi
+
 rm -f /tmp/luci-indexcache
 
 exit 0