extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2025-06-20 17:58:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

Remove special trace entries

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2010-03-28 16:31:03 -07:00
parent 1fd656b8c9
commit 6d7226ae93
1 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -605,7 +605,7 @@ sub purge_jump ( $$ ) {
for ( @{$fromref->{rules}} ) { for ( @{$fromref->{rules}} ) {
$rule++; $rule++;
if ( defined && / -[gj] ${to}\b/ ) { if ( defined && / -[gj] ${to}\b/ ) {
trace( $fromref, 'X', undef, qq("$_" Deleted) ) if $debug; trace( $fromref, 'D', undef, qq("$_" Deleted) ) if $debug;
$_ = undef; $_ = undef;
} }
} }
@ -719,6 +719,11 @@ sub move_rules( $$ ) {
( s/\-([AI]) $name /-$1 $chain2->{name} / ) for @{$chain1->{rules}}; ( s/\-([AI]) $name /-$1 $chain2->{name} / ) for @{$chain1->{rules}};
if ( $debug ) {
my $rule = @{$chain1->{rules}};
trace( $chain2, 'A', ++$rule, $_ ) for @{$chain1->{rules}};
}
splice @{$rules}, 0, 0, @{$chain1->{rules}}; splice @{$rules}, 0, 0, @{$chain1->{rules}};
# #
# In a firewall->x policy chain, multiple DHCP ACCEPT rules can be moved to the head of the chain. # In a firewall->x policy chain, multiple DHCP ACCEPT rules can be moved to the head of the chain.
@ -729,7 +734,7 @@ sub move_rules( $$ ) {
$chain2->{referenced} = 1; $chain2->{referenced} = 1;
$chain1->{referenced} = 0; $chain1->{referenced} = 0;
$chain1->{rules} = []; $chain1->{rules} = [];
trace( $chain2, 'M', undef, "Moved $count rules from chain $chain1->{name}" ), trace( $chain1, 'X', undef, 'Deleted' ) if $debug; trace( $chain1, 'X', undef, 'Deleted' ) if $debug;
$count; $count;
} }
} }
@ -742,6 +747,7 @@ sub copy_rules( $$ ) {
my ($chain1, $chain2 ) = @_; my ($chain1, $chain2 ) = @_;
my $name1 = $chain1->{name}; my $name1 = $chain1->{name};
my $name = $name1;
my $name2 = $chain2->{name}; my $name2 = $chain2->{name};
my @rules = @{$chain1->{rules}}; my @rules = @{$chain1->{rules}};
my $rules = $chain2->{rules}; my $rules = $chain2->{rules};
@ -755,7 +761,10 @@ sub copy_rules( $$ ) {
my $last = pop @$rules; # Delete the jump to chain1 my $last = pop @$rules; # Delete the jump to chain1
trace( $chain2, 'C', undef, "$count rules appended from chain $chain1->{name}" ) if $debug; if ( $debug ) {
my $rule = @$rules;
trace( $chain2, 'A', ++$rule, $_ ) for @rules;
}
push @$rules, @rules; push @$rules, @rules;
# #
@ -770,7 +779,7 @@ sub copy_rules( $$ ) {
unless ( keys %{$chain1->{references}} ) { unless ( keys %{$chain1->{references}} ) {
$chain1->{referenced} = 0; $chain1->{referenced} = 0;
progress_message " Unreferenced chain $name1 deleted"; progress_message " Unreferenced chain $name1 deleted";
trace( $chain1, 'X', undef, 'Invalidated' ) if $debug; trace( $chain1, 'X', undef, 'Deleted' ) if $debug;
} }
} }
} }
@ -1407,7 +1416,7 @@ sub delete_references( $ ) {
$rule++; $rule++;
if ( defined && / -[jg] $chainref->{name}$/ ) { if ( defined && / -[jg] $chainref->{name}$/ ) {
trace( $fromref, 'D', $rule, qq("$_" Invalidated) ) if $debug; trace( $fromref, 'D', $rule, qq("$_" Deleted) ) if $debug;
$_ = undef; $_ = undef;
$count++; $count++;
} }