From fac5855bbebd56fd98dd5027a16b906fcf34ed50 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Fri, 8 Nov 2024 10:34:12 +0100
Subject: [PATCH] Update public IP/proxy IP more often

---
 omr-tracker/files/bin/omr-tracker-server | 8 ++++++++
 omr-tracker/files/bin/omr-tracker-ss     | 4 ++--
 omr-tracker/files/bin/omr-tracker-v2ray  | 3 ++-
 omr-tracker/files/bin/omr-tracker-xray   | 3 ++-
 4 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/omr-tracker/files/bin/omr-tracker-server b/omr-tracker/files/bin/omr-tracker-server
index a5aefb65e..ab2daea60 100755
--- a/omr-tracker/files/bin/omr-tracker-server
+++ b/omr-tracker/files/bin/omr-tracker-server
@@ -225,6 +225,10 @@ _check_master() {
 					fi
 					uci -q batch <<-EOF >/dev/null
 						set openmptcprouter.${name}.current='1'
+						del openmptcprouter.omr.detected_ss_ipv4
+						del openmptcprouter.omr.detected_public_ipv4
+						del openmptcprouter.omr.detected_ss_ipv6
+						del openmptcprouter.omr.detected_public_ipv6
 						commit openmptcprouter
 					EOF
 					if [ "$count" -eq "0" ]; then
@@ -427,6 +431,10 @@ _check_backup() {
 					fi
 					uci -q batch <<-EOF >/dev/null
 						set openmptcprouter.${name}.current='1'
+						del openmptcprouter.omr.detected_ss_ipv4
+						del openmptcprouter.omr.detected_public_ipv4
+						del openmptcprouter.omr.detected_ss_ipv6
+						del openmptcprouter.omr.detected_public_ipv6
 						commit openmptcprouter
 					EOF
 
diff --git a/omr-tracker/files/bin/omr-tracker-ss b/omr-tracker/files/bin/omr-tracker-ss
index 5079968a9..1c4c1f3eb 100755
--- a/omr-tracker/files/bin/omr-tracker-ss
+++ b/omr-tracker/files/bin/omr-tracker-ss
@@ -151,7 +151,8 @@ while true; do
 				_get_ip
 			fi
 		fi
-		[ "$(uci -q get openmptcprouter.omr.detected_public_ipv4)" = "" ] || { [ "$(uci -q get openmptcprouter.settings.disable_ipv6)" != "1" ] && [ "$(uci -q get openmptcprouter.omr.detected_public_ipv6)" = "" ]; } && _get_ip
+		#[ "$(uci -q get openmptcprouter.omr.detected_public_ipv4)" = "" ] || { [ "$(uci -q get openmptcprouter.settings.disable_ipv6)" != "1" ] && [ "$(uci -q get openmptcprouter.omr.detected_public_ipv6)" = "" ]; } && _get_ip
+		_get_ip
 		last=0
 		OMR_TRACKER_STATUS="OK"
 	else
@@ -197,7 +198,6 @@ while true; do
 				}
 				script_alert_down="$(uci -q get omr-tracker.proxy.script_alert_down)"
 				[ -n "$script_alert_down" ] && eval $script_alert_down
-
 				if [ "$disabled" != "1" ] && [ "$serverip" != "1" ]; then
 					if [ "$type" = "libev" ] && [ "$(pgrep ss-redir)" = "" ] && [ "$(uci -q get shadowsocks-libev.${server}.key)" != "" ]; then
 						_log "Can't find shadowsocks, restart it..."
diff --git a/omr-tracker/files/bin/omr-tracker-v2ray b/omr-tracker/files/bin/omr-tracker-v2ray
index 97babefe6..2c1776d67 100755
--- a/omr-tracker/files/bin/omr-tracker-v2ray
+++ b/omr-tracker/files/bin/omr-tracker-v2ray
@@ -133,7 +133,8 @@ while true; do
 			/etc/init.d/v2ray rules_up 2> /dev/null
 			_get_ip
 		fi
-		[ "$(uci -q get openmptcprouter.omr.detected_public_ipv4)" = "" ] || ([ "$(uci -q get openmptcprouter.settings.disable_ipv6)" != "1" ] && [ "$(uci -q get openmptcprouter.omr.detected_public_ipv6)" = "" ]) && _get_ip
+		#[ "$(uci -q get openmptcprouter.omr.detected_public_ipv4)" = "" ] || ([ "$(uci -q get openmptcprouter.settings.disable_ipv6)" != "1" ] && [ "$(uci -q get openmptcprouter.omr.detected_public_ipv6)" = "" ]) && _get_ip
+		_get_ip
 		last=0
 		OMR_TRACKER_STATUS="OK"
 	else
diff --git a/omr-tracker/files/bin/omr-tracker-xray b/omr-tracker/files/bin/omr-tracker-xray
index 76781ba24..7ed050a71 100755
--- a/omr-tracker/files/bin/omr-tracker-xray
+++ b/omr-tracker/files/bin/omr-tracker-xray
@@ -132,7 +132,8 @@ while true; do
 			/etc/init.d/xray rules_up 2> /dev/null
 			_get_ip
 		fi
-		[ "$(uci -q get openmptcprouter.omr.detected_public_ipv4)" = "" ] || ([ "$(uci -q get openmptcprouter.settings.disable_ipv6)" != "1" ] && [ "$(uci -q get openmptcprouter.omr.detected_public_ipv6)" = "" ]) && _get_ip
+		#[ "$(uci -q get openmptcprouter.omr.detected_public_ipv4)" = "" ] || ([ "$(uci -q get openmptcprouter.settings.disable_ipv6)" != "1" ] && [ "$(uci -q get openmptcprouter.omr.detected_public_ipv6)" = "" ]) && _get_ip
+		_get_ip
 		last=0
 		OMR_TRACKER_STATUS="OK"
 	else