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

Make procedure to delete a chain plus references to it; make exclusion chains begin with '~'

Browse Source
This commit is contained in:
Tom Eastep 2011-02-17 14:53:39 -08:00
parent 6f00f2127c
commit b06630091d
1 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -731,6 +731,24 @@ sub delete_chain( $ ) {
progress_message " Chain $chainref->{name} deleted"; progress_message " Chain $chainref->{name} deleted";
} }
#
# This variety first deletes all references to the chain before deleting it.
#
sub delete_chain_and_references( $ ) {
my $chainref = shift;
#
# We're going to delete this chain but first, we must delete all references to it.
#
my $tableref = $chain_table{$chainref->{table}};
my $name1 = $chainref->{name};
for ( @{$chainref->{rules}} ) {
decrement_reference_count( $tableref->{$1}, $name1 ) if / -[jg] ([^\s]+)/;
}
delete_chain $chainref;
}
# #
# Insert a tunnel rule into the passed chain. Tunnel rules are inserted sequentially # Insert a tunnel rule into the passed chain. Tunnel rules are inserted sequentially
# at the beginning of the 'NEW' section. # at the beginning of the 'NEW' section.
@ -896,15 +914,7 @@ sub copy_rules( $$ ) {
unless ( --$chain1->{references}{$name2} ) { unless ( --$chain1->{references}{$name2} ) {
delete $chain1->{references}{$name2}; delete $chain1->{references}{$name2};
unless ( keys %{$chain1->{references}} ) { delete_chain_and_references( $chain1 ) 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;
}
} }
} }
@ -2095,7 +2105,7 @@ sub setup_zone_mss() {
sub newexclusionchain() { sub newexclusionchain() {
my $seq = $chainseq++; my $seq = $chainseq++;
"excl${seq}"; "~excl${seq}";
} }
sub newlogchain() { sub newlogchain() {