From 4137961169e96ceef4e2fbbb306f39f2ca181db6 Mon Sep 17 00:00:00 2001
From: Tom Eastep <teastep@shorewall.net>
Date: Sun, 11 Apr 2010 09:00:24 -0700
Subject: [PATCH] Speed up the replace_references* functions.

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

diff --git a/Shorewall/Perl/Shorewall/Chains.pm b/Shorewall/Perl/Shorewall/Chains.pm
index 5877298e7..aff826c22 100644
--- a/Shorewall/Perl/Shorewall/Chains.pm
+++ b/Shorewall/Perl/Shorewall/Chains.pm
@@ -1464,20 +1464,20 @@ sub delete_references( $ ) {
 #
 sub replace_references( $$ ) {
     my ( $chainref, $target ) = @_;
-    my $table    = $chainref->{table};
+    my $tableref = $chain_table{$chainref->{table}};
     my $count    = 0;
 
-    if ( defined $chain_table{$table}{$target}  && ! $chain_table{$table}{$target}{builtin} ) {
+    if ( defined $tableref->{$target}  && ! $tableref->{$target}{builtin} ) {
 	#
 	# The target is a chain -- use the jump type from each referencing rule
 	#
-	for my $fromref ( map $chain_table{$table}{$_} , keys %{$chainref->{references}} ) {
+	for my $fromref ( map $tableref->{$_} , keys %{$chainref->{references}} ) {
 	    if ( $fromref->{referenced} ) {
 		my $rule = 0;
 		for ( @{$fromref->{rules}} ) {
 		    $rule++;
 		    if ( s/ -([jg]) $chainref->{name}(\b)/ -$1 ${target}$2/ ) {
-			add_reference ( $fromref, $chain_table{$table}{$target} );
+			add_reference ( $fromref, $tableref->{$target} );
 			$count++;
 			trace( $fromref, 'R', $rule, $_ ) if $debug;
 		    }
@@ -1488,7 +1488,7 @@ sub replace_references( $$ ) {
 	#
 	# The target is a builtin -- we must use '-j'
 	#
-	for my $fromref ( map $chain_table{$table}{$_} , keys %{$chainref->{references}} ) {
+	for my $fromref ( map $tableref->{$_} , keys %{$chainref->{references}} ) {
 	    if ( $fromref->{referenced} ) {
 		my $rule = 0;
 		for ( @{$fromref->{rules}} ) {
@@ -1513,16 +1513,16 @@ sub replace_references( $$ ) {
 #
 sub replace_references1( $$$ ) {
     my ( $chainref, $target, $matches ) = @_;
-    my $table     = $chainref->{table};
+    my $tableref  = $chain_table{$chainref->{table}};
     my $count     = 0;
     #
     # Note: If $matches is non-empty, then it begins with white space
     #
-    if ( defined $chain_table{$table}{$target} && ! $chain_table{$table}{$target}{builtin} ) {
+    if ( defined $tableref->{$target} && ! $tableref->{$target}{builtin} ) {
 	#
 	# The target is a chain -- use the jump type from each referencing rule
 	#
-	for my $fromref ( map $chain_table{$table}{$_} , keys %{$chainref->{references}} ) {
+	for my $fromref ( map $tableref->{$_} , keys %{$chainref->{references}} ) {
 	    if ( $fromref->{referenced} ) {
 		my $rule = 0;
 		for ( @{$fromref->{rules}} ) {
@@ -1533,7 +1533,7 @@ sub replace_references1( $$$ ) {
 			#
 			s/ -p [^ ]+ / / if / -p / && $matches =~ / -p /;
 			s/\s+-([jg]) $chainref->{name}(\b)/$matches -$1 ${target}$2/;
-			add_reference ( $fromref, $chain_table{$table}{$target} );
+			add_reference ( $fromref, $tableref->{$target} );
 			$count++;
 			trace( $fromref, 'R', $rule, $_ ) if $debug;
 		    }
@@ -1544,7 +1544,7 @@ sub replace_references1( $$$ ) {
 	#
 	# The target is a builtin -- we must use '-j'
 	#
-	for my $fromref ( map $chain_table{$table}{$_} , keys %{$chainref->{references}} ) {
+	for my $fromref ( map $tableref->{$_} , keys %{$chainref->{references}} ) {
 	    my $rule = 0;
 	    if ( $fromref->{referenced} ) {
 		for ( @{$fromref->{rules}} ) {