From 799b385074fd51a55845aa451a59b6b6e78ff085 Mon Sep 17 00:00:00 2001
From: jow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Tue, 20 Dec 2011 01:12:04 +0000
Subject: [PATCH] [backfire] firewall: merge r29577

git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@29578 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/firewall/Makefile              | 2 +-
 package/firewall/files/firewall.config | 5 +++++
 package/firewall/files/lib/config.sh   | 6 +++++-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/package/firewall/Makefile b/package/firewall/Makefile
index 5feba5638..5b8711428 100644
--- a/package/firewall/Makefile
+++ b/package/firewall/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=firewall
 
 PKG_VERSION:=2
-PKG_RELEASE:=34.7
+PKG_RELEASE:=34.8
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/package/firewall/files/firewall.config b/package/firewall/files/firewall.config
index d6a125d49..ed2682994 100644
--- a/package/firewall/files/firewall.config
+++ b/package/firewall/files/firewall.config
@@ -29,6 +29,7 @@ config forwarding
 # We need to accept udp packets on port 68,
 # see https://dev.openwrt.org/ticket/4108
 config rule
+	option name		Allow-DHCP-Renew
 	option src		wan
 	option proto		udp
 	option dest_port	68
@@ -37,6 +38,7 @@ config rule
 
 # Allow IPv4 ping
 config rule
+	option name		Allow-Ping
 	option src		wan
 	option proto		icmp
 	option icmp_type	echo-request
@@ -46,6 +48,7 @@ config rule
 # Allow DHCPv6 replies
 # see https://dev.openwrt.org/ticket/10381
 config rule
+	option name		Allow-DHCPv6
 	option src		wan
 	option proto		udp
 	option src_ip		fe80::/10
@@ -57,6 +60,7 @@ config rule
 
 # Allow essential incoming IPv6 ICMP traffic
 config rule
+	option name		Allow-ICMPv6-Input
 	option src		wan
 	option proto	icmp
 	list icmp_type		echo-request
@@ -73,6 +77,7 @@ config rule
 
 # Allow essential forwarded IPv6 ICMP traffic
 config rule                                   
+	option name		Allow-ICMPv6-Forward
 	option src		wan
 	option dest		*
 	option proto		icmp
diff --git a/package/firewall/files/lib/config.sh b/package/firewall/files/lib/config.sh
index 996cef884..8b2399fc8 100644
--- a/package/firewall/files/lib/config.sh
+++ b/package/firewall/files/lib/config.sh
@@ -34,7 +34,11 @@ fw_config_get_section() { # <config> <prefix> <type> <name> <default> ...
 		export ${NO_EXPORT:+-n} -- "${prefix}NAME"="${config}"
 		config_get "${prefix}TYPE" "$config" TYPE
 	}
-	
+
+	local enabled
+	config_get_bool enabled "$config" enabled 1
+	[ $enabled -eq 1 ] || return 1
+
 	[ "$1" == '{' ] && shift
 	while [ $# -ge 3 ]; do
 		local type=$1
-- 
2.35.1