firewall: T2199: Add log prefix to match legacy perl behaviour

Example syslog: [FWNAME-default-D] ...

* Also clean-up firewall default-action

2 files changed, 4 insertions, 20 deletions

diff --git a/data/templates/firewall/nftables-policy.tmpl b/data/templates/firewall/nftables-policy.tmpl
index 484b6f203..905ffcd09 100644
--- a/data/templates/firewall/nftables-policy.tmpl
+++ b/data/templates/firewall/nftables-policy.tmpl
@@ -25,11 +25,7 @@ table ip mangle {
         {{ rule_conf | nft_rule(route_text, rule_id, 'ip') }}
 {%       endfor %}
 {%     endif %}
-{%     if conf.default_action is defined %}
-        counter {{ conf.default_action | nft_action }} comment "{{ name_text }} default-action {{ conf.default_action }}"
-{%     else %}
-        counter return
-{%     endif %}
+        {{ conf | nft_default_rule(route_text) }}
     }
 {%   endfor %}
 {%- endif %}
@@ -52,9 +48,7 @@ table ip6 mangle {
         {{ rule_conf | nft_rule(route_text, rule_id, 'ip6') }}
 {%       endfor %}
 {%     endif %}
-{%     if conf.default_action is defined %}
-        counter {{ conf.default_action | nft_action }} comment "{{ name_text }} default-action {{ conf.default_action }}"
-{%     endif %}
+        {{ conf | nft_default_rule(route_text) }}
     }
 {%   endfor %}
 {% endif %}
diff --git a/data/templates/firewall/nftables.tmpl b/data/templates/firewall/nftables.tmpl
index 81b2c0b98..33c821e84 100644
--- a/data/templates/firewall/nftables.tmpl
+++ b/data/templates/firewall/nftables.tmpl
@@ -32,18 +32,13 @@ table ip filter {
 {% endif %}
 {% if name is defined %}
 {%   for name_text, conf in name.items() %}
-{%     set default_log = 'log' if 'enable_default_log' in conf else '' %}
     chain {{ name_text }} {
 {%     if conf.rule is defined %}
 {%       for rule_id, rule_conf in conf.rule.items() if rule_conf.disable is not defined %}
         {{ rule_conf | nft_rule(name_text, rule_id) }}
 {%       endfor %}
 {%     endif %}
-{%     if conf.default_action is defined %}
-        counter {{ default_log }} {{ conf.default_action | nft_action }} comment "{{ name_text }} default-action {{ conf.default_action }}"
-{%     else %}
-        return
-{%     endif %}
+        {{ conf | nft_default_rule(name_text) }}
     }
 {%   endfor %}
 {% endif %}
@@ -87,18 +82,13 @@ table ip6 filter {
 {% endif %}
 {% if ipv6_name is defined %}
 {%   for name_text, conf in ipv6_name.items() %}
-{%     set default_log = 'log' if 'enable_default_log' in conf else '' %}
     chain {{ name_text }} {
 {%     if conf.rule is defined %}
 {%       for rule_id, rule_conf in conf.rule.items() if rule_conf.disable is not defined %}
         {{ rule_conf | nft_rule(name_text, rule_id, 'ip6') }}
 {%       endfor %}
 {%     endif %}
-{%     if conf.default_action is defined %}
-        counter {{ default_log }} {{ conf.default_action | nft_action }} comment "{{ name_text }} default-action {{ conf.default_action }}"
-{%     else %}
-        return
-{%     endif %}
+        {{ conf | nft_default_rule(name_text) }}
     }
 {%   endfor %}
 {% endif %}