From: Alexander Marx <amarx@ipfire.org>
Date: Wed, 16 Jan 2013 05:12:34 +0000 (+0100)
Subject: Forward Firewall: edited p2pblock call in rules.pl
X-Git-Tag: v2.15-beta1~286^2~11^2~254
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=af49e3672351be5c1bad9958dfbd70bb638ffb45;p=ipfire-2.x.git

Forward Firewall: edited p2pblock call in rules.pl
---

diff --git a/config/forwardfw/rules.pl b/config/forwardfw/rules.pl
index 152558b643..a6ba4fc507 100755
--- a/config/forwardfw/rules.pl
+++ b/config/forwardfw/rules.pl
@@ -89,10 +89,13 @@ if($param eq 'flush'){
 	&preparerules;
 	if($MODE eq '0'){
 		if ($fwdfwsettings{'POLICY'} eq 'MODE1'){
+			&p2pblock;
 			system ("/usr/sbin/firewall-forward-policy"); 
 		}elsif($fwdfwsettings{'POLICY'} eq 'MODE2'){
+			&p2pblock;
 			system ("/usr/sbin/firewall-forward-policy"); 
-		}elsif($fwdfwsettings{'POLICY'} eq 'MODE0' || $fwdfwsettings{'POLICY'} eq 'MODE2'){
+			system ("iptables -A $CHAIN -m state --state NEW -j ACCEPT");
+		}elsif($fwdfwsettings{'POLICY'} eq 'MODE0'){
 			system ("/usr/sbin/firewall-forward-policy"); 
 			system ("iptables -A $CHAIN -m state --state NEW -j ACCEPT");
 		}
@@ -107,7 +110,6 @@ sub preparerules
 {
 	if (! -z  "${General::swroot}/forward/config"){
 		&buildrules(\%configfwdfw);
-		&p2pblock;
 	}
 	if (! -z  "${General::swroot}/forward/input"){
 		&buildrules(\%configinputfw);