aboutsummaryrefslogtreecommitdiffstats
path: root/package/firewall
diff options
context:
space:
mode:
authorJohn Crispin <john@openwrt.org>2008-08-27 18:31:34 +0000
committerJohn Crispin <john@openwrt.org>2008-08-27 18:31:34 +0000
commit9eaae4c61d7f33649b5503b67ac680d94621f326 (patch)
tree07cd4eb5f71ddb4d0c6bbe1057c84109826bc93f /package/firewall
parent924d10d611528002b3c9ed904bfcda9958f208b0 (diff)
downloadupstream-9eaae4c61d7f33649b5503b67ac680d94621f326.tar.gz
upstream-9eaae4c61d7f33649b5503b67ac680d94621f326.tar.bz2
upstream-9eaae4c61d7f33649b5503b67ac680d94621f326.zip
fix device duplication in firewall if the balancing of ifup and ifdown is broken
SVN-Revision: 12404
Diffstat (limited to 'package/firewall')
-rwxr-xr-xpackage/firewall/files/uci_firewall.sh11
1 files changed, 9 insertions, 2 deletions
diff --git a/package/firewall/files/uci_firewall.sh b/package/firewall/files/uci_firewall.sh
index 5063d9e088..925ab4eb4b 100755
--- a/package/firewall/files/uci_firewall.sh
+++ b/package/firewall/files/uci_firewall.sh
@@ -53,6 +53,10 @@ create_zone() {
}
addif() {
+ local dev
+ config_get dev core $2
+ [ -n "$dev" -a "$dev" != "$1" ] && delif "$dev" "$2"
+ [ -n "$dev" -a "$dev" == "$1" ] && return
logger "adding $1 to firewall zone $2"
$IPTABLES -A INPUT -i $1 -j zone_$2
$IPTABLES -I zone_$2_ACCEPT 1 -o $1 -j ACCEPT
@@ -64,6 +68,7 @@ addif() {
$IPTABLES -I zone_$2_nat 1 -t nat -o $1 -j MASQUERADE
$IPTABLES -I PREROUTING 1 -t nat -i $1 -j zone_$2_prerouting
$IPTABLES -A FORWARD -i $1 -j zone_$2_forward
+ uci_set_state firewall core "$2" "$1"
}
delif() {
@@ -78,6 +83,7 @@ delif() {
$IPTABLES -D zone_$2_nat -t nat -o $1 -j MASQUERADE
$IPTABLES -D PREROUTING -t nat -i $1 -j zone_$2_prerouting
$IPTABLES -D FORWARD -i $1 -j zone_$2_forward
+ uci_revert_state firewall core "$2"
}
load_synflood() {
@@ -106,6 +112,9 @@ fw_defaults() {
do
echo 0 > $f
done
+
+ uci_revert_state firewall core
+ uci_set_state firewall core "" firewall_state
$IPTABLES -F
$IPTABLES -t nat -F
@@ -306,8 +315,6 @@ fw_init() {
fw_custom_chains
echo "Loading includes"
config_foreach fw_include include
-
- uci_set_state firewall core "" firewall_state
uci_set_state firewall core loaded 1
unset CONFIG_APPEND
config_load network