From 244b8f421cae32091e85906243cb668ed11a96c4 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Tue, 7 Jan 2020 18:05:00 +0100
Subject: [PATCH] Disable omr-tracker if no hosts defined

---
 omr-tracker/files/bin/omr-tracker-ss     | 4 ++--
 omr-tracker/files/etc/init.d/omr-tracker | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/omr-tracker/files/bin/omr-tracker-ss b/omr-tracker/files/bin/omr-tracker-ss
index 4dd6b40bd..6a85aa990 100755
--- a/omr-tracker/files/bin/omr-tracker-ss
+++ b/omr-tracker/files/bin/omr-tracker-ss
@@ -59,7 +59,7 @@ while true; do
 	if [ "$(curl -s -I -w %{http_code} --socks5 ${proxy} --max-time ${timeout} $host -o /dev/null)" != "000" ]; then
 		nocontact=""
 		[ "${last}" -ge "${retry}" ] || [ "$(uci -q get openmptcprouter.omr.shadowsocks)" = "" ] && {
-			_log "Shadowsocks is up (can contact ${host})"
+			_log "Shadowsocks is up (can contact via http ${host})"
 			uci -q set openmptcprouter.omr.shadowsocks="up"
 			uci -q commit openmptcprouter.omr
 		}
@@ -75,7 +75,7 @@ while true; do
 		[ -z "$nocontact" ] && nocontact="$host" || nocontact="$nocontact, $host"
 		[ "${last}" -ge "${retry}" ] && {
 			if [ -n "$(iptables -t nat -L -n | grep ss_rules_forward)" ]; then
-				_log "Shadowsocks is down (can't contact ${nocontact})"
+				_log "Shadowsocks is down (can't contact via http ${nocontact})"
 				uci -q set openmptcprouter.omr.shadowsocks="down"
 				uci -q commit openmptcprouter.omr
 				/etc/init.d/shadowsocks-libev rules_down 2> /dev/null
diff --git a/omr-tracker/files/etc/init.d/omr-tracker b/omr-tracker/files/etc/init.d/omr-tracker
index 37f1744cb..d12d26867 100755
--- a/omr-tracker/files/etc/init.d/omr-tracker
+++ b/omr-tracker/files/etc/init.d/omr-tracker
@@ -56,6 +56,7 @@ _launch_tracker() {
 	[ -z "$ifname" ] || [ -z "$multipath" ] || [ "$multipath" = "off" ] && [ "$1" != "glorytun" ] && [ "$1" != "omrvpn" ] && return
 	[ "${ifenabled}" = "0" ] && return
 	[ "${enabled}" = "0" ] && return
+	[ -z "${hosts}" ] && return
 	[ -z "${interval_tries}" ] && interval_tries=1
 
 	procd_open_instance
@@ -121,7 +122,7 @@ _launch_shadowsocks_tracker() {
 	local disabled
 	config_get disabled "$1" disabled 0
 
-	[ "$enabled" = "0" ] || [ "$disabled" = "1" ] && return
+	[ "$enabled" = "0" ] || [ "$disabled" = "1" ] || [ -z "$hosts" ] && return
 
 	procd_open_instance
 	# shellcheck disable=SC2086