From 37b059f39afe902ed302345505d84fb952711832 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Wed, 17 Jan 2024 16:35:17 +0100
Subject: [PATCH] Remove not used firewall include on all proxy

---
 shadowsocks-libev/files/shadowsocks-libev.init-nft | 5 ++++-
 shadowsocks-rust/files/shadowsocks-rust.init-nft   | 5 ++++-
 v2ray-core/files/etc/init.d/v2ray-nft              | 4 ++++
 xray-core/files/etc/firewall.xray-rules            | 2 +-
 xray-core/files/etc/init.d/xray-nft                | 4 ++++
 5 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/shadowsocks-libev/files/shadowsocks-libev.init-nft b/shadowsocks-libev/files/shadowsocks-libev.init-nft
index 340a479d0..39d8a5f7a 100755
--- a/shadowsocks-libev/files/shadowsocks-libev.init-nft
+++ b/shadowsocks-libev/files/shadowsocks-libev.init-nft
@@ -255,7 +255,10 @@ rules_exist() {
 
 start_service() {
 	local cfgtype
-
+	[ -n "$(uci -q get firewall.ss_rules)" ] && {
+		uci -q del firewall.ss_rules
+		uci -q commit firewall
+	}
 	mkdir -p "$ss_confdir"
 	config_load shadowsocks-libev
 	for cfgtype in ss_local ss_redir ss_server ss_tunnel; do
diff --git a/shadowsocks-rust/files/shadowsocks-rust.init-nft b/shadowsocks-rust/files/shadowsocks-rust.init-nft
index d1d153deb..c631ee569 100755
--- a/shadowsocks-rust/files/shadowsocks-rust.init-nft
+++ b/shadowsocks-rust/files/shadowsocks-rust.init-nft
@@ -210,7 +210,10 @@ rules_exist() {
 
 start_service() {
 	local cfgtype
-
+	[ -n "$(uci -q get firewall.ssr_rules)" ] && {
+		uci -q del firewall.ssr_rules
+		uci -q commit firewall
+	}
 	mkdir -p "$ss_confdir"
 	config_load shadowsocks-rust
 	for cfgtype in ss_local ss_redir ss_server ss_tunnel; do
diff --git a/v2ray-core/files/etc/init.d/v2ray-nft b/v2ray-core/files/etc/init.d/v2ray-nft
index ed4027673..503dd2813 100755
--- a/v2ray-core/files/etc/init.d/v2ray-nft
+++ b/v2ray-core/files/etc/init.d/v2ray-nft
@@ -2100,6 +2100,10 @@ clear_transparent_proxy() {
 
 start_instance() {
 	local section="$1"
+	[ -n "$(uci -q get firewall.v2ray)" ] && {
+		uci -q del firewall.v2ray
+		uci -q commit firewall
+	}
 
 	if ! v2ray_section_validate "$section" ; then
 		_err "Invalid config."
diff --git a/xray-core/files/etc/firewall.xray-rules b/xray-core/files/etc/firewall.xray-rules
index 064828b3b..2a82fba79 100644
--- a/xray-core/files/etc/firewall.xray-rules
+++ b/xray-core/files/etc/firewall.xray-rules
@@ -1,2 +1,2 @@
 #!/bin/sh
-[ "$(uci -q get xray.main_dns.enabled)" = "1"] && /etc/init.d/xray rules_up
+[ "$(uci -q get xray.main_dns.enabled)" = "1" ] && /etc/init.d/xray rules_up
diff --git a/xray-core/files/etc/init.d/xray-nft b/xray-core/files/etc/init.d/xray-nft
index a92efe7df..ad7b70aac 100755
--- a/xray-core/files/etc/init.d/xray-nft
+++ b/xray-core/files/etc/init.d/xray-nft
@@ -2321,6 +2321,10 @@ rules_down() {
 
 
 start_service() {
+	[ -n "$(uci -q get firewall.xray)" ] && {
+		uci -q del firewall.xray
+		uci -q commit firewall
+	}
 	clear_transparent_proxy
 
 	config_load "$NAME"