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

[openwrt/staging/jogo.git] / package / firewall / files / lib / core_init.sh

diff --git a/package/firewall/files/lib/core_init.sh b/package/firewall/files/lib/core_init.sh
index 92d117160f6291ba9c0bdf977f2eb80072d38ea1..a55ace17c1405a78070a4d85b5928ec1e5df8ba4 100644 (file)
--- a/package/firewall/files/lib/core_init.sh
+++ b/package/firewall/files/lib/core_init.sh
@@ -228,13 +228,12 @@ fw_load_zone() {
 }
 
 fw_load_notrack_zone() {
-       list_contains FW_CONNTRACK_ZONES "$1" && return
-
        fw_config_get_zone "$1"
+       list_contains FW_CONNTRACK_ZONES "${zone_name}" && return
 
        fw_callback pre notrack
 
-       fw add i f zone_${zone_name}_notrack NOTRACK $
+       fw add i r zone_${zone_name}_notrack NOTRACK $
 
        fw_callback post notrack
 }