[backfire] firewall: merge r28874

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

diff --git a/package/firewall/files/firewall.config b/package/firewall/files/firewall.config
old mode 100755 (executable)
new mode 100644 (file)
index e903519..d6a125d
--- a/package/firewall/files/firewall.config
+++ b/package/firewall/files/firewall.config
@@ -3,23 +3,92 @@ 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 src              lan
+       option dest             wan
+
+# We need to accept udp packets on port 68,
+# see https://dev.openwrt.org/ticket/4108
+config rule
+       option src              wan
+       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 DHCPv6 replies
+# see https://dev.openwrt.org/ticket/10381
+config rule
+       option src              wan
+       option proto            udp
+       option src_ip           fe80::/10
+       option src_port         547
+       option dest_ip          fe80::/10
+       option dest_port        546
+       option family           ipv6
+       option target           ACCEPT
+
+# Allow essential incoming IPv6 ICMP traffic
+config rule
+       option src              wan
+       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
+       list icmp_type          router-solicitation
+       list icmp_type          neighbour-solicitation
+       option limit            1000/sec
+       option family           ipv6
+       option target           ACCEPT
+
+# Allow essential forwarded 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
+       option path /etc/firewall.user
 
 
 ### EXAMPLE CONFIG SECTIONS
@@ -52,10 +121,6 @@ config forwarding
 #      option dest_port        80 
 #      option proto            tcp
 
-# include a file with users custom iptables rules
-#config include
-#      option path /etc/firewall.user
-
 
 ### FULL CONFIG SECTIONS
 #config rule