uci firewall - remove implicit creation of zones, based on network interfaces
SVN-Revision: 12281
This commit is contained in:
		| @@ -20,9 +20,7 @@ load_zones() { | |||||||
|  |  | ||||||
| config_foreach load_zones zone | config_foreach load_zones zone | ||||||
|  |  | ||||||
| IFACE=$(find_config $INTERFACE) | [ -z "$ZONE" ] && exit 0 | ||||||
| [ -n "$IFACE" ] &&  |  | ||||||
| 	list_contains ZONE $IFACE || ZONE="$ZONE $IFACE" |  | ||||||
|  |  | ||||||
| [ ifup = "$ACTION" ] && { | [ ifup = "$ACTION" ] && { | ||||||
| 	for z in $ZONE; do  | 	for z in $ZONE; do  | ||||||
|   | |||||||
| @@ -91,10 +91,6 @@ load_synflood() { | |||||||
| 	$IPTABLES -A INPUT -p tcp --syn -j SYN_FLOOD | 	$IPTABLES -A INPUT -p tcp --syn -j SYN_FLOOD | ||||||
| } | } | ||||||
|  |  | ||||||
| create_network_zone() { |  | ||||||
| 	create_zone "$1" "$1" |  | ||||||
| } |  | ||||||
|  |  | ||||||
| fw_defaults() { | fw_defaults() { | ||||||
| 	load_policy $1 | 	load_policy $1 | ||||||
| 	DEF_INPUT=$input | 	DEF_INPUT=$input | ||||||
| @@ -261,8 +257,6 @@ fw_init() { | |||||||
| 	config_foreach fw_defaults defaults | 	config_foreach fw_defaults defaults | ||||||
| 	echo "Loading zones" | 	echo "Loading zones" | ||||||
| 	config_foreach fw_zone zone | 	config_foreach fw_zone zone | ||||||
| 	echo "Loading interfaces" |  | ||||||
| 	config_foreach create_network_zone interface |  | ||||||
| 	echo "Loading rules" | 	echo "Loading rules" | ||||||
| 	config_foreach fw_rule rule | 	config_foreach fw_rule rule | ||||||
| 	echo "Loading forwarding" | 	echo "Loading forwarding" | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user
	 John Crispin
					John Crispin