diff options
| author | Jo-Philipp Wich | 2021-03-31 19:05:11 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich | 2021-03-31 19:20:48 +0000 |
| commit | 694d428d0513bf9d7d09c7b21d4e43fedac7ddbe (patch) | |
| tree | 5662c419a4d21ea545ce2674d297f265b6de9fc6 | |
| parent | 7f69fbb207212f7699979ecabeaaad0bcb892afa (diff) | |
| download | firewall4-694d428d0513bf9d7d09c7b21d4e43fedac7ddbe.tar.gz | |
rule.uc: fix redundant whitespace in rules without target
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
| -rw-r--r-- | root/usr/share/firewall4/templates/rule.uc | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/root/usr/share/firewall4/templates/rule.uc b/root/usr/share/firewall4/templates/rule.uc index 1f01d5f..0aae480 100644 --- a/root/usr/share/firewall4/templates/rule.uc +++ b/root/usr/share/firewall4/templates/rule.uc @@ -65,7 +65,7 @@ counter {%+ endif -%} {%+ if (rule.log): -%} log prefix {{ fw4.quote(rule.log, true) }} {%+ endif -%} -{% if (rule.target == "mark"): -%} +{%+ if (rule.target == "mark"): -%} meta mark set {{ (rule.set_xmark.mask == 0xFFFFFFFF) ? fw4.hex(rule.set_xmark.mark) @@ -76,15 +76,16 @@ : (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) - }} -{%- elif (rule.target == "dscp"): -%} - {{ fw4.ipproto(rule.family) }} dscp set {{ fw4.hex(rule.set_dscp.dscp) }} -{%- elif (rule.target == "notrack"): -%} - notrack -{%- elif (rule.target == "helper"): -%} - ct helper set {{ fw4.quote(rule.set_helper.name, true) }} -{%- elif (rule.jump_chain): -%} - jump {{ rule.jump_chain }} -{%- else -%} - {{ rule.target }} -{%- endif %} comment {{ fw4.quote("!fw4: " + rule.name, true) }} + }} {%+ + elif (rule.target == "dscp"): -%} + {{ fw4.ipproto(rule.family) }} dscp set {{ fw4.hex(rule.set_dscp.dscp) }} {%+ + elif (rule.target == "notrack"): -%} + notrack {%+ + elif (rule.target == "helper"): -%} + ct helper set {{ fw4.quote(rule.set_helper.name, true) }} {%+ + elif (rule.jump_chain): -%} + jump {{ rule.jump_chain }} {%+ + elif (rule.target): -%} + {{ rule.target }} {%+ + endif -%} +comment {{ fw4.quote("!fw4: " + rule.name, true) }} |