KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix device duplication in firewall if the balancing of ifup and ifdown is broken

Browse source 
SVN-Revision: 12404
This commit is contained in:
John Crispin 2008-08-27 18:31:34 +00:00
parent 924d10d611
commit 9eaae4c61d
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
package/firewall/files/uci_firewall.sh
View file

@ -53,6 +53,10 @@ create_zone() {
} }
addif() { 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" logger "adding $1 to firewall zone $2"
$IPTABLES -A INPUT -i $1 -j zone_$2 $IPTABLES -A INPUT -i $1 -j zone_$2
$IPTABLES -I zone_$2_ACCEPT 1 -o $1 -j ACCEPT $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 zone_$2_nat 1 -t nat -o $1 -j MASQUERADE
$IPTABLES -I PREROUTING 1 -t nat -i $1 -j zone_$2_prerouting $IPTABLES -I PREROUTING 1 -t nat -i $1 -j zone_$2_prerouting
$IPTABLES -A FORWARD -i $1 -j zone_$2_forward $IPTABLES -A FORWARD -i $1 -j zone_$2_forward
uci_set_state firewall core "$2" "$1"
} }
delif() { delif() {
@ -78,6 +83,7 @@ delif() {
$IPTABLES -D zone_$2_nat -t nat -o $1 -j MASQUERADE $IPTABLES -D zone_$2_nat -t nat -o $1 -j MASQUERADE
$IPTABLES -D PREROUTING -t nat -i $1 -j zone_$2_prerouting $IPTABLES -D PREROUTING -t nat -i $1 -j zone_$2_prerouting
$IPTABLES -D FORWARD -i $1 -j zone_$2_forward $IPTABLES -D FORWARD -i $1 -j zone_$2_forward
uci_revert_state firewall core "$2"
} }
load_synflood() { load_synflood() {
@ -106,6 +112,9 @@ fw_defaults() {
do do
echo 0 > $f echo 0 > $f
done done
uci_revert_state firewall core
uci_set_state firewall core "" firewall_state
$IPTABLES -F $IPTABLES -F
$IPTABLES -t nat -F $IPTABLES -t nat -F
@ -306,8 +315,6 @@ fw_init() {
fw_custom_chains fw_custom_chains
echo "Loading includes" echo "Loading includes"
config_foreach fw_include include config_foreach fw_include include
uci_set_state firewall core "" firewall_state
uci_set_state firewall core loaded 1 uci_set_state firewall core loaded 1
unset CONFIG_APPEND unset CONFIG_APPEND
config_load network config_load network