From: Jo-Philipp Wich <jo@mein.io>
Date: Fri, 28 Jan 2022 11:06:16 +0000 (+0100)
Subject: ruleset: fix undeclared variable access uncovered by strict mode
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=3ee6a5c54d5c32a635870fae402420d8c653476c;p=project%2Ffirewall4.git

ruleset: fix undeclared variable access uncovered by strict mode

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
---

diff --git a/root/usr/share/firewall4/templates/ruleset.uc b/root/usr/share/firewall4/templates/ruleset.uc
index e9692d7..004cfca 100644
--- a/root/usr/share/firewall4/templates/ruleset.uc
+++ b/root/usr/share/firewall4/templates/ruleset.uc
@@ -274,7 +274,7 @@ table inet fw4 {
 {%     if (rule.devices_neg || rule.subnets_neg || devices_pos || subnets_pos): %}
 		{%+ if (rule.family): -%}
 			meta nfproto {{ fw4.nfproto(rule.family) }} {%+ endif -%}
-		{%+ include("zone-match.uc", { fw4, rule: { ...rule, devices_pos, subnets_pos } }) -%}
+		{%+ include("zone-match.uc", { fw4, egress: false, rule: { ...rule, devices_pos, subnets_pos } }) -%}
 		jump {{ target }}_{{ zone.name }} comment "!fw4: {{ zone.name }} {{ fw4.nfproto(rule.family, true) }} {{
 			(target == "helper") ? "CT helper assignment" : "CT bypass"
 		}}"
@@ -296,7 +296,7 @@ table inet fw4 {
 {%     if (devices_pos || subnets_pos): %}
 		{%+ if (rule.family): -%}
 			meta nfproto {{ fw4.nfproto(rule.family) }} {%+ endif -%}
-		{%+ include("zone-match.uc", { fw4, rule: { ...rule, devices_pos, subnets_pos } }) -%}
+		{%+ include("zone-match.uc", { fw4, egress: false, rule: { ...rule, devices_pos, subnets_pos } }) -%}
 		jump {{ target }}_{{ zone.name }} comment "!fw4: {{ zone.name }} {{ fw4.nfproto(rule.family, true) }} {{
 			(target == "helper") ? "CT helper assignment" : "CT bypass"
 		}}"