From 13eb40242c41ecd985480289f8c1f39339d4be61 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Mon, 25 Jan 2021 10:08:54 +0100
Subject: [PATCH] Fix shadowsocks tracker

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

diff --git a/omr-tracker/files/bin/omr-tracker-ss b/omr-tracker/files/bin/omr-tracker-ss
index e5a2e5ca8..9a7234c93 100755
--- a/omr-tracker/files/bin/omr-tracker-ss
+++ b/omr-tracker/files/bin/omr-tracker-ss
@@ -66,9 +66,9 @@ 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.ss_$[name})" = "" ] && {
+		[ "${last}" -ge "${retry}" ] || [ "$(uci -q get openmptcprouter.omr.ss_${server})" = "" ] && {
 			_log "Shadowsocks is up (can contact via http ${host})"
-			uci -q set openmptcprouter.omr.ss_${name}="up"
+			uci -q set openmptcprouter.omr.ss_${server}="up"
 			uci -q commit openmptcprouter.omr
 		}
 		if [ -z "$(iptables -t nat -L -n | grep ss_rules)" ] && [ "$(uci -q get shadowsocks-libev.ss_rules.disabled)" != "1" ]; then
@@ -84,7 +84,7 @@ while true; do
 		[ "${last}" -ge "${retry}" ] && {
 			if [ -n "$(iptables -t nat -L -n | grep ssr)" ]; then
 				_log "Shadowsocks is down (can't contact via http ${nocontact})"
-				uci -q set openmptcprouter.omr.ss_${name}="down"
+				uci -q set openmptcprouter.omr.ss_${server}="down"
 				uci -q commit openmptcprouter.omr
 				[ "$(uci show openmptcprouter.omr | grep ss | grep up)" = "" ] && /etc/init.d/shadowsocks-libev rules_down 2> /dev/null
 				_get_ip
diff --git a/omr-tracker/files/etc/init.d/omr-tracker b/omr-tracker/files/etc/init.d/omr-tracker
index fa4e4d265..77765c19c 100755
--- a/omr-tracker/files/etc/init.d/omr-tracker
+++ b/omr-tracker/files/etc/init.d/omr-tracker
@@ -133,6 +133,9 @@ _launch_gre_tracker() {
 _initialize_shadowsocks_tracker() {
 	local redir_tcp server tracker_server
 	server=$1
+	
+	[ -n "$(echo $server | grep sss)" ] || return
+	
 	#redir_tcp=$(uci -q get shadowsocks-libev.ss_rules.redir_tcp)
 	#config_get tracker_server ss_rules server
 	config_get ss_disabled $server disabled 0