From ab4dd3b7a65d10a936071ee1bf0c5c2c884bb1f5 Mon Sep 17 00:00:00 2001
From: sarthurdev <965089+sarthurdev@users.noreply.github.com>
Date: Sun, 16 Jan 2022 22:38:43 +0100
Subject: zone-policy: T3873: Fix intra-zone-filtering return to zone
 default-action

---
 data/templates/zone_policy/nftables.tmpl | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'data/templates/zone_policy/nftables.tmpl')

diff --git a/data/templates/zone_policy/nftables.tmpl b/data/templates/zone_policy/nftables.tmpl
index fae6e8c4f..e59208a0d 100644
--- a/data/templates/zone_policy/nftables.tmpl
+++ b/data/templates/zone_policy/nftables.tmpl
@@ -29,6 +29,9 @@ table ip filter {
 {%     else %}
     chain VZONE_{{ zone_name }} {
         iifname { {{ zone_conf.interface | join(",") }} } counter {{ zone_conf | nft_intra_zone_action(ipv6=False) }}
+{%       if zone_conf.intra_zone_filtering is defined %}
+        iifname { {{ zone_conf.interface | join(",") }} } counter return
+{%       endif %}
 {%       for from_zone, from_conf in zone_conf.from.items() if from_conf.firewall.name is defined %}
 {%         if zone[from_zone].local_zone is not defined %}
         iifname { {{ zone[from_zone].interface | join(",") }} } counter jump {{ from_conf.firewall.name }}
@@ -63,6 +66,9 @@ table ip6 filter {
 {%     else %}
     chain VZONE6_{{ zone_name }} {
         iifname { {{ zone_conf.interface | join(",") }} } counter {{ zone_conf | nft_intra_zone_action(ipv6=True) }}
+{%       if zone_conf.intra_zone_filtering is defined %}
+        iifname { {{ zone_conf.interface | join(",") }} } counter return
+{%       endif %}
 {%       for from_zone, from_conf in zone_conf.from.items() if from_conf.firewall.ipv6_name is defined %}
 {%         if zone[from_zone].local_zone is not defined %}
         iifname { {{ zone[from_zone].interface | join(",") }} } counter jump {{ from_conf.firewall.ipv6_name }}
-- 
cgit v1.2.3