From 5c5786210c6d29b1d475c49b119d3cdcf0033e7e Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Sat, 27 Jun 2020 21:45:43 +0200
Subject: [PATCH] Fix shadowsocks rules status for multi rules

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

diff --git a/omr-tracker/files/bin/omr-tracker-ss b/omr-tracker/files/bin/omr-tracker-ss
index 3fc907f3f..c83de5d0c 100755
--- a/omr-tracker/files/bin/omr-tracker-ss
+++ b/omr-tracker/files/bin/omr-tracker-ss
@@ -65,7 +65,7 @@ while true; do
 			uci -q set openmptcprouter.omr.shadowsocks="up"
 			uci -q commit openmptcprouter.omr
 		}
-		if [ -z "$(iptables -t nat -L -n | grep ss_rules_forward)" ] && [ "$(uci -q get shadowsocks-libev.ss_rules.disabled)" != "1" ]; then
+		if [ -z "$(iptables -t nat -L -n | grep ss_rules)" ] && [ "$(uci -q get shadowsocks-libev.ss_rules.disabled)" != "1" ]; then
 			_log "Reload Shadowsocks rules"
 			/etc/init.d/shadowsocks-libev rules_up 2> /dev/null
 			_get_ip
@@ -76,7 +76,7 @@ while true; do
 		last=$((last + 1 ))
 		[ -z "$nocontact" ] && nocontact="$host" || nocontact="$nocontact, $host"
 		[ "${last}" -ge "${retry}" ] && {
-			if [ -n "$(iptables -t nat -L -n | grep ss_rules_forward)" ]; then
+			if [ -n "$(iptables -t nat -L -n | grep ss_rules)" ]; then
 				_log "Shadowsocks is down (can't contact via http ${nocontact})"
 				uci -q set openmptcprouter.omr.shadowsocks="down"
 				uci -q commit openmptcprouter.omr
diff --git a/shadowsocks-libev/files/shadowsocks-libev.init b/shadowsocks-libev/files/shadowsocks-libev.init
index cf3d07c2d..e441fe3e4 100644
--- a/shadowsocks-libev/files/shadowsocks-libev.init
+++ b/shadowsocks-libev/files/shadowsocks-libev.init
@@ -288,7 +288,7 @@ stop_service() {
 }
 
 rules_exist() {
-	[ -n "$(iptables -t nat -L -n | grep ss_rules_forward)" ] && return 0
+	[ -n "$(iptables -t nat -L -n | grep ss_rules)" ] && return 0
 	return 1
 }