diff options
author | Indrajit Raychaudhuri <irc@indrajit.com> | 2023-12-22 17:22:20 -0600 |
---|---|---|
committer | Christian Breunig <christian@breunig.cc> | 2023-12-30 20:34:43 +0100 |
commit | 57faafc8f8597f62d5edb5529349a565d7d2e865 (patch) | |
tree | 3fafc708ec64485fd63cc14dfa84207005d1d364 /interface-definitions/include | |
parent | 3d579863c98627fbe83efc6033ccc37b81e68d96 (diff) | |
download | vyos-1x-57faafc8f8597f62d5edb5529349a565d7d2e865.tar.gz vyos-1x-57faafc8f8597f62d5edb5529349a565d7d2e865.zip |
firewall: T5834: Improve log message and simplify log-option include
`include/firewall/rule-log-options.xml.i` is now more aptly renamed to
`include/firewall/log-options.xml.i`.
(cherry picked from commit 53a48f499ae9bcc2f657136bb7779b38aad1c242)
Diffstat (limited to 'interface-definitions/include')
-rw-r--r-- | interface-definitions/include/firewall/common-rule-bridge.xml.i | 4 | ||||
-rw-r--r-- | interface-definitions/include/firewall/common-rule-inet.xml.i | 2 | ||||
-rw-r--r-- | interface-definitions/include/firewall/common-rule-ipv4-raw.xml.i | 2 | ||||
-rw-r--r-- | interface-definitions/include/firewall/log-options.xml.i (renamed from interface-definitions/include/firewall/rule-log-options.xml.i) | 0 | ||||
-rw-r--r-- | interface-definitions/include/firewall/log.xml.i | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/interface-definitions/include/firewall/common-rule-bridge.xml.i b/interface-definitions/include/firewall/common-rule-bridge.xml.i index ebf95a111..dcdd970ac 100644 --- a/interface-definitions/include/firewall/common-rule-bridge.xml.i +++ b/interface-definitions/include/firewall/common-rule-bridge.xml.i @@ -19,7 +19,7 @@ </properties> </leafNode> #include <include/firewall/log.xml.i> -#include <include/firewall/rule-log-options.xml.i> +#include <include/firewall/log-options.xml.i> <node name="source"> <properties> <help>Source parameters</help> @@ -31,4 +31,4 @@ #include <include/firewall/inbound-interface.xml.i> #include <include/firewall/outbound-interface.xml.i> #include <include/firewall/match-vlan.xml.i> -<!-- include end -->
\ No newline at end of file +<!-- include end --> diff --git a/interface-definitions/include/firewall/common-rule-inet.xml.i b/interface-definitions/include/firewall/common-rule-inet.xml.i index 030adfe7c..3b5cb724d 100644 --- a/interface-definitions/include/firewall/common-rule-inet.xml.i +++ b/interface-definitions/include/firewall/common-rule-inet.xml.i @@ -78,7 +78,7 @@ </children> </node> #include <include/firewall/log.xml.i> -#include <include/firewall/rule-log-options.xml.i> +#include <include/firewall/log-options.xml.i> <node name="connection-status"> <properties> <help>Connection status</help> diff --git a/interface-definitions/include/firewall/common-rule-ipv4-raw.xml.i b/interface-definitions/include/firewall/common-rule-ipv4-raw.xml.i index a1071a09a..b253ee048 100644 --- a/interface-definitions/include/firewall/common-rule-ipv4-raw.xml.i +++ b/interface-definitions/include/firewall/common-rule-ipv4-raw.xml.i @@ -144,7 +144,7 @@ </constraint> </properties> </leafNode> -#include <include/firewall/rule-log-options.xml.i> +#include <include/firewall/log-options.xml.i> <node name="connection-status"> <properties> <help>Connection status</help> diff --git a/interface-definitions/include/firewall/rule-log-options.xml.i b/interface-definitions/include/firewall/log-options.xml.i index e8b0cdec3..e8b0cdec3 100644 --- a/interface-definitions/include/firewall/rule-log-options.xml.i +++ b/interface-definitions/include/firewall/log-options.xml.i diff --git a/interface-definitions/include/firewall/log.xml.i b/interface-definitions/include/firewall/log.xml.i index 8f3fae1be..795ed77be 100644 --- a/interface-definitions/include/firewall/log.xml.i +++ b/interface-definitions/include/firewall/log.xml.i @@ -1,7 +1,7 @@ <!-- include start from firewall/log.xml.i --> <leafNode name="log"> <properties> - <help>Enable log</help> + <help>Log packets hitting this rule</help> <valueless/> </properties> </leafNode>
\ No newline at end of file |