From d9eb48a0ced1eb60bd00fe2f18559b3c780ee98a Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Sat, 3 Sep 2022 20:37:10 +0200
Subject: firewall: T4651: re-implement packet-length CLI option to use
 <multi/>

---
 .../include/firewall/packet-length.xml.i           | 28 ++++++++++++++++++----
 1 file changed, 24 insertions(+), 4 deletions(-)

(limited to 'interface-definitions')

diff --git a/interface-definitions/include/firewall/packet-length.xml.i b/interface-definitions/include/firewall/packet-length.xml.i
index 866a76bbb..043f56d16 100644
--- a/interface-definitions/include/firewall/packet-length.xml.i
+++ b/interface-definitions/include/firewall/packet-length.xml.i
@@ -1,18 +1,38 @@
 <!-- include start from firewall/packet-length.xml.i -->
 <leafNode name="packet-length">
   <properties>
-    <help>Payload size in bytes, including header and data</help>
+    <help>Payload size in bytes, including header and data to match</help>
     <valueHelp>
       <format>u32:1-65535</format>
-      <description>Packet length value. Multiple values can be specified as a comma-separated list. Inverted match is also supported</description>
+      <description>Packet length to match</description>
     </valueHelp>
     <valueHelp>
       <format>&lt;start-end&gt;</format>
-      <description>Packet length range. Inverted match is also supported (e.g. 1001-1005 or !1001-1005)</description>
+      <description>Packet length range to match</description>
     </valueHelp>
     <constraint>
-      <validator name="packet-length"/>
+      <validator name="numeric" argument="--range 1-65535"/>
+      <validator name="range" argument="--min=1 --max=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="--range 1-65535"/>
+      <validator name="range" argument="--min=1 --max=65535"/>
+    </constraint>
+    <multi/>
   </properties>
 </leafNode>
 <!-- include end -->
-- 
cgit v1.2.3