From 72c8e134fdcb5540ff5a1a25626261dd2e895668 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Sun, 18 Feb 2024 20:45:00 +0100
Subject: [PATCH] Maybe fix
 https://github.com/Ysurac/openmptcprouter/issues/3173

---
 .../files/shadowsocks-libev.init-nft          | 40 +++++++++++++------
 .../files/shadowsocks-rust.init-nft           | 18 ++++++++-
 2 files changed, 43 insertions(+), 15 deletions(-)

diff --git a/shadowsocks-libev/files/shadowsocks-libev.init-nft b/shadowsocks-libev/files/shadowsocks-libev.init-nft
index f8121fe7c..c69eade3c 100755
--- a/shadowsocks-libev/files/shadowsocks-libev.init-nft
+++ b/shadowsocks-libev/files/shadowsocks-libev.init-nft
@@ -11,6 +11,8 @@ START=99
 
 EXTRA_COMMANDS="rules_up rules_down rules_exist"
 
+. /usr/lib/unbound/iptools.sh
+
 ss_confdir=/var/etc/shadowsocks-libev
 ss_bindir=/usr/bin
 
@@ -45,17 +47,17 @@ ss_mkjson_server_conf_() {
 	[ -z "$plugin" ] || json_add_string plugin "$plugin"
 	[ -z "$plugin_opts" ] || json_add_string plugin_opts "$plugin_opts"
 	if [ "$obfs" = 1 ]; then
-	if [ "$obfs_plugin" = "obfs" ]; then
-		obfs_options="obfs=$obfs_type"
-		[ -z "$obfs_host" ] || obfs_options="$obfs_options;obfs-host=$obfs_host"
-		[ -z "$obfs_uri" ] || obfs_options="$obfs_options;obfs-uri=$obfs_uri"
-		[ "$fast_open" = 1 ] && obfs_options="$obfs_options;fast-open"
-		[ "$mptcp" = 1 ] && obfs_options="$obfs_options;mptcp"
-		[ -z "$timeout" ] || obfs_options="$obfs_options;t=$timeout"
-		json_add_string plugin "/usr/bin/obfs-local"
-		json_add_string plugin_opts "$obfs_options"
-	fi
-	if [ "$obfs_plugin" = "v2ray" ]; then
+		if [ "$obfs_plugin" = "obfs" ]; then
+			obfs_options="obfs=$obfs_type"
+			[ -z "$obfs_host" ] || obfs_options="$obfs_options;obfs-host=$obfs_host"
+			[ -z "$obfs_uri" ] || obfs_options="$obfs_options;obfs-uri=$obfs_uri"
+			[ "$fast_open" = 1 ] && obfs_options="$obfs_options;fast-open"
+			[ "$mptcp" = 1 ] && obfs_options="$obfs_options;mptcp"
+			[ -z "$timeout" ] || obfs_options="$obfs_options;t=$timeout"
+			json_add_string plugin "/usr/bin/obfs-local"
+			json_add_string plugin_opts "$obfs_options"
+		fi
+		if [ "$obfs_plugin" = "v2ray" ]; then
 			obfs_options="loglevel=default"
 			[ "$obfs_type" = "tls" ] && obfs_options="tls"
 			[ -z "$obfs_host" ] || obfs_options="$obfs_options;host=$obfs_host"
@@ -135,7 +137,11 @@ ss_rules_cb() {
 	if [ "$cfgtype" = ss_redir ]; then
 		config_get cfgserver "$cfg" server
 		config_get server "$cfgserver" server
-		ss_redir_servers="$ss_redir_servers $server"
+		if [ -z "$ss_redir_servers" ]; then
+			ss_redir_servers="$server"
+		else
+			ss_redir_servers="$ss_redir_servers $server"
+		fi
 		if [ "$mode" = tcp_only -o "$mode" = "tcp_and_udp" ]; then
 			eval "ss_rules_redir_tcp_$cfg=$local_port"
 		fi
@@ -193,7 +199,15 @@ ss_rules_nft_gen() {
 		eval local_port_udp="\$ss_rules_redir_udp_$redir_udp"
 	fi
 	[ -n "$local_port_tcp" -o -n "$local_port_udp" ] || return 1
-	remote_servers="$(echo $ss_redir_servers \
+	
+	if [ -z "$(echo $ss_redir_servers | grep ' ')" ]; then
+		valid_ip4=$( valid_subnet4 $ss_redir_servers)
+		valid_ip6=$( valid_subnet6 $ss_redir_servers)
+		if [ "$valid_ip4" = "ok" ] || [ "$valid_ip6" = "ok" ]; then
+			remote_servers=$ss_redir_servers
+		fi
+	fi
+	[ -z "$remote_servers" ] && remote_servers="$(echo $ss_redir_servers \
 		| tr ' ' '\n' \
 		| sort -u \
 		| xargs -n 1 resolveip \
diff --git a/shadowsocks-rust/files/shadowsocks-rust.init-nft b/shadowsocks-rust/files/shadowsocks-rust.init-nft
index 7a48c152f..158df38f7 100755
--- a/shadowsocks-rust/files/shadowsocks-rust.init-nft
+++ b/shadowsocks-rust/files/shadowsocks-rust.init-nft
@@ -11,6 +11,8 @@ START=99
 
 EXTRA_COMMANDS="rules_up rules_down rules_exist"
 
+. /usr/lib/unbound/iptools.sh
+
 ss_confdir=/var/etc/shadowsocks-rust
 ss_bindir=/usr/bin
 
@@ -108,7 +110,11 @@ ss_rules_cb() {
 	if [ "$cfgtype" = ss_redir ]; then
 		config_get cfgserver "$cfg" server
 		config_get server "$cfgserver" server
-		ss_redir_servers="$ss_redir_servers $server"
+		if [ -z "$ss_redir_servers" ]; then
+			ss_redir_servers="$server"
+		else
+			ss_redir_servers="$ss_redir_servers $server"
+		fi
 		if [ "$mode" = tcp_only -o "$mode" = "tcp_and_udp" ]; then
 			eval "ss_rules_redir_tcp_$cfg=$local_port"
 		fi
@@ -164,7 +170,15 @@ ss_rules_nft_gen() {
 	fi
 
 	[ -n "$local_port_tcp" -o -n "$local_port_udp" ] || return 1
-	remote_servers="$(echo $ss_redir_servers \
+
+	if [ -z "$(echo $ss_redir_servers | grep ' ')" ]; then
+		valid_ip4=$( valid_subnet4 $ss_redir_servers)
+		valid_ip6=$( valid_subnet6 $ss_redir_servers)
+		if [ "$valid_ip4" = "ok" ] || [ "$valid_ip6" = "ok" ]; then
+			remote_servers=$ss_redir_servers
+		fi
+	fi
+	[ -z "$remote_servers" ] && remote_servers="$(echo $ss_redir_servers \
 		| tr ' ' '\n' \
 		| sort -u \
 		| xargs -n 1 resolveip \