RepoMirrors
/
openwrt
mirror of git://git.openwrt.org/openwrt/openwrt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

firewall: run ifdown hotplug events synchronized, fixes a racecondition on "ifup iface" when ifdown and ifup events are delivered with a small dealy 

SVN-Revision: 23064
This commit is contained in:
Jo-Philipp Wich 2010-09-15 01:53:36 +00:00
parent 1fe50da4bb
commit 7557011cb1
3 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/firewall/Makefile
View File

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=firewall PKG_NAME:=firewall
PKG_VERSION:=2 PKG_VERSION:=2
PKG_RELEASE:=14 PKG_RELEASE:=15
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk

2
package/firewall/files/firewall.hotplug
View File

@ -17,6 +17,6 @@ case "$ACTION" in
fw_configure_interface "$INTERFACE" add "$DEVICE" & fw_configure_interface "$INTERFACE" add "$DEVICE" &
;; ;;
ifdown) ifdown)
fw_configure_interface "$INTERFACE" del "$DEVICE" & fw_configure_interface "$INTERFACE" del "$DEVICE"
;; ;;
esac esac

14
package/firewall/files/lib/core.sh
View File

@ -58,16 +58,14 @@ fw_stop() {
fw_callback pre stop fw_callback pre stop
local old_zones z local z n i
config_get old_zones core zones config_get z core zones
for z in $old_zones; do for z in $z; do
local old_networks n i config_get n core "${z}_networks"
config_get old_networks core "${z}_networks" for n in $n; do
for n in $old_networks; do
config_get i core "${n}_ifname" config_get i core "${n}_ifname"
[ -n "$i" ] && env -i ACTION=remove ZONE="$z" \ [ -n "$i" ] && env -i ACTION=remove ZONE="$z" \
INTERFACE="$n" DEVICE="$i" \ INTERFACE="$n" DEVICE="$i" /sbin/hotplug-call firewall
/sbin/hotplug-call firewall
done done
done done