diff options
| author | Christian Poessinger <christian@poessinger.com> | 2022-04-26 05:06:49 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-26 05:06:49 +0200 |
| commit | 8c5da8889cc2c2bb31765545e2c60c3f403d85d5 (patch) | |
| tree | 02b2105b361366fa79d2bc5656624ed4735cc946 /data | |
| parent | 4633e5786b7710ba879f610c3371aaa868686d43 (diff) | |
| parent | 825242cfd064d08f7980a577815adbfd251bb361 (diff) | |
| download | vyos-1x-8c5da8889cc2c2bb31765545e2c60c3f403d85d5.tar.gz vyos-1x-8c5da8889cc2c2bb31765545e2c60c3f403d85d5.zip | |
Merge pull request #1300 from sever-sever/T4210
nat: T4210: Fix template for negated ports
Diffstat (limited to 'data')
| -rw-r--r-- | data/templates/firewall/nftables-nat.tmpl | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/data/templates/firewall/nftables-nat.tmpl b/data/templates/firewall/nftables-nat.tmpl index 7a925b264..63aa48c77 100644 --- a/data/templates/firewall/nftables-nat.tmpl +++ b/data/templates/firewall/nftables-nat.tmpl @@ -6,14 +6,14 @@ {% set src_addr = 'ip saddr ' ~ config.source.address.replace('!','!= ') if config.source.address is vyos_defined %} {% set dst_addr = 'ip daddr ' ~ config.destination.address.replace('!','!= ') if config.destination.address is vyos_defined %} {# negated port groups need special treatment, move != in front of { } group #} -{% if config.source.port is vyos_defined and config.source.port.startswith('!=') %} -{% set src_port = 'sport != { ' ~ config.source.port.replace('!=','') ~ ' }' %} +{% if config.source.port is vyos_defined and config.source.port.startswith('!') %} +{% set src_port = 'sport != { ' ~ config.source.port.replace('!','') ~ ' }' %} {% else %} {% set src_port = 'sport { ' ~ config.source.port ~ ' }' if config.source.port is vyos_defined %} {% endif %} {# negated port groups need special treatment, move != in front of { } group #} -{% if config.destination.port is vyos_defined and config.destination.port.startswith('!=') %} -{% set dst_port = 'dport != { ' ~ config.destination.port.replace('!=','') ~ ' }' %} +{% if config.destination.port is vyos_defined and config.destination.port.startswith('!') %} +{% set dst_port = 'dport != { ' ~ config.destination.port.replace('!','') ~ ' }' %} {% else %} {% set dst_port = 'dport { ' ~ config.destination.port ~ ' }' if config.destination.port is vyos_defined %} {% endif %} |