From 8dbeb84f9a446a80abcc9127c3e24b914f9805cb Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Sun, 18 Feb 2024 20:10:27 +0100
Subject: [PATCH] Enabled ipset by default in omr-bypass

---
 omr-bypass/files/etc/init.d/omr-bypass-nft | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/omr-bypass/files/etc/init.d/omr-bypass-nft b/omr-bypass/files/etc/init.d/omr-bypass-nft
index be97d353e..6c38601d2 100755
--- a/omr-bypass/files/etc/init.d/omr-bypass-nft
+++ b/omr-bypass/files/etc/init.d/omr-bypass-nft
@@ -572,9 +572,11 @@ _intf_rule() {
 			set firewall.omr_dst_bypass_${intf}_4=ipset
 			set firewall.omr_dst_bypass_${intf}_4.name="omr_dst_bypass_${intf}_4"
 			set firewall.omr_dst_bypass_${intf}_4.match='dest_ip'
+			set firewall.omr_dst_bypass_${intf}_4.enabled='1'
 			set firewall.omr_dst_bypass_${intf}_6=ipset
 			set firewall.omr_dst_bypass_${intf}_6.name="omr_dst_bypass_${intf}_6"
 			set firewall.omr_dst_bypass_${intf}_6.match='dest_ip'
+			set firewall.omr_dst_bypass_${intf}_6.enabled='1'
 		EOF
 		#echo "firewall omr_dst_bypass rules"
 		if [ "$disableipv6" = "0" ]; then
@@ -689,8 +691,10 @@ _intf_rule() {
 		_intf_rule_xray_rules
 	fi
 
-	uci -q set omr-bypass.$intf=interface
-	uci -q set omr-bypass.$intf.id=$count
+	if [ "$intf" != "all" ]; then
+		uci -q set omr-bypass.$intf=interface
+		uci -q set omr-bypass.$intf.id=$count
+	fi
 }
 
 _bypass_ip_set() {