[backfire] firewall: sync with trunk

[openwrt-10.03/.git] / package / firewall / files / firewall.config

diff --git a/package/firewall/files/firewall.config b/package/firewall/files/firewall.config
index 5a4b5af43657d3508e582b2bacea8893941d12c2..428c5a211c24870709a4c6ba14322f93ef724990 100644 (file)
--- a/package/firewall/files/firewall.config
+++ b/package/firewall/files/firewall.config
@@ -3,24 +3,28 @@ config defaults
        option input            ACCEPT
        option output           ACCEPT 
        option forward          REJECT
+# Uncomment this line to disable ipv6 rules
+#      option disable_ipv6     1
 
 config zone
        option name             lan
-       option input    ACCEPT 
-       option output   ACCEPT 
-       option forward  REJECT
+       option network          'lan'
+       option input            ACCEPT 
+       option output           ACCEPT 
+       option forward          REJECT
 
 config zone
        option name             wan
-       option input    REJECT
-       option output   ACCEPT 
-       option forward  REJECT
+       option network          'wan'
+       option input            REJECT
+       option output           ACCEPT 
+       option forward          REJECT
        option masq             1 
+       option mtu_fix          1
 
 config forwarding 
-       option src      lan
-       option dest     wan
-       option mtu_fix  1
+       option src              lan
+       option dest             wan
 
 # We need to accept udp packets on port 68,
 # see https://dev.openwrt.org/ticket/4108
@@ -29,6 +33,30 @@ config rule
        option proto            udp
        option dest_port        68
        option target           ACCEPT
+       option family           ipv4
+
+# Allow IPv4 ping
+config rule
+       option src              wan
+       option proto            icmp
+       option icmp_type        echo-request
+       option family           ipv4
+       option target           ACCEPT
+
+# Allow essential incoming IPv6 ICMP traffic
+config rule                                   
+       option src              wan
+       option dest             *
+       option proto            icmp
+       list icmp_type          echo-request
+       list icmp_type          destination-unreachable
+       list icmp_type          packet-too-big
+       list icmp_type          time-exceeded
+       list icmp_type          bad-header
+       list icmp_type          unknown-header-type
+       option limit            1000/sec
+       option family           ipv6
+       option target           ACCEPT
 
 # include a file with users custom iptables rules
 config include