extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2025-02-17 18:21:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix an optimization bug with the new blacklisting code

Browse Source
This commit is contained in:
Tom Eastep 2010-09-17 15:10:02 -07:00
parent 402b3b929e
commit 8cdbe5f88d
1 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -744,8 +744,10 @@ sub copy_rules( $$ ) {
my $name1 = $chain1->{name}; my $name1 = $chain1->{name};
my $name = $name1; my $name = $name1;
my $name2 = $chain2->{name}; my $name2 = $chain2->{name};
my @rules = @{$chain1->{rules}}; my $frozen1 = $chain1->{frozen};
my $rules = $chain2->{rules}; my $frozen2 = $chain2->{frozen};
my @rules1 = @{$chain1->{rules}};
my $rules2 = $chain2->{rules};
my $count = @{$chain1->{rules}}; my $count = @{$chain1->{rules}};
my $tableref = $chain_table{$chain1->{table}}; my $tableref = $chain_table{$chain1->{table}};
# #
@ -753,20 +755,32 @@ sub copy_rules( $$ ) {
# #
$name1 =~ s/\+/\\+/; $name1 =~ s/\+/\\+/;
my $last = pop @$rules; # Delete the jump to chain1 my $last = pop @$rules2; # Delete the jump to chain1
if ( $debug ) {
my $rule = @$rules;
trace( $chain2, 'A', ++$rule, $_ ) for @rules;
}
# #
# Chain2 is now a referent of all of Chain1's targets # Chain2 is now a referent of all of Chain1's targets
# #
for ( @rules ) { for ( @rules1 ) {
increment_reference_count( $tableref->{$1}, $name2 ) if / -[jg] ([^\s]+)/; increment_reference_count( $tableref->{$1}, $name2 ) if / -[jg] ([^\s]+)/;
} }
push @$rules, @rules; if ( $frozen1 || $frozen2 ) {
if ( $debug ) {
my $rule = @$rules2;
trace( $chain2, 'A', ++$rule, $_ ) for @rules1;
}
splice @$rules2, $frozen2, 0, splice( @rules1, 0, $frozen1 );
$chain2->{frozen} += $frozen1;
}
if ( $debug ) {
my $rule = @$rules2;
trace( $chain2, 'A', ++$rule, $_ ) for @rules1;
}
push @$rules2, @rules1;
progress_message " $count rules from $chain1->{name} appended to $chain2->{name}"; progress_message " $count rules from $chain1->{name} appended to $chain2->{name}";