Просмотр исходного кода

uci firewall - remove implicit creation of zones, based on network interfaces

SVN-Revision: 12281
John Crispin 17 лет назад
Родитель
Сommit
0f5cbca010
2 измененных файлов с 1 добавлено и 9 удалено
  1. 1 3
      package/firewall/files/new/20-firewall
  2. 0 6
      package/firewall/files/new/uci_firewall.sh

+ 1 - 3
package/firewall/files/new/20-firewall

@@ -20,9 +20,7 @@ load_zones() {
 
 
 config_foreach load_zones zone
 config_foreach load_zones zone
 
 
-IFACE=$(find_config $INTERFACE)
-[ -n "$IFACE" ] && 
-	list_contains ZONE $IFACE || ZONE="$ZONE $IFACE"
+[ -z "$ZONE" ] && exit 0
 
 
 [ ifup = "$ACTION" ] && {
 [ ifup = "$ACTION" ] && {
 	for z in $ZONE; do 
 	for z in $ZONE; do 

+ 0 - 6
package/firewall/files/new/uci_firewall.sh

@@ -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"