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

Catch loops in action invocation graph

Browse Source
This commit is contained in:
Tom Eastep 2010-12-27 16:41:53 -08:00
parent 6a7dad5e18
commit 297df02047
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -203,7 +203,7 @@ sub new_action( $ ) {
my $action = $_[0]; my $action = $_[0];
$actions{$action} = { actchain => '' }; $actions{$action} = { actchain => '', active => 0 };
} }
# #
@ -327,6 +327,8 @@ 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";
$actions{$action}{active}++;
fatal_error "Missing Action File ($actionfile)" unless -f $actionfile; fatal_error "Missing Action File ($actionfile)" unless -f $actionfile;
progress_message2 " Pre-processing $actionfile..."; progress_message2 " Pre-processing $actionfile...";
@ -369,6 +371,8 @@ sub process_action2( $ ) {
--$action_nest_level; --$action_nest_level;
pop_params( $oldparms ); pop_params( $oldparms );
$actions{$action}{active}--;
} }
sub process_actions2 () { sub process_actions2 () {
@ -836,6 +840,7 @@ sub process_rule_common ( $$$$$$$$$$$$$$$$ ) {
unless ( $inaction3 ) { unless ( $inaction3 ) {
fatal_error "An action may not invoke itself" if $basictarget eq $inaction1; fatal_error "An action may not invoke itself" if $basictarget eq $inaction1;
fatal_error "Action $basictarget called Recursively" 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