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

Remove recursive_delete_references

Browse Source
This commit is contained in:
Tom Eastep 2011-02-16 12:49:04 -08:00
parent 2974167f06
commit 030839e4a4
1 changed files with 12 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -823,30 +823,6 @@ sub move_rules( $$ ) {
} }
} }
#
# Recursively delete references from $chain to $name
#
sub recursive_delete_references( $$ );
sub recursive_delete_references( $$ ) {
my ( $chain1, $chain2 ) = @_;
my $name2 = $chain2->{name};
unless ( --$chain1->{references}{$name2} ) {
delete $chain1->{references}{$name2};
unless ( keys %{$chain1->{references}} ) {
my $tableref = $chain_table{$chain1->{table}};
my $name1 = $chain1->{name};
for ( @{$chain1->{rules}} ) {
decrement_reference_count( $tableref->{$1}, $name1 ) if / -[jg] ([^\s]+)/;
}
delete_chain $chain1;
}
}
}
# #
# Replace the jump at the end of one chain (chain2) with the rules from another chain (chain1). # Replace the jump at the end of one chain (chain2) with the rules from another chain (chain1).
# #
@ -914,7 +890,18 @@ sub copy_rules( $$ ) {
progress_message " $count rules from $chain1->{name} appended to $chain2->{name}"; progress_message " $count rules from $chain1->{name} appended to $chain2->{name}";
recursive_delete_references( $chain1, $chain2 ); unless ( --$chain1->{references}{$name2} ) {
delete $chain1->{references}{$name2};
unless ( keys %{$chain1->{references}} ) {
my $tableref = $chain_table{$chain1->{table}};
my $name1 = $chain1->{name};
for ( @{$chain1->{rules}} ) {
decrement_reference_count( $tableref->{$1}, $name1 ) if / -[jg] ([^\s]+)/;
}
delete_chain $chain1;
}
}
} }
# #