ruleset: fix emitting set_mark/set_xmark rules with masks

[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 d2c31b14010c9bc5761d822018712aeb2a180e65..439d0fc6d59e1741469b6c41406833d6e489c306 100644 (file)
--- a/root/usr/share/firewall4/templates/rule.uc
+++ b/root/usr/share/firewall4/templates/rule.uc
@@ -78,12 +78,12 @@
                (rule.set_xmark.mask == 0xFFFFFFFF)
                        ? fw4.hex(rule.set_xmark.mark)
                        : (rule.set_xmark.mark == 0)
-                               ? 'mark and ' + fw4.hex(~rule.set_xmark.mask & 0xFFFFFFFF)
+                               ? `mark and ${fw4.hex(~rule.set_xmark.mask & 0xFFFFFFFF)}`
                                : (rule.set_xmark.mark == rule.set_xmark.mask)
-                                       ? 'mark or ' + fw4.hex(rule.set_xmark.mark)
+                                       ? `mark or ${fw4.hex(rule.set_xmark.mark)}`
                                        : (rule.set_xmark.mask == 0)
-                                               ? 'mark xor ' + fw4.hex(rule.set_xmark.mark)
-                                               : 'mark and ' + fw4.hex(~r.set_xmark.mask & 0xFFFFFFFF) + ' xor ' + fw4.hex(r.set_xmark.mark)
+                                               ? `mark xor ${fw4.hex(rule.set_xmark.mark)}`
+                                               : `mark and ${fw4.hex(~rule.set_xmark.mask & 0xFFFFFFFF)} xor ${fw4.hex(rule.set_xmark.mark)}`
        }} {%+
    elif (rule.target == "dscp"): -%}
        {{ fw4.ipproto(rule.family) }} dscp set {{ fw4.hex(rule.set_dscp.dscp) }} {%+