extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2024-12-18 04:11:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Eliminate need to call optimize_policy_chains() when OPTIMIZE 4 is selected

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2012-05-19 08:15:20 -07:00
parent 1a9789a3da
commit 231c5dbca0
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3312,7 +3312,7 @@ sub optimize_level4( $$ ) {
} else { } else {
# #
# Chain has more than one rule. If the last rule is a simple jump, then delete # Chain has more than one rule. If the last rule is a simple jump, then delete
# all preceding rules that have the same target # all immediately preceding rules that have the same target
# #
my $rulesref = $chainref->{rules}; my $rulesref = $chainref->{rules};
my $lastref = $rulesref->[-1]; my $lastref = $rulesref->[-1];
@ -3337,7 +3337,16 @@ sub optimize_level4( $$ ) {
$rule--; $rule--;
} }
push @$rulesref, $lastref; #Now restore the last simple rule if ( @$rulesref || ! $chainref->{builtin} || $target !~ /^(ACCEPT|DROP|REJECT)$/ ) {
push @$rulesref, $lastref; # Restore the last simple rule
} else {
#
#empty builtin chain -- change it's policy
#
$chainref->{policy} = $target;
trace( $chainref, 'P', undef, 'ACCEPT' ) if $debug;
$count++;
}
progress_message " $count $target rules deleted from chain $chainref->{name}" if $count; progress_message " $count $target rules deleted from chain $chainref->{name}" if $count;
} }

4
Shorewall/Perl/Shorewall/Compiler.pm
View File

@ -812,12 +812,12 @@ sub compiler {
optimize_level0; optimize_level0;
if ( $config{OPTIMIZE} & 0x1E ) { if ( ( my $optimize = $config{OPTIMIZE} ) & 0x1E ) {
progress_message2 'Optimizing Ruleset...'; progress_message2 'Optimizing Ruleset...';
# #
# Optimize Policy Chains # Optimize Policy Chains
# #
optimize_policy_chains if $config{OPTIMIZE} & 2; optimize_policy_chains if $optimize & 6 == 2; # Level 2 but not 4
# #
# More Optimization # More Optimization
# #