diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2010-09-14 23:11:12 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2010-09-14 23:11:12 +0000 |
| commit | 016f54cd4f5a48c2b895326de2a04509fc0115d6 (patch) | |
| tree | b135139dc32ba513810092a23b2400ec94ac98c6 /package/firewall/files/lib/core_interface.sh | |
| parent | 0b61462b10f5aa36bef8de62341c762e9e29d928 (diff) | |
| download | master-187ad058-016f54cd4f5a48c2b895326de2a04509fc0115d6.tar.gz master-187ad058-016f54cd4f5a48c2b895326de2a04509fc0115d6.tar.bz2 master-187ad058-016f54cd4f5a48c2b895326de2a04509fc0115d6.zip | |
[package] firewall: deliver remove hotplug events for all active zones/networks when restarting the firewall
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@23062 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/firewall/files/lib/core_interface.sh')
| -rw-r--r-- | package/firewall/files/lib/core_interface.sh | 29 |
1 files changed, 27 insertions, 2 deletions
diff --git a/package/firewall/files/lib/core_interface.sh b/package/firewall/files/lib/core_interface.sh index 889dcc9047..1a33cde1ec 100644 --- a/package/firewall/files/lib/core_interface.sh +++ b/package/firewall/files/lib/core_interface.sh @@ -1,5 +1,24 @@ # Copyright (C) 2009-2010 OpenWrt.org +fw__uci_state_add() { + local var="$1" + local item="$2" + + local val="$(uci_get_state firewall core $var)" + uci_set_state firewall core $var "${val:+$val }$item" +} + +fw__uci_state_del() { + local var="$1" + local item="$2" + + local val=" $(uci_get_state firewall core $var) " + val="${val// $item / }" + val="${val# }" + val="${val% }" + uci_set_state firewall core $var "$val" +} + fw_configure_interface() { local iface=$1 local action=$2 @@ -83,7 +102,10 @@ fw_configure_interface() { fw__do_rules del $z $old_ifname $n done - [ -n "$old_subnets" ] || ACTION=remove ZONE="$z" INTERFACE="$iface" DEVICE="$ifname" /sbin/hotplug-call firewall + [ -n "$old_subnets" ] || { + fw__uci_state_del "${z}_networks" "$iface" + env -i ACTION=remove ZONE="$z" INTERFACE="$iface" DEVICE="$ifname" /sbin/hotplug-call firewall + } done local old_aliases @@ -139,7 +161,10 @@ fw_configure_interface() { fw__do_rules add ${zone_name} "$ifname" "$aliasnet" append new_zones $zone_name - [ -n "$aliasnet" ] || ACTION=add ZONE="$zone_name" INTERFACE="$iface" DEVICE="$ifname" /sbin/hotplug-call firewall + [ -n "$aliasnet" ] || { + fw__uci_state_add "${zone_name}_networks" "${zone_network}" + env -i ACTION=add ZONE="$zone_name" INTERFACE="$iface" DEVICE="$ifname" /sbin/hotplug-call firewall + } } config_foreach load_zone zone |