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

Handle nested params in push_action_params()

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2012-12-09 10:45:29 -08:00
parent 88d4814209
commit 14cdaf21fc
1 changed files with 58 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
Shorewall/Perl/Shorewall/Config.pm
View File

@ -1697,6 +1697,10 @@ sub split_list1( $$;$ ) {
@list2;
}
#
# The next two functions split a list which contain arbitrarily deep paren nesting.
# The first splits on ':' and the second on ','.
#
sub split_list2( $$ ) {
my ($list, $type ) = @_;
@ -1750,6 +1754,59 @@ sub split_list2( $$ ) {
@list2;
}
sub split_list3( $$ ) {
my ($list, $type ) = @_;
fatal_error "Invalid $type ($list)" if $list =~ /^,|,,/;
my @list1 = split /,/, $list;
my @list2;
my $element = '';
my $opencount = 0;
for ( @list1 ) {
my $count;
if ( ( $count = tr/(/(/ ) > 0 ) {
$opencount += $count;
if ( $element eq '' ) {
$element = $_;
} else {
$element = join( ',', $element, $_ );
}
if ( ( $count = tr/)/)/ ) > 0 ) {
if ( ! ( $opencount -= $count ) ) {
push @list2 , $element;
$element = '';
} else {
fatal_error "Invalid $type ($list)" if $opencount < 0;
}
}
} elsif ( ( $count = tr/)/)/ ) > 0 ) {
fatal_error "Invalid $type ($list)" if $element eq '';
$element = join (',', $element, $_ );
if ( ! ( $opencount -= $count ) ) {
push @list2 , $element;
$element = '';
} else {
fatal_error "Invalid $type ($list)" if $opencount < 0;
}
} elsif ( $element eq '' ) {
push @list2 , $_;
} else {
$element = join ',', $element , $_;
}
}
unless ( $opencount == 0 ) {
fatal_error "Invalid $type ($list)";
}
@list2;
}
#
# Determine if a value has been supplied
#
@ -2510,7 +2567,7 @@ sub embedded_perl( $ ) {
# Push/pop action params
#
sub push_action_params( $$$$ ) {
my @params = ( undef , split_list1( $_[1], 'parameter', 1 ) );
my @params = ( undef , split_list3( $_[1], 'parameter' ) );
my %oldparams = %actparms;
%actparms = ();