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

Centralize message generation; optimize optimization-8 loop

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2010-04-15 09:29:37 -07:00
parent 9ad5ee1818
commit 96d69bd8c3
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -709,6 +709,7 @@ sub delete_chain( $ ) {
$chainref->{rules} = []; $chainref->{rules} = [];
$chainref->{references} = {}; $chainref->{references} = {};
trace( $chainref, 'X', undef, '' ) if $debug; trace( $chainref, 'X', undef, '' ) if $debug;
progress_message " Chain $chainref->{name} deleted";
} }
# #
@ -812,7 +813,6 @@ sub copy_rules( $$ ) {
delete $chain1->{references}{$name2}; delete $chain1->{references}{$name2};
unless ( keys %{$chain1->{references}} ) { unless ( keys %{$chain1->{references}} ) {
delete_chain $chain1; delete_chain $chain1;
progress_message " Unreferenced chain $name1 deleted";
} }
} }
} }
@ -1505,7 +1505,7 @@ sub replace_references( $$ ) {
} }
} }
progress_message " $count references to 1-rule chain $chainref->{name} replaced" if $count; progress_message " $count references to chain $chainref->{name} replaced" if $count;
delete_chain $chainref; delete_chain $chainref;
} }
@ -1569,7 +1569,7 @@ sub replace_references1( $$$ ) {
} }
} }
progress_message " $count references to 1-rule chain $chainref->{name} replaced" if $count; progress_message " $count references to chain $chainref->{name} replaced" if $count;
delete_chain $chainref; delete_chain $chainref;
} }
@ -1649,7 +1649,6 @@ sub optimize_ruleset() {
# #
unless ( $chainref->{dont_delete} || keys %{$chainref->{references}} ) { unless ( $chainref->{dont_delete} || keys %{$chainref->{references}} ) {
delete_chain $chainref; delete_chain $chainref;
progress_message " Unreferenced chain $chainref->{name} deleted";
next; next;
} }
@ -1766,16 +1765,15 @@ sub optimize_ruleset() {
for my $chainref ( grep $_->{referenced} && ! $_->{builtin}, values %{$chain_table{$table}} ) { for my $chainref ( grep $_->{referenced} && ! $_->{builtin}, values %{$chain_table{$table}} ) {
my $rules = $chainref->{rules}; my $rules = $chainref->{rules};
next if not @$rules;
CHAIN: CHAIN:
for my $chainref1 ( grep $_->{referenced}, values %{$chain_table{$table}} ) { for my $chainref1 ( grep $_->{referenced}, values %{$chain_table{$table}} ) {
next if $chainref->{name} eq $chainref1->{name}; next if $chainref->{name} eq $chainref1->{name};
my $rules1 = $chainref1->{rules}; my $rules1 = $chainref1->{rules};
next if @$rules != @$rules1 || ! @$rules; next if @$rules != @$rules1;
next if $chainref1->{dont_delete}; next if $chainref1->{dont_delete};
next if $chainref1->{builtin};
for ( my $i = 0; $i <= $#$rules; $i++ ) { for ( my $i = 0; $i <= $#$rules; $i++ ) {
my $rule = $rules->[$i];
next CHAIN unless $rules->[$i] eq $rules1->[$i]; next CHAIN unless $rules->[$i] eq $rules1->[$i];
} }