From c1e44bcb65220033e2ad12c15ce63aee12bec35c Mon Sep 17 00:00:00 2001
From: Ad Schellevis <ad@opnsense.org>
Date: Sat, 28 Dec 2024 19:06:44 +0100
Subject: [PATCH] Firewall: Automation: Filter - add match prio for
 https://github.com/opnsense/core/issues/8143

---
 .../OPNsense/Firewall/forms/dialogFilterRule.xml    |  8 +++++++-
 .../mvc/app/models/OPNsense/Firewall/Filter.xml     | 13 +++++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/src/opnsense/mvc/app/controllers/OPNsense/Firewall/forms/dialogFilterRule.xml b/src/opnsense/mvc/app/controllers/OPNsense/Firewall/forms/dialogFilterRule.xml
index 8547513a5b..a9a0802fba 100644
--- a/src/opnsense/mvc/app/controllers/OPNsense/Firewall/forms/dialogFilterRule.xml
+++ b/src/opnsense/mvc/app/controllers/OPNsense/Firewall/forms/dialogFilterRule.xml
@@ -242,9 +242,15 @@
     </field>
     <field>
         <type>header</type>
-        <label>Packet mangling</label>
+        <label>Priority</label>
         <collapse>true</collapse>
     </field>
+    <field>
+        <id>rule.prio</id>
+        <label>Match priority</label>
+        <type>dropdown</type>
+        <help>Only match packets which have the given queueing priority assigned.</help>
+    </field>
     <field>
         <id>rule.set-prio</id>
         <label>Set priority</label>
diff --git a/src/opnsense/mvc/app/models/OPNsense/Firewall/Filter.xml b/src/opnsense/mvc/app/models/OPNsense/Firewall/Filter.xml
index b68b77c20f..a3726ab09f 100644
--- a/src/opnsense/mvc/app/models/OPNsense/Firewall/Filter.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/Firewall/Filter.xml
@@ -164,6 +164,19 @@
                 <adaptiveend type="IntegerField">
                     <MinimumValue>0</MinimumValue>
                 </adaptiveend>
+                <prio type="OptionField">
+                    <BlankDesc>Any priority</BlankDesc>
+                    <OptionValues>
+                        <opt1 value="1">Background (1, lowest)</opt1>
+                        <opt0 value="0">Best Effort (0, default)</opt0>
+                        <opt2 value="2">Excellent Effort (2)</opt2>
+                        <opt3 value="3">Critical Applications (3)</opt3>
+                        <opt4 value="4">Video (4)</opt4>
+                        <opt5 value="5">Voice (5)</opt5>
+                        <opt6 value="6">Internetwork Control (6)</opt6>
+                        <opt7 value="7">Network Control (7, highest)</opt7>
+                    </OptionValues>
+                </prio>
                 <set-prio type="OptionField">
                     <BlankDesc>Keep current priority</BlankDesc>
                     <OptionValues>