diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2010-07-15 22:01:48 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2010-07-15 22:01:48 +0000 |
| commit | f8fa598bf461ccdbd0fc6ddb5a61561b9197fed9 (patch) | |
| tree | 95d659c7a91a27f078c3377ced629ccfb13965ff /package/firewall/files/lib/core_forwarding.sh | |
| parent | 1ca67cba7f84855f06b41541c21ff6ab8eaf5246 (diff) | |
| download | master-31e0f0ae-f8fa598bf461ccdbd0fc6ddb5a61561b9197fed9.tar.gz master-31e0f0ae-f8fa598bf461ccdbd0fc6ddb5a61561b9197fed9.tar.bz2 master-31e0f0ae-f8fa598bf461ccdbd0fc6ddb5a61561b9197fed9.zip | |
firewall: - notrack support was broken in multiple ways, fix it - also consider a zone conntracked if any redirect references it (#7196)
SVN-Revision: 22215
Diffstat (limited to 'package/firewall/files/lib/core_forwarding.sh')
| -rw-r--r-- | package/firewall/files/lib/core_forwarding.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/package/firewall/files/lib/core_forwarding.sh b/package/firewall/files/lib/core_forwarding.sh index 689e2628c2..b62e18a76e 100644 --- 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 |