From d40c0c29ad171762d0f1489d2bf5f7bef5e8a6fe Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Fri, 1 Dec 2023 09:46:00 +0100
Subject: [PATCH 1/2] Fix on multi servers for Shadowsocks-Rust and XRay

---
 omr-tracker/files/bin/omr-tracker-server | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/omr-tracker/files/bin/omr-tracker-server b/omr-tracker/files/bin/omr-tracker-server
index d7124a555..ef80e9086 100755
--- a/omr-tracker/files/bin/omr-tracker-server
+++ b/omr-tracker/files/bin/omr-tracker-server
@@ -81,6 +81,7 @@ _check_master() {
 					#logger -t "OMR-Tracker-Server" "$(uci -q get shadowsocks-libev.sss${count}.server | tr -d '\n') - $ip"
 					uci -q batch <<-EOF >/dev/null
 						set shadowsocks-libev.sss${count}.server=$ip
+						set shadowsocks-rust.sss${count}.server=$ip
 					EOF
 					if [ "$count" -eq "0" ]; then
 						uci -q batch <<-EOF >/dev/null
@@ -123,6 +124,8 @@ _check_master() {
 				fi
 				config_load shadowsocks-libev
 				config_foreach _enable_redir ss_redir
+				config_load shadowsocks-rust
+				config_foreach _enable_redir ss_redir
 				OMR_TRACKER_STATUS_MSG="Answer to ping and to API check"
 				mail_alert="$(uci -q get omr-tracker.server.mail_alert)"
 				#[ -z "$mail_alert" ] && mail_alert="$(uci -q get omr-tracker.defaults.mail_alert)"
@@ -150,6 +153,8 @@ _check_master() {
 				EOF
 				config_load shadowsocks-libev
 				config_foreach _disable_redir ss_redir
+				config_load shadowsocks-rust
+				config_foreach _disable_redir ss_redir
 				mail_alert="$(uci -q get omr-tracker.server.mail_alert)"
 				#[ -z "$mail_alert" ] && mail_alert="$(uci -q get omr-tracker.defaults.mail_alert)"
 				[ "$mail_alert" = "1" ] && [ -n "$(uci -q get mail.default.to)" ] && {
@@ -178,7 +183,11 @@ _check_master() {
 		#	config_foreach _enable_redir ss_redir
 		#fi
 		uci -q commit shadowsocks-libev
-		[ "$changes" = "1" ] && /etc/init.d/shadowsocks-libev restart >/dev/null 2>/dev/null
+		uci -q commit shadowsocks-rust
+		[ "$changes" = "1" ] && {
+			/etc/init.d/shadowsocks-libev restart >/dev/null 2>/dev/null
+			/etc/init.d/shadowsocks-rust restart >/dev/null 2>/dev/null
+		}
 		break
 	}
 }
@@ -211,6 +220,7 @@ _check_backup() {
 					changes="1"
 					uci -q batch <<-EOF >/dev/null
 						set shadowsocks-libev.sss${count}.server=$ip
+						set shadowsocks-rust.sss${count}.server=$ip
 					EOF
 					if [ "$count" -eq "0" ]; then
 						uci -q batch <<-EOF >/dev/null
@@ -242,6 +252,7 @@ _check_backup() {
 						EOF
 						/etc/init.d/openmptcprouter-vps get_openvpn_key $name >/dev/null 2>/dev/null
 						/etc/init.d/v2ray restart >/dev/null 2>/dev/null
+						/etc/init.d/xray restart >/dev/null 2>/dev/null
 						/etc/init.d/glorytun restart >/dev/null 2>/dev/null
 						/etc/init.d/glorytun-udp restart >/dev/null 2>/dev/null
 						/etc/init.d/mlvpn restart >/dev/null 2>/dev/null
@@ -253,6 +264,8 @@ _check_backup() {
 				fi
 				config_load shadowsocks-libev
 				config_foreach _enable_redir ss_redir
+				config_load shadowsocks-rust
+				config_foreach _enable_redir ss_redir
 				OMR_TRACKER_STATUS_MSG="Answer to ping and to API check"
 				mail_alert="$(uci -q get omr-tracker.server.mail_alert)"
 				#[ -z "$mail_alert" ] && mail_alert="$(uci -q get omr-tracker.defaults.mail_alert)"
@@ -278,6 +291,8 @@ _check_backup() {
 				EOF
 				config_load shadowsocks-libev
 				config_foreach _disable_redir ss_redir
+				config_load shadowsocks-rust
+				config_foreach _disable_redir ss_redir
 				OMR_TRACKER_STATUS_MSG="No answer to ping and to API check"
 				mail_alert="$(uci -q get omr-tracker.server.mail_alert)"
 				#[ -z "$mail_alert" ] && mail_alert="$(uci -q get omr-tracker.defaults.mail_alert)"
@@ -307,7 +322,11 @@ _check_backup() {
 		#	config_foreach _enable_redir ss_redir
 		#fi
 		uci -q commit shadowsocks-libev
-		[ "$changes" = "1" ] && /etc/init.d/shadowsocks-libev restart >/dev/null 2>/dev/null
+		uci -q commit shadowsocks-rust
+		[ "$changes" = "1" ] && {
+			/etc/init.d/shadowsocks-libev restart >/dev/null 2>/dev/null
+			/etc/init.d/shadowsocks-rust restart >/dev/null 2>/dev/null
+		}
 		[ "$server_ping" = true ] && break
 	}
 }

From b129ad30ae7c15f4b8bccbc85b731f27bb82b6fd Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Fri, 1 Dec 2023 22:55:26 +0100
Subject: [PATCH 2/2] Make shadowsocks-libev not remove rust rules

---
 shadowsocks-libev/files/shadowsocks-libev.init | 4 ++++
 shadowsocks-rust/files/shadowsocks-rust.init   | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/shadowsocks-libev/files/shadowsocks-libev.init b/shadowsocks-libev/files/shadowsocks-libev.init
index 34cc62000..59d2fe856 100644
--- a/shadowsocks-libev/files/shadowsocks-libev.init
+++ b/shadowsocks-libev/files/shadowsocks-libev.init
@@ -369,6 +369,10 @@ rules_up() {
 
 rules_down() {
 	rules_exist || return 0
+	enabled="0"
+	config_load shadowsocks-rust
+	config_foreach server_state server
+	[ "$enabled" = "1" ] && return
 	logger -t "Shadowsocks" "Rules DOWN"
 	local bin="$ss_bindir/ss-rules"
 	[ -x "$bin" ] && {
diff --git a/shadowsocks-rust/files/shadowsocks-rust.init b/shadowsocks-rust/files/shadowsocks-rust.init
index 7af70018d..a1689bba2 100644
--- a/shadowsocks-rust/files/shadowsocks-rust.init
+++ b/shadowsocks-rust/files/shadowsocks-rust.init
@@ -364,6 +364,10 @@ rules_up() {
 
 rules_down() {
 	rules_exist || return 0
+	enabled="0"
+	config_load shadowsocks-libev
+	config_foreach server_state server
+	[ "$enabled" = "1" ] && return
 	logger -t "Shadowsocks-rust" "Rules DOWN"
 	local bin="$ss_bindir/ssr-rules"
 	[ -x "$bin" ] && {