From 6194f82b39bb6c60a906d1fa29ea31786f20eeb0 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Fri, 12 Jan 2024 18:22:39 +0100
Subject: [PATCH] Remove fw4 logs from Shadowsocks-libev

---
 shadowsocks-libev/files/shadowsocks-libev.init-nft | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/shadowsocks-libev/files/shadowsocks-libev.init-nft b/shadowsocks-libev/files/shadowsocks-libev.init-nft
index 3db4bbc56..b53160515 100755
--- a/shadowsocks-libev/files/shadowsocks-libev.init-nft
+++ b/shadowsocks-libev/files/shadowsocks-libev.init-nft
@@ -181,7 +181,7 @@ ss_rules_nft_gen() {
 		echo "table inet chk {include \"$tmp.nft\";}" >"$tmp.nft.chk"
 		if nft -f "$tmp.nft.chk" -c; then
 			mv "$tmp.nft" "$ssrules_nft"
-			fw4 restart
+			fw4 -q restart
 		fi
 		rm -f "$tmp.nft.chk"
 	fi
@@ -192,7 +192,7 @@ ss_rules_nft_gen() {
 ss_rules_nft_reset() {
 	if [ -f "$ssrules_nft" ]; then
 		rm -f "$ssrules_nft"
-		fw4 restart
+		fw4 -q restart
 	fi
 }
 
@@ -205,14 +205,14 @@ ss_rules() {
 rules_up() {
 	if [ -f "${ssrules_nft}.down" ]; then
 		mv -f "${ssrules_nft}.down" "$ssrules_nft"
-		fw4 restart
+		fw4 -q restart
 	fi
 }
 
 rules_down() {
 	if [ -f "${ssrules_nft}" ]; then
 		mv -f "$ssrules_nft" "${ssrules_nft}.down"
-		fw4 restart
+		fw4 -q restart
 	fi
 }
 
@@ -328,8 +328,8 @@ validate_ss_redir_section() {
 validate_ss_rules_section() {
 	"${2:-ss_validate}" ss_rules "$1" \
 		'disabled:bool:0' \
-		'redir_tcp:uci("shadowsocks-libev", "@ss_redir","all")' \
-		'redir_udp:uci("shadowsocks-libev", "@ss_redir","all")' \
+		'redir_tcp:or(uci("shadowsocks-libev", "@ss_redir"),"all")' \
+		'redir_udp:or(uci("shadowsocks-libev", "@ss_redir"),"all")' \
 		'src_ips_bypass:or(ipaddr,cidr)' \
 		'src_ips_forward:or(ipaddr,cidr)' \
 		'src_ips_checkdst:or(ipaddr,cidr)' \