holm/shorewall_code
1
0
Fork 0
forked from extern/shorewall_code
Code Pull Requests Activity

Fix reference count issue

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2010-04-07 19:47:49 -07:00
parent 9d7d7e06d8
commit aeb3b277b0
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -610,7 +610,10 @@ sub purge_jump ( $$ ) {
} }
} }
$toref->{referenced} = 0 unless @{$toref->{rules}}; unless ( @{$toref->{rules}} ) {
$toref->{referenced} = 0;
trace ( $toref, 'X', undef, '' ) if $debug;
}
} }
# #
@ -1396,6 +1399,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;
trace ( $chainref, 'X', undef, '' ) if $debug;
} }
} }
} }
@ -1429,7 +1433,7 @@ sub delete_references( $ ) {
} }
$chainref->{referenced} = 0; $chainref->{referenced} = 0;
trace ( $chainref, 'X', undef, '' ) if $debug;
$count; $count;
} }
@ -1478,6 +1482,8 @@ 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;
trace ( $chainref, 'X', undef, '' ) if $debug;
} }
# #
@ -1486,8 +1492,8 @@ sub replace_references( $$ ) {
# #
sub replace_references1( $$$ ) { sub replace_references1( $$$ ) {
my ( $chainref, $target, $matches ) = @_; my ( $chainref, $target, $matches ) = @_;
my $table = $chainref->{table}; my $table = $chainref->{table};
my $count = 0; my $count = 0;
# #
# Note: If $matches is non-empty, then it begins with white space # Note: If $matches is non-empty, then it begins with white space
# #
@ -1507,6 +1513,7 @@ sub replace_references1( $$$ ) {
# #
s/ -p [^ ]+ / / if / -p / && $matches =~ / -p /; s/ -p [^ ]+ / / if / -p / && $matches =~ / -p /;
s/\s+-([jg]) $chainref->{name}(\b)/$matches -$1 ${target}$2/; s/\s+-([jg]) $chainref->{name}(\b)/$matches -$1 ${target}$2/;
add_reference ( $fromref, $chain_table{$table}{$target} );
$count++; $count++;
trace( $fromref, 'R', $rule, $_ ) if $debug; trace( $fromref, 'R', $rule, $_ ) if $debug;
} }
@ -1542,6 +1549,8 @@ 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;
trace ( $chainref, 'X', undef, '' ) if $debug;
} }
# #
@ -1617,6 +1626,7 @@ sub optimize_ruleset() {
# #
unless ( $chainref->{dont_delete} || keys %{$chainref->{references}} ) { unless ( $chainref->{dont_delete} || keys %{$chainref->{references}} ) {
$chainref->{referenced} = 0; $chainref->{referenced} = 0;
trace ( $chainref, 'X', undef, '' ) if $debug;
progress_message " Unreferenced chain $chainref->{name} deleted"; progress_message " Unreferenced chain $chainref->{name} deleted";
next; next;
} }