From 5bc24b9727042fb6abe8736e533ddcb3ee81e3cc Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Fri, 19 Jan 2024 09:10:12 +0100
Subject: [PATCH] Fix OMR-DSCP nft

---
 omr-dscp/files/etc/init.d/omr-dscp-nft | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/omr-dscp/files/etc/init.d/omr-dscp-nft b/omr-dscp/files/etc/init.d/omr-dscp-nft
index c67af2b02..19aa9d589 100755
--- a/omr-dscp/files/etc/init.d/omr-dscp-nft
+++ b/omr-dscp/files/etc/init.d/omr-dscp-nft
@@ -46,18 +46,20 @@ _add_dscp_domains_rules() {
 			set firewall.omr_dscp_${class}_6.match='dest_ip'
 		EOF
 		uci -q batch <<-EOF
-			set firewall.omr_dscp_${class}=rule
-			set firewall.omr_dscp_${class}.ipset="omr_dscp_${class}_4"
-			set firewall.omr_dscp_${class}.set_dscp="$(echo ${class} | tr '[a-z'] '[A-Z]')"
-			set firewall.omr_dscp_${class}.target='DSCP'
-			set firewall.omr_dscp_${class}.src='lan'
-			set firewall.omr_dscp_${class}.dest='*'
-			set firewall.omr6_dscp_${class}=rule
-			set firewall.omr6_dscp_${class}.ipset="omr_dscp_${class}_6"
-			set firewall.omr6_dscp_${class}.target='DSCP'
-			set firewall.omr6_dscp_${class}.set_dscp="$(echo ${class} | tr '[a-z'] '[A-Z]')"
-			set firewall.omr6_dscp_${class}.src='lan'
-			set firewall.omr6_dscp_${class}.dest='*'
+			set firewall.omr_dscp_rule_${class}_4=rule
+			set firewall.omr_dscp_rule_${class}_4.name="omr_dscp_${class}_4"
+			set firewall.omr_dscp_rule_${class}_4.ipset="omr_dscp_${class}_4"
+			set firewall.omr_dscp_rule_${class}_4.set_dscp="$(echo ${class} | tr '[a-z'] '[A-Z]')"
+			set firewall.omr_dscp_rule_${class}_4.target='DSCP'
+			set firewall.omr_dscp_rule_${class}_4.src='lan'
+			set firewall.omr_dscp_rule_${class}_4.dest='*'
+			set firewall.omr_dscp_rule_${class}_6=rule
+			set firewall.omr_dscp_rule_${class}_6.name="omr6_dscp_${class}_6"
+			set firewall.omr_dscp_rule_${class}_6.ipset="omr_dscp_${class}_6"
+			set firewall.omr_dscp_rule_${class}_6.target='DSCP'
+			set firewall.omr_dscp_rule_${class}_6.set_dscp="$(echo ${class} | tr '[a-z'] '[A-Z]')"
+			set firewall.omr_dscp_rule_${class}_6.src='lan'
+			set firewall.omr_dscp_rule_${class}_6.dest='*'
 			commit firewall
 		EOF
 	done