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

Optimization tracing

Browse Source 
- Correct tracing in optimize_chain()
- Add tracing to new level 4 optimization

Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2012-05-19 07:54:50 -07:00
parent f15e6d3995
commit 1a9789a3da
1 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2978,15 +2978,22 @@ sub optimize_chain( $ ) {
my $chainref = shift; my $chainref = shift;
if ( $chainref->{referenced} ) { if ( $chainref->{referenced} ) {
my $rules = $chainref->{rules}; my $rules = $chainref->{rules};
my $count = 0; my $count = 0;
my $rulecount = @$rules - 1;
pop @$rules; # Pop the plain -j ACCEPT rule at the end of the chain my $lastrule = pop @$rules; # Pop the plain -j ACCEPT rule at the end of the chain
pop @$rules, $count++ while @$rules && $rules->[-1]->{target} eq 'ACCEPT'; while ( @$rules && $rules->[-1]->{target} eq 'ACCEPT' ) {
my $rule = pop @$rules;
trace( $chainref, 'D', $rulecount , $rule ) if $debug;
$count++;
$rulecount--;
}
if ( @${rules} ) { if ( @${rules} ) {
add_ijump $chainref, j => 'ACCEPT'; push @$rules, $lastrule;
my $type = $chainref->{builtin} ? 'builtin' : 'policy'; my $type = $chainref->{builtin} ? 'builtin' : 'policy';
progress_message " $count ACCEPT rules deleted from $type chain $chainref->{name}" if $count; progress_message " $count ACCEPT rules deleted from $type chain $chainref->{name}" if $count;
} elsif ( $chainref->{builtin} ) { } elsif ( $chainref->{builtin} ) {
@ -3312,6 +3319,8 @@ sub optimize_level4( $$ ) {
if ( $lastref->{simple} && $lastref->{target} && ! $lastref->{targetopts} ) { if ( $lastref->{simple} && $lastref->{target} && ! $lastref->{targetopts} ) {
my $target = $lastref->{target}; my $target = $lastref->{target};
my $count = 0;
my $rule = @$rulesref - 1;
pop @$rulesref; #Pop the last simple rule pop @$rulesref; #Pop the last simple rule
@ -3320,11 +3329,17 @@ sub optimize_level4( $$ ) {
last unless ( $rule1ref->{target} || '' ) eq $target && ! $rule1ref->{targetopts}; last unless ( $rule1ref->{target} || '' ) eq $target && ! $rule1ref->{targetopts};
trace ( $chainref, 'D', $rule, $rule1ref ) if $debug;
pop @$rulesref; pop @$rulesref;
$progress = 1; $progress = 1;
$count++;
$rule--;
} }
push @$rulesref, $lastref; #Now restore the last simple rule push @$rulesref, $lastref; #Now restore the last simple rule
progress_message " $count $target rules deleted from chain $chainref->{name}" if $count;
} }
} }
} }