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

Remove unnecessary text and 'before' images from trace entries

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2010-03-30 07:12:22 -07:00
parent 7e97e9519d
commit b2d8039ff6
1 changed files with 20 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -455,12 +455,13 @@ sub add_commands ( $$;@ ) {
my $chainref = shift @_; my $chainref = shift @_;
my $indentation = ' ' x $chainref->{cmdlevel}; my $indentation = ' ' x $chainref->{cmdlevel};
push @{$chainref->{rules}}, join ('', $indentation , $_ ) for @_;
if ( $debug ) { if ( $debug ) {
trace( $chainref, 'T', undef, "${indentation}$_\n" ) for @_; my $rulenum = @{$chainref->{rules}};
trace( $chainref, 'T', ++$rulenum, "${indentation}$_\n" ) for @_;
} }
push @{$chainref->{rules}}, join ('', $indentation , $_ ) for @_;
$chainref->{referenced} = 1; $chainref->{referenced} = 1;
} }
@ -476,8 +477,7 @@ sub push_rule( $$ ) {
} else { } else {
push @{$chainref->{rules}}, $rule; push @{$chainref->{rules}}, $rule;
$chainref->{referenced} = 1; $chainref->{referenced} = 1;
my $rulenum; trace( $chainref, 'A', @{$chainref->{rules}}, $rule ) if $debug;
$rulenum=@{$chainref->{rules}}, trace( $chainref, 'A', $rulenum, $rule ) if $debug;
} }
} }
@ -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, 'D', undef, qq("$_" Deleted) ) if $debug; trace( $fromref, 'D', $rule, $_ ) if $debug;
$_ = undef; $_ = undef;
} }
} }
@ -734,7 +734,7 @@ sub move_rules( $$ ) {
$chain2->{referenced} = 1; $chain2->{referenced} = 1;
$chain1->{referenced} = 0; $chain1->{referenced} = 0;
$chain1->{rules} = []; $chain1->{rules} = [];
trace( $chain1, 'X', undef, 'Deleted' ) if $debug; trace( $chain1, 'X', undef, '' ) if $debug;
$count; $count;
} }
} }
@ -779,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, 'Deleted' ) if $debug; trace( $chain1, 'X', undef, '' ) if $debug;
} }
} }
} }
@ -1383,14 +1383,9 @@ sub optimize_chain( $ ) {
my $rule = 0; my $rule = 0;
for ( @{$fromref->{rules}} ) { for ( @{$fromref->{rules}} ) {
$rule++; $rule++;
if ( defined && s/ -[jg] $chainref->{name}$/ -j ACCEPT/ ) {
if ( defined ) { $count++;
my $before; trace( $chainref, 'R', $rule, $_ ) if $debug;
$before = $_ if $debug;
if ( s/ -[jg] $chainref->{name}$/ -j ACCEPT/ ) {
$count++;
trace( $chainref, 'R', $rule, qq("$before" replaced by "$_") ) if $debug;
}
} }
} }
} }
@ -1416,7 +1411,7 @@ sub delete_references( $ ) {
$rule++; $rule++;
if ( defined && / -[jg] $chainref->{name}$/ ) { if ( defined && / -[jg] $chainref->{name}$/ ) {
trace( $fromref, 'D', $rule, qq("$_" Deleted) ) if $debug; trace( $fromref, 'D', $rule, $_ ) if $debug;
$_ = undef; $_ = undef;
$count++; $count++;
} }
@ -1451,13 +1446,9 @@ sub replace_references( $$ ) {
my $rule = 0; my $rule = 0;
for ( @{$fromref->{rules}} ) { for ( @{$fromref->{rules}} ) {
$rule++; $rule++;
if ( defined ) { if ( defined && s/ -([jg]) $chainref->{name}(\b)/ -$1 ${target}$2/ ) {
my $before; $count++;
$before = $_ if $debug; trace( $fromref, 'R', $rule, $_ ) if $debug;
if ( s/ -([jg]) $chainref->{name}(\b)/ -$1 ${target}$2/ ) {
$count++;
trace( $fromref, 'R', $rule, qq("$before" replaced by "$_") ) if $debug;
}
} }
} }
} }
@ -1471,13 +1462,9 @@ sub replace_references( $$ ) {
my $rule = 0; my $rule = 0;
for ( @{$fromref->{rules}} ) { for ( @{$fromref->{rules}} ) {
$rule++; $rule++;
if ( defined ) { if ( defined && s/ -[jg] $chainref->{name}(\b)/ -j ${target}$1/ ) {
my $before; $count++ ;
$before = $_ if $debug; trace( $fromref, 'R', $rule, $_ ) if $debug;
if ( s/ -[jg] $chainref->{name}(\b)/ -j ${target}$1/ ) {
$count++ ;
trace( $fromref, 'R', $rule, qq( "$before" replaced by "$_") ) if $debug;
}
} }
} }
} }
@ -1511,15 +1498,13 @@ sub replace_references1( $$$ ) {
$rule++; $rule++;
if ( defined ) { if ( defined ) {
if ( /^-A $fromref->{name} .*-[jg] $chainref->{name}\b/ ) { if ( /^-A $fromref->{name} .*-[jg] $chainref->{name}\b/ ) {
my $before;
$before = $_ if $debug;
# #
# Prevent multiple '-p' matches # Prevent multiple '-p' matches
# #
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/;
$count++; $count++;
trace( $fromref, 'R', $rule, qq( "$before" replaced by "$_") ) if $debug; trace( $fromref, 'R', $rule, $_ ) if $debug;
} }
} }
} }
@ -1536,15 +1521,13 @@ sub replace_references1( $$$ ) {
$rule++; $rule++;
if ( defined ) { if ( defined ) {
if ( /^-A $fromref->{name} .*-[jg] $chainref->{name}\b/ ) { if ( /^-A $fromref->{name} .*-[jg] $chainref->{name}\b/ ) {
my $before;
$before = $_ if $debug;
# #
# Prevent multiple '-p' matches # Prevent multiple '-p' matches
# #
s/ -p [^ ]+ / / if / -p / && $matches =~ / -p /; s/ -p [^ ]+ / / if / -p / && $matches =~ / -p /;
s/\s+-[jg] $chainref->{name}(\b)/$matches -j ${target}$1/; s/\s+-[jg] $chainref->{name}(\b)/$matches -j ${target}$1/;
$count++; $count++;
trace( $fromref, 'R', $rule, qq( "$before" replaced by "$_") ) if $debug; trace( $fromref, 'R', $rule, $_ ) if $debug;
} }
} }
} }