X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=config%2Fqos%2Fmakeqosscripts.pl;h=0861ca4bd09e8cbcef7c81d15f51a74094e7d76e;hp=25f0f051029352a4d10fcc2a1bb08f7af9348017;hb=f013ab2b65d639808ce857511e9dc7f99f916957;hpb=d1883e28de3f0dbac64a1d191d236cb655dc99da;ds=sidebyside

diff --git a/config/qos/makeqosscripts.pl b/config/qos/makeqosscripts.pl
index 25f0f05102..0861ca4bd0 100644
--- a/config/qos/makeqosscripts.pl
+++ b/config/qos/makeqosscripts.pl
@@ -290,40 +290,6 @@ END
 		}
 	}
 
-print <<END
-
-	### SET LEVEL7-RULES
-END
-;
-  	foreach $l7ruleentry (sort @l7rules)
-  	{
-  		@l7ruleline = split( /\;/, $l7ruleentry );
-  		if ( $l7ruleline[1] eq $qossettings{'RED_DEV'} )
-  		{
-			$qossettings{'CLASS'} = $l7ruleline[0];
-			$qossettings{'DEVICE'} = $l7ruleline[1];
-			$qossettings{'L7PROT'} = $l7ruleline[2];
-			$qossettings{'QIP'} = $l7ruleline[3];
-			$qossettings{'DIP'} = $l7ruleline[4];
-  			print "\tiptables -t mangle -A QOS-OUT -o $qossettings{'RED_DEV'} ";
-			if ($qossettings{'QIP'} ne ''){
-				print "-s $qossettings{'QIP'} ";
-			}
-			if ($qossettings{'DIP'} ne ''){
-				print "-d $qossettings{'DIP'} ";
-			}
-			print "-m layer7 --l7dir /etc/l7-protocols/protocols --l7proto $qossettings{'L7PROT'} -j MARK --set-mark $qossettings{'CLASS'}\n";
-  			print "\tiptables -t mangle -A QOS-OUT -o $qossettings{'RED_DEV'} ";
-			if ($qossettings{'QIP'} ne ''){
-				print "-s $qossettings{'QIP'} ";
-			}
-			if ($qossettings{'DIP'} ne ''){
-				print "-d $qossettings{'DIP'} ";
-			}
-			print "-m layer7 --l7dir /etc/l7-protocols/protocols --l7proto $qossettings{'L7PROT'} -j RETURN\n";
-  		}
-  	}
-
 print "\n\t### SET PORT-RULES\n";
   	foreach $portruleentry (sort @portrules)
   	{
@@ -376,6 +342,40 @@ print "\n\t### SET PORT-RULES\n";
 		}
 	}
 
+print <<END
+
+	### SET LEVEL7-RULES
+END
+;
+  	foreach $l7ruleentry (sort @l7rules)
+  	{
+  		@l7ruleline = split( /\;/, $l7ruleentry );
+  		if ( $l7ruleline[1] eq $qossettings{'RED_DEV'} )
+  		{
+			$qossettings{'CLASS'} = $l7ruleline[0];
+			$qossettings{'DEVICE'} = $l7ruleline[1];
+			$qossettings{'L7PROT'} = $l7ruleline[2];
+			$qossettings{'QIP'} = $l7ruleline[3];
+			$qossettings{'DIP'} = $l7ruleline[4];
+  			print "\tiptables -t mangle -A QOS-OUT -o $qossettings{'RED_DEV'} ";
+			if ($qossettings{'QIP'} ne ''){
+				print "-s $qossettings{'QIP'} ";
+			}
+			if ($qossettings{'DIP'} ne ''){
+				print "-d $qossettings{'DIP'} ";
+			}
+			print "-m layer7 --l7dir /etc/l7-protocols/protocols --l7proto $qossettings{'L7PROT'} -j MARK --set-mark $qossettings{'CLASS'}\n";
+  			print "\tiptables -t mangle -A QOS-OUT -o $qossettings{'RED_DEV'} ";
+			if ($qossettings{'QIP'} ne ''){
+				print "-s $qossettings{'QIP'} ";
+			}
+			if ($qossettings{'DIP'} ne ''){
+				print "-d $qossettings{'DIP'} ";
+			}
+			print "-m layer7 --l7dir /etc/l7-protocols/protocols --l7proto $qossettings{'L7PROT'} -j RETURN\n";
+  		}
+  	}
+
 print <<END
 
 	### REDUNDANT: SET ALL NONMARKED PACKETS TO DEFAULT CLASS
