From 17c660a88d8f340d9acbcaf2a9bede937adb196f Mon Sep 17 00:00:00 2001
From: Nicolas Fort <nicolasfort1988@gmail.com>
Date: Mon, 5 Sep 2022 19:23:52 +0000
Subject: T4670: policy route: extend matching criteria for policy route and
 route6. Matching criteria added: ttl/hoplimit and packet-length

---
 interface-definitions/firewall.xml.in              | 22 ++--------------------
 .../include/firewall/hop-limit.xml.i               | 12 ++++++++++++
 interface-definitions/include/firewall/ttl.xml.i   | 12 ++++++++++++
 interface-definitions/policy-route.xml.in          |  4 ++++
 4 files changed, 30 insertions(+), 20 deletions(-)
 create mode 100644 interface-definitions/include/firewall/hop-limit.xml.i
 create mode 100644 interface-definitions/include/firewall/ttl.xml.i

(limited to 'interface-definitions')

diff --git a/interface-definitions/firewall.xml.in b/interface-definitions/firewall.xml.in
index c2d652278..0ab9d6a66 100644
--- a/interface-definitions/firewall.xml.in
+++ b/interface-definitions/firewall.xml.in
@@ -384,16 +384,7 @@
               </node>
               #include <include/firewall/common-rule.xml.i>
               #include <include/firewall/packet-length.xml.i>
-              <node name="hop-limit">
-                <properties>
-                  <help>Hop Limit</help>
-                </properties>
-                <children>
-                  #include <include/firewall/eq.xml.i>
-                  #include <include/firewall/gt.xml.i>
-                  #include <include/firewall/lt.xml.i>
-                </children>
-              </node>
+              #include <include/firewall/hop-limit.xml.i>
               <node name="icmpv6">
                 <properties>
                   <help>ICMPv6 type and code information</help>
@@ -572,16 +563,7 @@
                   #include <include/firewall/icmp-type-name.xml.i>
                 </children>
               </node>
-              <node name="ttl">
-                <properties>
-                  <help>Time to live limit</help>
-                </properties>
-                <children>
-                  #include <include/firewall/eq.xml.i>
-                  #include <include/firewall/gt.xml.i>
-                  #include <include/firewall/lt.xml.i>
-                </children>
-              </node>
+              #include <include/firewall/ttl.xml.i>
             </children>
           </tagNode>
         </children>
diff --git a/interface-definitions/include/firewall/hop-limit.xml.i b/interface-definitions/include/firewall/hop-limit.xml.i
new file mode 100644
index 000000000..d375dc985
--- /dev/null
+++ b/interface-definitions/include/firewall/hop-limit.xml.i
@@ -0,0 +1,12 @@
+<!-- include start from firewall/hop-limit.xml.i -->
+<node name="hop-limit">
+  <properties>
+    <help>Hop limit</help>
+  </properties>
+  <children>
+    #include <include/firewall/eq.xml.i>
+    #include <include/firewall/gt.xml.i>
+    #include <include/firewall/lt.xml.i>
+  </children>
+</node>
+<!-- include end -->
\ No newline at end of file
diff --git a/interface-definitions/include/firewall/ttl.xml.i b/interface-definitions/include/firewall/ttl.xml.i
new file mode 100644
index 000000000..9c782a9a5
--- /dev/null
+++ b/interface-definitions/include/firewall/ttl.xml.i
@@ -0,0 +1,12 @@
+<!-- include start from firewall/ttl.xml.i -->
+<node name="ttl">
+  <properties>
+    <help>Time to live limit</help>
+  </properties>
+  <children>
+    #include <include/firewall/eq.xml.i>
+    #include <include/firewall/gt.xml.i>
+    #include <include/firewall/lt.xml.i>
+  </children>
+</node>
+<!-- include end -->
\ No newline at end of file
diff --git a/interface-definitions/policy-route.xml.in b/interface-definitions/policy-route.xml.in
index c2a9a8d94..ba1371fab 100644
--- a/interface-definitions/policy-route.xml.in
+++ b/interface-definitions/policy-route.xml.in
@@ -47,6 +47,8 @@
                 </children>
               </node>
               #include <include/policy/route-common-rule-ipv6.xml.i>
+              #include <include/firewall/packet-length.xml.i>
+              #include <include/firewall/hop-limit.xml.i>
             </children>
           </tagNode>
         </children>
@@ -96,6 +98,8 @@
                 </children>
               </node>
               #include <include/policy/route-common-rule.xml.i>
+              #include <include/firewall/packet-length.xml.i>
+              #include <include/firewall/ttl.xml.i>
             </children>
           </tagNode>
         </children>
-- 
cgit v1.2.3