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

Push/pop $actionresult.

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2013-02-03 12:43:28 -08:00
parent 014b4ddc50
commit 30d96afb69
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2436,8 +2436,6 @@ sub process_rule ( $$$$$$$$$$$$$$$$$$$$ ) {
#
# First reference to this tuple
#
$actionresult = 0;
$delete_action = process_action( $ref, $chain );
#
# Processing the action may determine that the action or one of it's dependents does NAT or HELPER, so:
@ -2460,7 +2458,7 @@ sub process_rule ( $$$$$$$$$$$$$$$$$$$$ ) {
#
# Push the current column array onto the column stack
#
push @columnstack, [ ( @columns ) ];
push @columnstack, [ ( $actionresult, @columns ) ];
#
# And store the (modified) columns into the columns array for use by perl_action[_tcp]_helper
#
@ -2488,13 +2486,13 @@ sub process_rule ( $$$$$$$$$$$$$$$$$$$$ ) {
$headers,
$condition,
$helper,
$wildcard );
$wildcard ) || $actionresult;
@columns = @{pop @columnstack};
( $actionresult, @columns ) = @{pop @columnstack};
$macro_nest_level--;
return $generated || $actionresult;
return $generated;
}
#
# Generate Fixed part of the rule