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:
parent
1fe50da4bb
commit
7557011cb1
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
Loading…
Reference in New Issue