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

Eliminate max nest level on actions

Browse Source
This commit is contained in:
Tom Eastep 2010-12-27 17:16:34 -08:00
parent 0c3ed598ca
commit cc30fc4dbb
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -58,10 +58,9 @@ our @builtins;
# #
our $rule_commands = { COMMENT => 0, FORMAT => 2 }; our $rule_commands = { COMMENT => 0, FORMAT => 2 };
use constant { MAX_MACRO_NEST_LEVEL => 5 , MAX_ACTION_NEST_LEVEL => 5 }; use constant { MAX_MACRO_NEST_LEVEL => 5 };
our $macro_nest_level; our $macro_nest_level;
our $action_nest_level;
our @actions; our @actions;
@ -80,7 +79,6 @@ sub initialize( $ ) {
%macros = (); %macros = ();
@actions = (); @actions = ();
$macro_nest_level = 0; $macro_nest_level = 0;
$action_nest_level = 0;
if ( $family == F_IPV4 ) { if ( $family == F_IPV4 ) {
@builtins = qw/dropBcast allowBcast dropNotSyn rejNotSyn dropInvalid allowInvalid allowinUPnP forwardUPnP Limit/; @builtins = qw/dropBcast allowBcast dropNotSyn rejNotSyn dropInvalid allowInvalid allowinUPnP forwardUPnP Limit/;
@ -338,8 +336,6 @@ sub process_action2( $ ) {
progress_message2 " Pre-processing $actionfile..."; progress_message2 " Pre-processing $actionfile...";
fatal_error "Actions nested too deeply" if ++$action_nest_level > MAX_ACTION_NEST_LEVEL;
push_open( $actionfile ); push_open( $actionfile );
my $oldparms = push_params( $param ); my $oldparms = push_params( $param );
@ -373,8 +369,6 @@ sub process_action2( $ ) {
pop_open; pop_open;
--$action_nest_level;
pop_params( $oldparms ); pop_params( $oldparms );
$actions{$action}{active}--; $actions{$action}{active}--;