diff options
| author | Christian Poessinger <christian@poessinger.com> | 2022-09-03 20:38:13 +0200 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2022-09-03 20:38:13 +0200 |
| commit | 5a6c8b52e985df8f04817b9b529504bdc6e6d8c1 (patch) | |
| tree | 99425f45c67ec29f94c5235ca70b7cedbe8d695b /interface-definitions/firewall.xml.in | |
| parent | e7719b7be2f817834d988e10368a39e419c44263 (diff) | |
| parent | d9eb48a0ced1eb60bd00fe2f18559b3c780ee98a (diff) | |
| download | vyos-1x-5a6c8b52e985df8f04817b9b529504bdc6e6d8c1.tar.gz vyos-1x-5a6c8b52e985df8f04817b9b529504bdc6e6d8c1.zip | |
Merge branch 'firewall' into current
* firewall:
firewall: T4651: re-implement packet-length CLI option to use <multi/>
firewall: T3568: improve default-action help string
firewall: T3568: add XML include block for eq,gt,lt options
smoketest: firewall: add re-usable variables when running testcases
Firewall: T4651: Change proposed cli from ip-length to packet-length
Firewall: T4651: Add options to match packet size on firewall rules.
Diffstat (limited to 'interface-definitions/firewall.xml.in')
| -rw-r--r-- | interface-definitions/firewall.xml.in | 80 |
1 files changed, 8 insertions, 72 deletions
diff --git a/interface-definitions/firewall.xml.in b/interface-definitions/firewall.xml.in index 9488ddcdc..c2d652278 100644 --- a/interface-definitions/firewall.xml.in +++ b/interface-definitions/firewall.xml.in @@ -383,47 +383,15 @@ </children> </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> - <leafNode name="eq"> - <properties> - <help>Value to match a hop limit equal to it</help> - <valueHelp> - <format>u32:0-255</format> - <description>Hop limit equal to value</description> - </valueHelp> - <constraint> - <validator name="numeric" argument="--range 0-255"/> - </constraint> - </properties> - </leafNode> - <leafNode name="gt"> - <properties> - <help>Value to match a hop limit greater than or equal to it</help> - <valueHelp> - <format>u32:0-255</format> - <description>Hop limit greater than value</description> - </valueHelp> - <constraint> - <validator name="numeric" argument="--range 0-255"/> - </constraint> - </properties> - </leafNode> - <leafNode name="lt"> - <properties> - <help>Value to match a hop limit less than or equal to it</help> - <valueHelp> - <format>u32:0-255</format> - <description>Hop limit less than value</description> - </valueHelp> - <constraint> - <validator name="numeric" argument="--range 0-255"/> - </constraint> - </properties> - </leafNode> + #include <include/firewall/eq.xml.i> + #include <include/firewall/gt.xml.i> + #include <include/firewall/lt.xml.i> </children> </node> <node name="icmpv6"> @@ -571,6 +539,7 @@ </children> </node> #include <include/firewall/common-rule.xml.i> + #include <include/firewall/packet-length.xml.i> <node name="icmp"> <properties> <help>ICMP type and code information</help> @@ -608,42 +577,9 @@ <help>Time to live limit</help> </properties> <children> - <leafNode name="eq"> - <properties> - <help>Value to match a ttl equal to it</help> - <valueHelp> - <format>u32:0-255</format> - <description>ttl equal to value</description> - </valueHelp> - <constraint> - <validator name="numeric" argument="--range 0-255"/> - </constraint> - </properties> - </leafNode> - <leafNode name="gt"> - <properties> - <help>Value to match a ttl greater than or equal to it</help> - <valueHelp> - <format>u32:0-255</format> - <description>ttl greater than value</description> - </valueHelp> - <constraint> - <validator name="numeric" argument="--range 0-255"/> - </constraint> - </properties> - </leafNode> - <leafNode name="lt"> - <properties> - <help>Value to match a ttl less than or equal to it</help> - <valueHelp> - <format>u32:0-255</format> - <description>ttl less than value</description> - </valueHelp> - <constraint> - <validator name="numeric" argument="--range 0-255"/> - </constraint> - </properties> - </leafNode> + #include <include/firewall/eq.xml.i> + #include <include/firewall/gt.xml.i> + #include <include/firewall/lt.xml.i> </children> </node> </children> |