diff options
| author | Nicolas Fort <nicolasfort1988@gmail.com> | 2023-11-24 10:24:48 +0000 |
|---|---|---|
| committer | Bjarke Istrup Pedersen <gurli@gurlinet.dk> | 2023-12-15 21:28:51 +0100 |
| commit | fcedc85e2b4d3d6663b0c78c3fb3bd93db91fcc2 (patch) | |
| tree | 18e4f1b706e2ada437e97c861d85b4575ebd1097 /data/templates/firewall/nftables-zone.j2 | |
| parent | af2668c4479377063c2e65e2383648155fb1e8f4 (diff) | |
| download | vyos-1x-fcedc85e2b4d3d6663b0c78c3fb3bd93db91fcc2.tar.gz vyos-1x-fcedc85e2b4d3d6663b0c78c3fb3bd93db91fcc2.zip | |
T5775: firewall: re-add state-policy to firewall. These commands are now included in <set firewall global-options state-policy> node.
Diffstat (limited to 'data/templates/firewall/nftables-zone.j2')
| -rw-r--r-- | data/templates/firewall/nftables-zone.j2 | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/data/templates/firewall/nftables-zone.j2 b/data/templates/firewall/nftables-zone.j2 index ee468c6c1..298e6750e 100644 --- a/data/templates/firewall/nftables-zone.j2 +++ b/data/templates/firewall/nftables-zone.j2 @@ -1,8 +1,24 @@ +<<<<<<< HEAD {% macro zone_chains(zone, ipv6=False) %} {% set fw_name = 'ipv6_name' if ipv6 else 'name' %} {% set suffix = '6' if ipv6 else '' %} +======= + +{% macro zone_chains(zone, family, state_policy=False) %} +{% if family == 'ipv6' %} +{% set fw_name = 'ipv6_name' %} +{% set suffix = '6' %} +{% else %} +{% set fw_name = 'name' %} +{% set suffix = '' %} +{% endif %} + +>>>>>>> 64ee13cf9 (T5775: firewall: re-add state-policy to firewall. These commands are now included in <set firewall global-options state-policy> node.) chain VYOS_ZONE_FORWARD { type filter hook forward priority 1; policy accept; +{% if state_policy %} + jump VYOS_STATE_POLICY{{ suffix }} +{% endif %} {% for zone_name, zone_conf in zone.items() %} {% if 'local_zone' not in zone_conf %} oifname { {{ zone_conf.interface | join(',') }} } counter jump VZONE_{{ zone_name }} @@ -11,6 +27,9 @@ } chain VYOS_ZONE_LOCAL { type filter hook input priority 1; policy accept; +{% if state_policy %} + jump VYOS_STATE_POLICY{{ suffix }} +{% endif %} {% for zone_name, zone_conf in zone.items() %} {% if 'local_zone' in zone_conf %} counter jump VZONE_{{ zone_name }}_IN @@ -19,6 +38,9 @@ } chain VYOS_ZONE_OUTPUT { type filter hook output priority 1; policy accept; +{% if state_policy %} + jump VYOS_STATE_POLICY{{ suffix }} +{% endif %} {% for zone_name, zone_conf in zone.items() %} {% if 'local_zone' in zone_conf %} counter jump VZONE_{{ zone_name }}_OUT |