From 5986668ca9d41f7b6aee1c9890345853e157aa6b Mon Sep 17 00:00:00 2001
From: jow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Wed, 15 Sep 2010 01:53:36 +0000
Subject: [package] firewall: run ifdown hotplug events synchronized, fixes a
 racecondition on "ifup iface" when ifdown and ifup events are delivered with
 a small dealy

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@23064 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/firewall/Makefile               |  2 +-
 package/firewall/files/firewall.hotplug |  2 +-
 package/firewall/files/lib/core.sh      | 14 ++++++--------
 3 files changed, 8 insertions(+), 10 deletions(-)

(limited to 'package/firewall')

diff --git a/package/firewall/Makefile b/package/firewall/Makefile
index 205f2098c..8cf22e834 100644
--- a/package/firewall/Makefile
+++ b/package/firewall/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=firewall
 
 PKG_VERSION:=2
-PKG_RELEASE:=14
+PKG_RELEASE:=15
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/package/firewall/files/firewall.hotplug b/package/firewall/files/firewall.hotplug
index ac8469524..720b34cc8 100644
--- a/package/firewall/files/firewall.hotplug
+++ b/package/firewall/files/firewall.hotplug
@@ -17,6 +17,6 @@ case "$ACTION" in
 		fw_configure_interface "$INTERFACE" add "$DEVICE" &
 	;;
 	ifdown)
-		fw_configure_interface "$INTERFACE" del "$DEVICE" &
+		fw_configure_interface "$INTERFACE" del "$DEVICE"
 	;;
 esac
diff --git a/package/firewall/files/lib/core.sh b/package/firewall/files/lib/core.sh
index 2178e0505..c350e8f0f 100644
--- a/package/firewall/files/lib/core.sh
+++ b/package/firewall/files/lib/core.sh
@@ -58,16 +58,14 @@ fw_stop() {
 
 	fw_callback pre stop
 
-	local old_zones z
-	config_get old_zones core zones
-	for z in $old_zones; do
-		local old_networks n i
-		config_get old_networks core "${z}_networks"
-		for n in $old_networks; do
+	local z n i
+	config_get z core zones
+	for z in $z; do
+		config_get n core "${z}_networks"
+		for n in $n; do
 			config_get i core "${n}_ifname"
 			[ -n "$i" ] && env -i ACTION=remove ZONE="$z" \
-				INTERFACE="$n" DEVICE="$i" \
-				/sbin/hotplug-call firewall
+				INTERFACE="$n" DEVICE="$i" /sbin/hotplug-call firewall
 		done
 	done
 
-- 
cgit v1.2.3