Merge branch 'next' of ssh://arne_f@ipfire.org/pub/git/ipfire-2.x into next

[ipfire-2.x.git] / src / initscripts / init.d / firewall

diff --git a/src/initscripts/init.d/firewall b/src/initscripts/init.d/firewall
index 1f400ad47837ae2048c54ba87c3ae7b90dbcf548..bc511832dfcf13ae0a2b15072f37adddabd31666 100644 (file)
--- a/src/initscripts/init.d/firewall
+++ b/src/initscripts/init.d/firewall
@@ -132,7 +132,7 @@ case "$1" in
        # original do nothing line
        #/sbin/iptables -A INPUT -p tcp -m tcp --tcp-flags SYN,RST,ACK SYN -m limit --limit 10/sec
        # the correct one, but the negative '!' do nothing...
-       #/sbin/iptables -A INPUT -p tcp -m tcp --tcp-flags SYN,RST,ACK SYN -m limit ! --limit 10/sec -j DROP
+       #/sbin/iptables -A INPUT -p tcp -m tcp --tcp-flags SYN,RST,ACK SYN ! -m limit --limit 10/sec -j DROP
 
        # Fix for braindead ISP's
        /sbin/iptables -A FORWARD -p tcp --tcp-flags SYN,RST SYN -j TCPMSS --clamp-mss-to-pmtu
@@ -151,6 +151,12 @@ case "$1" in
        /sbin/iptables -t nat -N CUSTOMPOSTROUTING
        /sbin/iptables -t nat -A POSTROUTING -j CUSTOMPOSTROUTING
 
+       # IPTV chains for IGMPPROXY
+       /sbin/iptables -N IPTVINPUT
+       /sbin/iptables -A INPUT -j IPTVINPUT
+       /sbin/iptables -N IPTVFORWARD
+       /sbin/iptables -A FORWARD -j IPTVFORWARD
+
        # filtering from GUI
        /sbin/iptables -N GUIINPUT
        /sbin/iptables -A INPUT -j GUIINPUT
@@ -167,8 +173,8 @@ case "$1" in
        /sbin/iptables -A INPUT -j OPENSSLVIRTUAL -m comment --comment "OPENSSLVIRTUAL INPUT"
        /sbin/iptables -A FORWARD -j IPSECVIRTUAL -m comment --comment "IPSECVIRTUAL FORWARD"
        /sbin/iptables -A FORWARD -j OPENSSLVIRTUAL -m comment --comment "OPENSSLVIRTUAL FORWARD"
-       /sbin/iptables -t nat -N IPSECPOSTROUTING
-       /sbin/iptables -t nat -A POSTROUTING -j IPSECPOSTROUTING
+       /sbin/iptables -t nat -N IPSECNAT
+       /sbin/iptables -t nat -A POSTROUTING -j IPSECNAT
 
        # Outgoing Firewall
        /sbin/iptables -A FORWARD -j OUTGOINGFW
@@ -180,7 +186,7 @@ case "$1" in
        /sbin/iptables -A FORWARD -i lo          -m state --state NEW -j ACCEPT
        /sbin/iptables -A FORWARD -s 127.0.0.0/8 -m state --state NEW -j DROP
        /sbin/iptables -A FORWARD -d 127.0.0.0/8 -m state --state NEW -j DROP
-       /sbin/iptables -A INPUT   -i $GREEN_DEV  -m state --state NEW -j ACCEPT -p ! icmp
+       /sbin/iptables -A INPUT   -i $GREEN_DEV  -m state --state NEW -j ACCEPT ! -p icmp
        /sbin/iptables -A FORWARD -i $GREEN_DEV  -m state --state NEW -j ACCEPT
 
        # If a host on orange tries to initiate a connection to IPFire's red IP and