Forward Firewall: delete old portforwarding from system and fix for wlan-firewall...

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

diff --git a/src/initscripts/init.d/firewall b/src/initscripts/init.d/firewall
index 7ec3274170ec896756529a49d053f4c798f53404..39e1dfd7b1fd981eb34658b91251495e3ad4cecf 100644 (file)
--- a/src/initscripts/init.d/firewall
+++ b/src/initscripts/init.d/firewall
@@ -149,11 +149,10 @@ case "$1" in
        /sbin/iptables -N CUSTOMFORWARD
        /sbin/iptables -A FORWARD -j CUSTOMFORWARD
        /sbin/iptables -N CUSTOMOUTPUT
+       /sbin/iptables -A OUTPUT -m state --state ESTABLISHED,RELATED -j ACCEPT
        /sbin/iptables -A OUTPUT -j CUSTOMOUTPUT
        /sbin/iptables -N OUTGOINGFW
-       /sbin/iptables -N OUTGOINGFWMAC
        /sbin/iptables -A OUTPUT -j OUTGOINGFW
-       /sbin/iptables -A OUTGOINGFW -m state --state ESTABLISHED,RELATED -j ACCEPT
        /sbin/iptables -t nat -N CUSTOMPREROUTING
        /sbin/iptables -t nat -A PREROUTING -j CUSTOMPREROUTING
        /sbin/iptables -t nat -N CUSTOMPOSTROUTING
@@ -174,6 +173,10 @@ case "$1" in
        /sbin/iptables -A INPUT   -m state --state ESTABLISHED,RELATED -j ACCEPT
        /sbin/iptables -A FORWARD -m state --state ESTABLISHED,RELATED -j ACCEPT
        
+       # Accept everything on lo
+       iptables -A INPUT  -i lo -m state --state NEW -j ACCEPT
+       iptables -A OUTPUT -o lo -m state --state NEW -j ACCEPT
+       
        # trafic from ipsecX/TUN/TAP interfaces, before "-i GREEN_DEV" accept everything
        /sbin/iptables -N IPSECINPUT
        /sbin/iptables -N IPSECFORWARD
@@ -189,13 +192,6 @@ case "$1" in
        /sbin/iptables -t nat -A POSTROUTING -j OVPNNAT
        /sbin/iptables -t nat -A POSTROUTING -j IPSECNAT
 
-       # TOR
-       /sbin/iptables -N TOR_INPUT
-       /sbin/iptables -A INPUT -j TOR_INPUT
-
-       # Outgoing Firewall
-       /sbin/iptables -A FORWARD -j OUTGOINGFWMAC
-
        # Forward Firewall
        /sbin/iptables -N FORWARDFW
        /sbin/iptables -A FORWARD -j FORWARDFW
@@ -256,19 +252,18 @@ case "$1" in
        # Custom prerouting chains (for transparent proxy and port forwarding)
        /sbin/iptables -t nat -N SQUID
        /sbin/iptables -t nat -A PREROUTING -j SQUID
-       /sbin/iptables -t nat -N PORTFW
-       /sbin/iptables -t nat -A PREROUTING -j PORTFW
-
+       /sbin/iptables -t nat -N NAT_DESTINATION
+       /sbin/iptables -t nat -N NAT_SOURCE
+       /sbin/iptables -t nat -A PREROUTING -j NAT_DESTINATION
+       /sbin/iptables -t nat -A POSTROUTING -j NAT_SOURCE
+       
+       
        # upnp chain for our upnp daemon
        /sbin/iptables -t nat -N UPNPFW
        /sbin/iptables -t nat -A PREROUTING -j UPNPFW
        /sbin/iptables -N UPNPFW
        /sbin/iptables -A FORWARD -m state --state NEW -j UPNPFW
 
-       # Custom mangle chain (for port fowarding)
-       /sbin/iptables -t mangle -N PORTFWMANGLE
-       /sbin/iptables -t mangle -A PREROUTING -j PORTFWMANGLE
-
        # Postrouting rules (for port forwarding)
        /sbin/iptables -t nat -A POSTROUTING -m mark --mark 1 -j SNAT \
         --to-source $GREEN_ADDRESS
@@ -296,13 +291,15 @@ case "$1" in
        #/sbin/iptables -A FORWARD -j DROP -m comment --comment "DROP_FORWARD"
        
        #POLICY CHAIN
+       /sbin/iptables -N POLICYIN
+       /sbin/iptables -A INPUT -j POLICYIN
        /sbin/iptables -N POLICYFWD
        /sbin/iptables -A FORWARD -j POLICYFWD
        /sbin/iptables -N POLICYOUT
        /sbin/iptables -A OUTPUT -j POLICYOUT
-       
-       
+
        /usr/sbin/firewall-policy
+       
        ;;
   startovpn)  
        # run openvpn
@@ -356,7 +353,6 @@ case "$1" in
        $0 stop
        $0 start
        /usr/local/bin/forwardfwctrl
-       /usr/local/bin/setportfw
        /usr/local/bin/openvpnctrl -s > /dev/null 2>&1
        /usr/local/bin/openvpnctrl -sn2n > /dev/null 2>&1
        ;;