holm/shorewall_code
1
0
Fork 0
forked from extern/shorewall_code
Code Pull Requests Activity

Don't apply RE to rules that we've already checked.

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2010-04-09 09:46:07 -07:00
parent 1e078b8c8d
commit 9dc8267888
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Shorewall/Perl/Shorewall/Chains.pm
View File

@ -600,6 +600,7 @@ sub add_reference ( $$ ) {
sub purge_jump ( $$ ) { sub purge_jump ( $$ ) {
my ( $fromref, $toref ) = @_; my ( $fromref, $toref ) = @_;
my $to = $toref->{name}; my $to = $toref->{name};
my $last = 0;
# #
# splice() of an array being iterated over causes elements to be skipped so # splice() of an array being iterated over causes elements to be skipped so
# we need to restart the scan after each deletion. # we need to restart the scan after each deletion.
@ -612,10 +613,13 @@ sub purge_jump ( $$ ) {
$progress = 0; $progress = 0;
for ( @{$fromref->{rules}} ) { for ( @{$fromref->{rules}} ) {
$rule++, next if $last-- > 0;
if ( / -[gj] ${to}\b/ ) { if ( / -[gj] ${to}\b/ ) {
trace( $fromref, 'D', $rule + 1, $_ ) if $debug; trace( $fromref, 'D', $rule + 1, $_ ) if $debug;
splice( @{$fromref->{rules}}, $rule, 1 ); splice( @{$fromref->{rules}}, $rule, 1 );
$progress = 1; $progress = 1;
$last = $rule;
last; last;
} }
@ -1429,6 +1433,7 @@ sub delete_references( $ ) {
my $chainref = shift; my $chainref = shift;
my $table = $chainref->{table}; my $table = $chainref->{table};
my $count = 0; my $count = 0;
my $last = 0;
for my $fromref ( map $chain_table{$table}{$_} , keys %{$chainref->{references}} ) { for my $fromref ( map $chain_table{$table}{$_} , keys %{$chainref->{references}} ) {
# #
@ -1443,11 +1448,14 @@ sub delete_references( $ ) {
$progress = 0; $progress = 0;
for ( @{$fromref->{rules}} ) { for ( @{$fromref->{rules}} ) {
$rule++, next if $last-- > 0;
if ( / -[jg] $chainref->{name}$/ ) { if ( / -[jg] $chainref->{name}$/ ) {
trace( $fromref, 'D', $rule + 1, $_ ) if $debug; trace( $fromref, 'D', $rule + 1, $_ ) if $debug;
splice( @{$fromref->{rules}}, $rule, 1 ); splice( @{$fromref->{rules}}, $rule, 1 );
$count++; $count++;
$progress = 1; $progress = 1;
$last = $rule;
last; last;
} }