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

Delete unused rules arrays

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2010-04-08 10:55:31 -07:00
parent c668707aac
commit 9126cc63d9
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -781,6 +781,7 @@ sub copy_rules( $$ ) {
delete $chain1->{references}{$name2}; delete $chain1->{references}{$name2};
unless ( keys %{$chain1->{references}} ) { unless ( keys %{$chain1->{references}} ) {
$chain1->{referenced} = 0; $chain1->{referenced} = 0;
$chain1->{rules} = [];
progress_message " Unreferenced chain $name1 deleted"; progress_message " Unreferenced chain $name1 deleted";
trace( $chain1, 'X', undef, '' ) if $debug; trace( $chain1, 'X', undef, '' ) if $debug;
} }
@ -1399,6 +1400,7 @@ sub optimize_chain( $ ) {
progress_message " $count references to ACCEPT policy chain $chainref->{name} replaced"; progress_message " $count references to ACCEPT policy chain $chainref->{name} replaced";
$chainref->{referenced} = 0; $chainref->{referenced} = 0;
$chainref->{rules} = [];
trace ( $chainref, 'X', undef, '' ) if $debug; trace ( $chainref, 'X', undef, '' ) if $debug;
} }
} }
@ -1433,6 +1435,7 @@ sub delete_references( $ ) {
} }
$chainref->{referenced} = 0; $chainref->{referenced} = 0;
$chainref->{rules} = [];
trace ( $chainref, 'X', undef, '' ) if $debug; trace ( $chainref, 'X', undef, '' ) if $debug;
$count; $count;
} }
@ -1483,6 +1486,7 @@ sub replace_references( $$ ) {
progress_message " $count references to 1-rule chain $chainref->{name} replaced" if $count; progress_message " $count references to 1-rule chain $chainref->{name} replaced" if $count;
$chainref->{referenced} = 0; $chainref->{referenced} = 0;
$chainref->{rules} = [];
trace ( $chainref, 'X', undef, '' ) if $debug; trace ( $chainref, 'X', undef, '' ) if $debug;
} }
@ -1550,6 +1554,7 @@ sub replace_references1( $$$ ) {
progress_message " $count references to 1-rule chain $chainref->{name} replaced" if $count; progress_message " $count references to 1-rule chain $chainref->{name} replaced" if $count;
$chainref->{referenced} = 0; $chainref->{referenced} = 0;
$chainref->{rules} = [];
trace ( $chainref, 'X', undef, '' ) if $debug; trace ( $chainref, 'X', undef, '' ) if $debug;
} }
@ -1627,6 +1632,7 @@ sub optimize_ruleset() {
# #
unless ( $chainref->{dont_delete} || keys %{$chainref->{references}} ) { unless ( $chainref->{dont_delete} || keys %{$chainref->{references}} ) {
$chainref->{referenced} = 0; $chainref->{referenced} = 0;
$chainref->{rules} = [];
trace ( $chainref, 'X', undef, '' ) if $debug; trace ( $chainref, 'X', undef, '' ) if $debug;
progress_message " Unreferenced chain $chainref->{name} deleted"; progress_message " Unreferenced chain $chainref->{name} deleted";
next; next;

2
Shorewall/changelog.txt
View File

@ -15,6 +15,8 @@ Changes in Shorewall 4.4.9
7) Fix OPTIMIZE 4 bug. 7) Fix OPTIMIZE 4 bug.
8) Deallocate unused rules.
Changes in Shorewall 4.4.8 Changes in Shorewall 4.4.8
1) Correct handling of RATE LIMIT on NAT rules. 1) Correct handling of RATE LIMIT on NAT rules.