X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=package%2Ffirewall%2Ffiles%2Flib%2Fcore_forwarding.sh;h=c4a968143db6ad31836d007d2bd4498de10277d4;hb=a9977eca9145b9f061ceb1d1604f59efba1b2949;hp=689e2628c23968745815d93125b5226aaa418780;hpb=40ad9defcc545c2925f6c37d17a64707f17f5b78;p=openwrt%2F.git

diff --git a/package/firewall/files/lib/core_forwarding.sh b/package/firewall/files/lib/core_forwarding.sh
index 689e2628c2..c4a968143d 100644
--- a/package/firewall/files/lib/core_forwarding.sh
+++ b/package/firewall/files/lib/core_forwarding.sh
@@ -27,16 +27,17 @@ fw_load_forwarding() {
 		target=zone_${forwarding_dest}_ACCEPT
 	}
 
-	local mode=$(fw_get_family_mode ${forwarding_family:-x} ${forwarding_dest:-${forwarding_src:--}} i)
+	local mode
+	fw_get_family_mode mode ${forwarding_family:-x} ${forwarding_dest:-${forwarding_src:--}} i
 
 	fw add $mode f $chain $target ^
 
 	# propagate masq zone flag
-	[ -n "$forwarding_src" ] && list_contains CONNTRACK_ZONES $forwarding_src && {
-		append CONNTRACK_ZONES $forwarding_dest
+	[ -n "$forwarding_src" ] && list_contains FW_CONNTRACK_ZONES $forwarding_src && {
+		append FW_CONNTRACK_ZONES $forwarding_dest
 	}
-	[ -n "$forwarding_dest" ] && list_contains CONNTRACK_ZONES $forwarding_dest && {
-		append CONNTRACK_ZONES $forwarding_src
+	[ -n "$forwarding_dest" ] && list_contains FW_CONNTRACK_ZONES $forwarding_dest && {
+		append FW_CONNTRACK_ZONES $forwarding_src
 	}
 
 	fw_callback post forwarding