From 2d5cef46234d69e89b5b4fecdbeb1bf96df2208d Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Mon, 13 May 2024 20:23:32 +0200
Subject: [PATCH] Fix server usage when IPv4 and IPv6 set

---
 omr-tracker/files/bin/omr-tracker-server | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/omr-tracker/files/bin/omr-tracker-server b/omr-tracker/files/bin/omr-tracker-server
index f518aff37..fafb3e3db 100755
--- a/omr-tracker/files/bin/omr-tracker-server
+++ b/omr-tracker/files/bin/omr-tracker-server
@@ -134,7 +134,6 @@ _check_master() {
 	local count=0
 	local countips=0
 	local changes="0"
-	local oneserverup="0"
 	config_get master $1 master
 	config_get ip $1 ip
 	config_get port $1 port "65500"
@@ -143,6 +142,7 @@ _check_master() {
 	[ "$master" = "1" ] && [ -n "$ip" ] && [ "$disabled" != "1" ] && {
 		check_ip() {
 			local ipd=$1
+			server_ping=false
 			#[ -n "$serverip" ] && [ "$server_ping" = true ] && return
 			ipresolve="$(resolveip -4 $ipd | head -n 1)"
 			if [ -n "$ipresolve" ]; then
@@ -312,7 +312,6 @@ _check_backup() {
 	local count=0
 	local countips=0
 	local changes="0"
-	local oneserverup="0"
 	config_get backup $1 backup
 	config_get ip $1 ip
 	config_get port $1 port
@@ -321,7 +320,8 @@ _check_backup() {
 	[ "$backup" = "1" ] && [ -n "$ip" ] && [ "$disabled" != "1" ] && {
 		check_ip() {
 			local ipd=$1
-			[ -n "$serverip" ] && [ "$server_ping" = true ] && return
+			server_ping=false
+			#[ -n "$serverip" ] && [ "$server_ping" = true ] && return
 			ipresolve="$(resolveip -4 $ipd | head -n 1)"
 			if [ -n "$ipresolve" ]; then
 				serverip="$ipresolve"
@@ -498,9 +498,10 @@ retry=${OMR_TRACKER_TRIES:-4}
 waittest=${OMR_TRACKER_WAIT_TEST:-0}
 while true; do
 	server_ping=false
+	oneserverup="0"
 	config_load openmptcprouter
 	config_foreach _check_master server
-	[ "$server_ping" = false ] && {
+	[ "$oneserverup" = "0" ] && {
 		config_load openmptcprouter
 		config_foreach _check_backup server
 	}