From 16c494c2f1364283988b52e35faf6b01745bbed4 Mon Sep 17 00:00:00 2001
From: Nicolas Fort <nicolasfort1988@gmail.com>
Date: Mon, 6 Mar 2023 18:30:55 +0000
Subject: T5055: Firewall: add packet-type matcher in firewall and route policy

---
 interface-definitions/firewall.xml.in              |  4 +-
 .../include/firewall/packet-length.xml.i           | 36 -------------
 .../include/firewall/packet-options.xml.i          | 63 ++++++++++++++++++++++
 interface-definitions/policy-route.xml.in          |  4 +-
 4 files changed, 67 insertions(+), 40 deletions(-)
 delete mode 100644 interface-definitions/include/firewall/packet-length.xml.i
 create mode 100644 interface-definitions/include/firewall/packet-options.xml.i

(limited to 'interface-definitions')

diff --git a/interface-definitions/firewall.xml.in b/interface-definitions/firewall.xml.in
index c9a132c4a..f8eed2ce0 100644
--- a/interface-definitions/firewall.xml.in
+++ b/interface-definitions/firewall.xml.in
@@ -459,7 +459,7 @@
               </node>
               #include <include/firewall/common-rule.xml.i>
               #include <include/firewall/dscp.xml.i>
-              #include <include/firewall/packet-length.xml.i>
+              #include <include/firewall/packet-options.xml.i>
               #include <include/firewall/hop-limit.xml.i>
               #include <include/firewall/connection-mark.xml.i>
               <node name="icmpv6">
@@ -629,7 +629,7 @@
               </node>
               #include <include/firewall/common-rule.xml.i>
               #include <include/firewall/dscp.xml.i>
-              #include <include/firewall/packet-length.xml.i>
+              #include <include/firewall/packet-options.xml.i>
               #include <include/firewall/connection-mark.xml.i>
               <node name="icmp">
                 <properties>
diff --git a/interface-definitions/include/firewall/packet-length.xml.i b/interface-definitions/include/firewall/packet-length.xml.i
deleted file mode 100644
index fd2eb67b0..000000000
--- a/interface-definitions/include/firewall/packet-length.xml.i
+++ /dev/null
@@ -1,36 +0,0 @@
-<!-- include start from firewall/packet-length.xml.i -->
-<leafNode name="packet-length">
-  <properties>
-    <help>Payload size in bytes, including header and data to match</help>
-    <valueHelp>
-      <format>u32:1-65535</format>
-      <description>Packet length to match</description>
-    </valueHelp>
-    <valueHelp>
-      <format>&lt;start-end&gt;</format>
-      <description>Packet length range to match</description>
-    </valueHelp>
-    <constraint>
-      <validator name="numeric" argument="--allow-range --range 1-65535"/>
-    </constraint>
-    <multi/>
-  </properties>
-</leafNode>
-<leafNode name="packet-length-exclude">
-  <properties>
-    <help>Payload size in bytes, including header and data not to match</help>
-    <valueHelp>
-      <format>u32:1-65535</format>
-      <description>Packet length not to match</description>
-    </valueHelp>
-    <valueHelp>
-      <format>&lt;start-end&gt;</format>
-      <description>Packet length range not to match</description>
-    </valueHelp>
-    <constraint>
-      <validator name="numeric" argument="--allow-range --range 1-65535"/>
-    </constraint>
-    <multi/>
-  </properties>
-</leafNode>
-<!-- include end -->
diff --git a/interface-definitions/include/firewall/packet-options.xml.i b/interface-definitions/include/firewall/packet-options.xml.i
new file mode 100644
index 000000000..cd94e69c2
--- /dev/null
+++ b/interface-definitions/include/firewall/packet-options.xml.i
@@ -0,0 +1,63 @@
+<!-- include start from firewall/packet-options.xml.i -->
+<leafNode name="packet-length">
+  <properties>
+    <help>Payload size in bytes, including header and data to match</help>
+    <valueHelp>
+      <format>u32:1-65535</format>
+      <description>Packet length to match</description>
+    </valueHelp>
+    <valueHelp>
+      <format>&lt;start-end&gt;</format>
+      <description>Packet length range to match</description>
+    </valueHelp>
+    <constraint>
+      <validator name="numeric" argument="--allow-range --range 1-65535"/>
+    </constraint>
+    <multi/>
+  </properties>
+</leafNode>
+<leafNode name="packet-length-exclude">
+  <properties>
+    <help>Payload size in bytes, including header and data not to match</help>
+    <valueHelp>
+      <format>u32:1-65535</format>
+      <description>Packet length not to match</description>
+    </valueHelp>
+    <valueHelp>
+      <format>&lt;start-end&gt;</format>
+      <description>Packet length range not to match</description>
+    </valueHelp>
+    <constraint>
+      <validator name="numeric" argument="--allow-range --range 1-65535"/>
+    </constraint>
+    <multi/>
+  </properties>
+</leafNode>
+<leafNode name="packet-type">
+  <properties>
+    <help>Packet type</help>
+    <completionHelp>
+      <list>broadcast host multicast other</list>
+    </completionHelp>
+    <valueHelp>
+      <format>broadcast</format>
+      <description>Match broadcast packet type</description>
+    </valueHelp>
+    <valueHelp>
+      <format>host</format>
+      <description>Match host packet type, addressed to local host</description>
+    </valueHelp>
+    <valueHelp>
+      <format>multicast</format>
+      <description>Match multicast packet type</description>
+    </valueHelp>
+    <valueHelp>
+      <format>other</format>
+      <description>Match packet addressed to another host</description>
+    </valueHelp>
+    <constraint>
+      <regex>(broadcast|host|multicast|other)</regex>
+    </constraint>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/policy-route.xml.in b/interface-definitions/policy-route.xml.in
index d7b159839..bbd6dbf56 100644
--- a/interface-definitions/policy-route.xml.in
+++ b/interface-definitions/policy-route.xml.in
@@ -50,7 +50,7 @@
               #include <include/policy/route-common.xml.i>
               #include <include/policy/route-ipv6.xml.i>
               #include <include/firewall/dscp.xml.i>
-              #include <include/firewall/packet-length.xml.i>
+              #include <include/firewall/packet-options.xml.i>
               #include <include/firewall/hop-limit.xml.i>
               #include <include/firewall/connection-mark.xml.i>
             </children>
@@ -105,7 +105,7 @@
               #include <include/policy/route-common.xml.i>
               #include <include/policy/route-ipv4.xml.i>
               #include <include/firewall/dscp.xml.i>
-              #include <include/firewall/packet-length.xml.i>
+              #include <include/firewall/packet-options.xml.i>
               #include <include/firewall/ttl.xml.i>
               #include <include/firewall/connection-mark.xml.i>
             </children>
-- 
cgit v1.2.3