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

Merge branch 'master' into 4.4.21

Browse Source
This commit is contained in:
Tom Eastep 2011-07-02 07:02:50 -07:00
commit 46c4387397
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -53,6 +53,7 @@ our @EXPORT = qw(
progress_message3 progress_message3
supplied supplied
get_action_params get_action_params
get_action_chain
set_action_param set_action_param
); );
@ -1800,12 +1801,14 @@ sub embedded_perl( $ ) {
# #
# Push/pop action params # Push/pop action params
# #
sub push_action_params( $ ) { sub push_action_params( $$ ) {
my @params = split /,/, $_[0]; my @params = split /,/, $_[1];
my $oldparams = \@actparms; my $oldparams = \@actparms;
@actparms = (); @actparms = ();
$actparms[0] = $_[0];
for ( my $i = 1; $i <= @params; $i++ ) { for ( my $i = 1; $i <= @params; $i++ ) {
my $val = $params[$i - 1]; my $val = $params[$i - 1];
@ -1838,6 +1841,10 @@ sub get_action_params( $ ) {
@actparms[1..$num]; @actparms[1..$num];
} }
sub get_action_chain() {
$actparms[0];
}
sub set_action_param( $$ ) { sub set_action_param( $$ ) {
my $i = shift; my $i = shift;

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

@ -1465,7 +1465,7 @@ sub process_action( $) {
push_open $actionfile; push_open $actionfile;
my $oldparms = push_action_params( $param ); my $oldparms = push_action_params( $chainref, $param );
$active{$wholeaction}++; $active{$wholeaction}++;
push @actionstack, $wholeaction; push @actionstack, $wholeaction;