X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=config%2Ffirewall%2Frules.pl;h=fa7edee1bec2fb36645c144dc1bc77fd054ed937;hp=a12ab56670f92342527cc4748349fc0301cbde2e;hb=93bfe63d55bf611887fbc25c251c6fb0ce2ab1d4;hpb=b9ca2fa60f1ac0127d0bbddb016d0acb578e660d

diff --git a/config/firewall/rules.pl b/config/firewall/rules.pl
index a12ab56670..fa7edee1be 100644
--- a/config/firewall/rules.pl
+++ b/config/firewall/rules.pl
@@ -89,8 +89,16 @@ sub main {
 	# Flush all chains.
 	&flush();
 
-	# Reload firewall rules.
-	&preparerules();
+	# Prepare firewall rules.
+	if (! -z  "${General::swroot}/firewall/input"){
+		&buildrules(\%configinputfw);
+	}
+	if (! -z  "${General::swroot}/firewall/outgoing"){
+		&buildrules(\%configoutgoingfw);
+	}
+	if (! -z  "${General::swroot}/firewall/config"){
+		&buildrules(\%configfwdfw);
+	}
 
 	# Load P2P block rules.
 	&p2pblock();
@@ -100,6 +108,11 @@ sub main {
 
 	# Reload firewall policy.
 	run("/usr/sbin/firewall-policy");
+
+	#Reload firewall.local if present
+	if ( -f '/etc/sysconfig/firewall.local'){
+		run("/etc/sysconfig/firewall.local reload");
+	}
 }
 
 sub run {
@@ -150,18 +163,6 @@ sub flush {
 	run("$IPTABLES -t mangle -F $CHAIN_MANGLE_NAT_DESTINATION_FIX");
 }
 
-sub preparerules {
-	if (! -z  "${General::swroot}/firewall/input"){
-		&buildrules(\%configinputfw);
-	}
-	if (! -z  "${General::swroot}/firewall/outgoing"){
-		&buildrules(\%configoutgoingfw);
-	}
-	if (! -z  "${General::swroot}/firewall/config"){
-		&buildrules(\%configfwdfw);
-	}
-}
-
 sub buildrules {
 	my $hash = shift;
 
@@ -520,10 +521,6 @@ sub buildrules {
 			}
 		}
 	}
-	#Reload firewall.local if present
-	if ( -f '/etc/sysconfig/firewall.local'){
-		run("/etc/sysconfig/firewall.local reload");
-	}
 }
 
 # Formats the given timestamp into the iptables format which is "hh:mm" UTC.