From 7a831107c793e01134fabea79cc18f162376c2ca Mon Sep 17 00:00:00 2001
From: Tom Eastep <teastep@shorewall.net>
Date: Fri, 9 Apr 2010 09:58:32 -0700
Subject: [PATCH] Replace the complex rule deletion loops with C-stype for
 loops.

Signed-off-by: Tom Eastep <teastep@shorewall.net>
---
 Shorewall/Perl/Shorewall/Chains.pm | 60 +++++++-----------------------
 1 file changed, 13 insertions(+), 47 deletions(-)

diff --git a/Shorewall/Perl/Shorewall/Chains.pm b/Shorewall/Perl/Shorewall/Chains.pm
index e92629904..7d81180d8 100644
--- a/Shorewall/Perl/Shorewall/Chains.pm
+++ b/Shorewall/Perl/Shorewall/Chains.pm
@@ -601,29 +601,13 @@ sub purge_jump ( $$ ) {
     my ( $fromref, $toref ) = @_;
     my $to = $toref->{name};
     my $last = 0;
-    #
-    # splice() of an array being iterated over causes elements to be skipped so
-    # we need to restart the scan after each deletion.
-    #
-    my $progress = 1;
-
-    while ( $progress ) {
-	my $rule = 0;
+    my $rule;
 	
-	$progress = 0;
-
-	for ( @{$fromref->{rules}} ) {
-	    $rule++, next if $last-- > 0;
-
-	    if ( / -[gj] ${to}\b/ ) {
-		trace( $fromref, 'D', $rule + 1, $_ ) if $debug;
-		splice(  @{$fromref->{rules}}, $rule, 1 );
-		$progress = 1;
-		$last = $rule;
-		last;
-	    }
-		
-	    $rule++;
+    for ( $rule = 0; $rule < $#{$fromref->{rules}}; $rule++ ) {
+	if (  $fromref->{rules}[$rule] =~ / -[gj] ${to}\b/ ) {
+	    trace( $fromref, 'D', $rule + 1, $_ ) if $debug;
+	    splice(  @{$fromref->{rules}}, $rule, 1 );
+	    $rule--;
 	}
     }
 
@@ -1433,33 +1417,15 @@ sub delete_references( $ ) {
     my $chainref = shift;
     my $table    = $chainref->{table};
     my $count    = 0;
-    my $last     = 0;
+    my $rule;
     
     for my $fromref ( map $chain_table{$table}{$_} , keys %{$chainref->{references}} ) {
-	#
-	# splice() of an array being iterated over causes elements to be skipped so
-	# we need to restart the scan after each deletion.
-	#
-	my $progress = 1;
-	
-	while ( $progress ) {
-	    my $rule = 0;
-
-	    $progress = 0;
-
-	    for ( @{$fromref->{rules}} ) {
-		$rule++, next if $last-- > 0;
-
-		if ( / -[jg] $chainref->{name}$/ ) {
-		    trace( $fromref, 'D', $rule + 1, $_ ) if $debug;
-		    splice( @{$fromref->{rules}}, $rule, 1 );
-		    $count++;
-		    $progress = 1;
-		    $last = $rule;
-		    last;
-		}
-		
-		$rule++;
+	for ( $rule = 0; $rule <= $#{$fromref->{rules}}; $rule++ ) {
+	    if ( $fromref->{rules}[$rule] =~ / -[jg] $chainref->{name}$/ ) {
+		trace( $fromref, 'D', $rule + 1, $_ ) if $debug;
+		splice( @{$fromref->{rules}}, $rule, 1 );
+		$count++;
+		$rule--;
 	    }
 	}