firewall: - notrack support was broken in multiple ways, fix it - also consider a...

[openwrt/.git] / package / firewall / files / lib / core_forwarding.sh

diff --git a/package/firewall/files/lib/core_forwarding.sh b/package/firewall/files/lib/core_forwarding.sh
index 689e2628c23968745815d93125b5226aaa418780..b62e18a76ef5a980049009d08f3302852fec3154 100644 (file)
--- a/package/firewall/files/lib/core_forwarding.sh
+++ b/package/firewall/files/lib/core_forwarding.sh
@@ -32,11 +32,11 @@ fw_load_forwarding() {
        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