@@ -510,40 +510,6 @@ END
 
 	}
 
-print <<END
-
-	### SET LEVEL7-RULES
-END
-;
-  	foreach $l7ruleentry (sort @l7rules)
-  	{
-  		@l7ruleline = split( /\;/, $l7ruleentry );
-  		if ( $l7ruleline[1] eq $qossettings{'IMQ_DEV'} )
-  		{
-			$qossettings{'CLASS'} = $l7ruleline[0];
-			$qossettings{'DEVICE'} = $l7ruleline[1];
-			$qossettings{'L7PROT'} = $l7ruleline[2];
-			$qossettings{'QIP'} = $l7ruleline[3];
-			$qossettings{'DIP'} = $l7ruleline[4];
-  			print "\tiptables -t mangle -A QOS-INC -i $qossettings{'RED_DEV'} ";
-			if ($qossettings{'QIP'} ne ''){
-				print "-s $qossettings{'QIP'} ";
-			}
-			if ($qossettings{'DIP'} ne ''){
-				print "-d $qossettings{'DIP'} ";
-			}
-			print "-m layer7 --l7dir /etc/l7-protocols/protocols --l7proto $qossettings{'L7PROT'} -j MARK --set-mark $qossettings{'CLASS'}\n";
-  			print "\tiptables -t mangle -A QOS-INC -i $qossettings{'RED_DEV'} ";
-			if ($qossettings{'QIP'} ne ''){
-				print "-s $qossettings{'QIP'} ";
-			}
-			if ($qossettings{'DIP'} ne ''){
-				print "-d $qossettings{'DIP'} ";
-			}
-			print "-m layer7 --l7dir /etc/l7-protocols/protocols --l7proto $qossettings{'L7PROT'} -j RETURN\n";
-  		}
-  	}
-
 print "\n\t### SET PORT-RULES\n";
   	foreach $portruleentry (sort @portrules)
   	{
@@ -596,6 +562,40 @@ print "\n\t### SET PORT-RULES\n";
 		}
 	}
 
+print <<END
+
+	### SET LEVEL7-RULES
+END
+;
+  	foreach $l7ruleentry (sort @l7rules)
+  	{
+  		@l7ruleline = split( /\;/, $l7ruleentry );
+  		if ( $l7ruleline[1] eq $qossettings{'IMQ_DEV'} )
+  		{
+			$qossettings{'CLASS'} = $l7ruleline[0];
+			$qossettings{'DEVICE'} = $l7ruleline[1];
+			$qossettings{'L7PROT'} = $l7ruleline[2];
+			$qossettings{'QIP'} = $l7ruleline[3];
+			$qossettings{'DIP'} = $l7ruleline[4];
+  			print "\tiptables -t mangle -A QOS-INC -i $qossettings{'RED_DEV'} ";
+			if ($qossettings{'QIP'} ne ''){
+				print "-s $qossettings{'QIP'} ";
+			}
+			if ($qossettings{'DIP'} ne ''){
+				print "-d $qossettings{'DIP'} ";
+			}
+			print "-m layer7 --l7dir /etc/l7-protocols/protocols --l7proto $qossettings{'L7PROT'} -j MARK --set-mark $qossettings{'CLASS'}\n";
+  			print "\tiptables -t mangle -A QOS-INC -i $qossettings{'RED_DEV'} ";
+			if ($qossettings{'QIP'} ne ''){
+				print "-s $qossettings{'QIP'} ";
+			}
+			if ($qossettings{'DIP'} ne ''){
+				print "-d $qossettings{'DIP'} ";
+			}
+			print "-m layer7 --l7dir /etc/l7-protocols/protocols --l7proto $qossettings{'L7PROT'} -j RETURN\n";
+  		}
+  	}
+
 print <<END
 	### REDUNDANT: SET ALL NONMARKED PACKETS TO DEFAULT CLASS
 	iptables -t mangle -A QOS-INC -i $qossettings{'RED_DEV'} -m mark --mark 0 -j MARK --set-mark $qossettings{'DEFCLASS_INC'}