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

Rename a variable; reformat an error message

Browse Source
This commit is contained in:
Tom Eastep 2010-12-28 07:49:35 -08:00
parent cc30fc4dbb
commit 50a3b76e40
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Shorewall/Perl/Shorewall/Rules.pm
View File

@ -62,7 +62,7 @@ use constant { MAX_MACRO_NEST_LEVEL => 5 };
our $macro_nest_level; our $macro_nest_level;
our @actions; our @actionstack;
# #
# Rather than initializing globals in an INIT block or during declaration, # Rather than initializing globals in an INIT block or during declaration,
@ -77,7 +77,7 @@ our @actions;
sub initialize( $ ) { sub initialize( $ ) {
$family = shift; $family = shift;
%macros = (); %macros = ();
@actions = (); @actionstack = ();
$macro_nest_level = 0; $macro_nest_level = 0;
if ( $family == F_IPV4 ) { if ( $family == F_IPV4 ) {
@ -328,7 +328,7 @@ sub process_action2( $ ) {
my ( $action , $level, $tag, $param ) = split /:/, $wholeaction; my ( $action , $level, $tag, $param ) = split /:/, $wholeaction;
my $actionfile = find_file "action.$action"; my $actionfile = find_file "action.$action";
push @actions, $action; push @actionstack, $action;
$actions{$action}{active}++; $actions{$action}{active}++;
@ -373,7 +373,7 @@ sub process_action2( $ ) {
$actions{$action}{active}--; $actions{$action}{active}--;
pop @actions; pop @actionstack;
} }
sub process_actions2 () { sub process_actions2 () {
@ -840,7 +840,8 @@ sub process_rule_common ( $$$$$$$$$$$$$$$$ ) {
$normalized_target = normalize_action( $basictarget, $loglevel, $param ); $normalized_target = normalize_action( $basictarget, $loglevel, $param );
unless ( $inaction3 ) { unless ( $inaction3 ) {
fatal_error( "Action $basictarget invoked Recursively:" . join( '->', @actions, $basictarget ) ) if $actions{$basictarget}{active}; fatal_error( "Action $basictarget invoked Recursively (" . join( '->', @actionstack, $basictarget ) . ')' ) if $actions{$basictarget}{active};
if ( my $ref = use_action( $normalized_target ) ) { if ( my $ref = use_action( $normalized_target ) ) {
# #
# First reference to this tupple # First reference to this tupple