[package] firewall: run ifdown hotplug events synchronized, fixes a racecondition...
authorJo-Philipp Wich <jow@openwrt.org>
Wed, 15 Sep 2010 01:53:36 +0000 (01:53 +0000)
committerJo-Philipp Wich <jow@openwrt.org>
Wed, 15 Sep 2010 01:53:36 +0000 (01:53 +0000)
SVN-Revision: 23064

package/firewall/Makefile
package/firewall/files/firewall.hotplug
package/firewall/files/lib/core.sh

index 205f209..8cf22e8 100644 (file)
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=firewall
 
 PKG_VERSION:=2
 PKG_NAME:=firewall
 
 PKG_VERSION:=2
-PKG_RELEASE:=14
+PKG_RELEASE:=15
 
 include $(INCLUDE_DIR)/package.mk
 
 
 include $(INCLUDE_DIR)/package.mk
 
index ac84695..720b34c 100644 (file)
@@ -17,6 +17,6 @@ case "$ACTION" in
                fw_configure_interface "$INTERFACE" add "$DEVICE" &
        ;;
        ifdown)
                fw_configure_interface "$INTERFACE" add "$DEVICE" &
        ;;
        ifdown)
-               fw_configure_interface "$INTERFACE" del "$DEVICE" &
+               fw_configure_interface "$INTERFACE" del "$DEVICE"
        ;;
 esac
        ;;
 esac
index 2178e05..c350e8f 100644 (file)
@@ -58,16 +58,14 @@ fw_stop() {
 
        fw_callback pre 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" \
                        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
 
                done
        done