ruleset: ensure that family-agnostic ICMP rules cover ICMPv6 as well

[project/firewall4.git] / root / usr / share / firewall4 / templates / rule.uc

diff --git a/root/usr/share/firewall4/templates/rule.uc b/root/usr/share/firewall4/templates/rule.uc
index 417bef7d2d995fd9ac124f2d29525448bbfcd015..d90595d647b60d96c2801214ce52184751c60145 100644 (file)
--- a/root/usr/share/firewall4/templates/rule.uc
+++ b/root/usr/share/firewall4/templates/rule.uc
@@ -1,9 +1,7 @@
 {%+ if (rule.family && !rule.has_addrs): -%}
        meta nfproto {{ fw4.nfproto(rule.family) }} {%+ endif -%}
 {%+ if (!rule.proto.any && !rule.has_ports && !rule.icmp_types && !rule.icmp_codes): -%}
-       meta l4proto {{
-               (rule.proto.name == 'icmp' && rule.family == 6) ? 'ipv6-icmp' : rule.proto.name
-       }} {%+ endif -%}
+       meta l4proto {{ fw4.l4proto(rule.family, rule.proto) }} {%+ endif -%}
 {%+ if (rule.iifnames): -%}
        iifname {{ fw4.set(rule.iifnames) }} {%+ endif -%}
 {%+ if (rule.oifnames): -%}