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

Clean up use_policy_action()

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2016-01-17 12:35:12 -08:00
parent 1ee645cd79
commit 4059e9de95
1 changed files with 27 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1935,40 +1935,39 @@ sub use_policy_action( $$ ) {
my $ref = use_action( $normalized_target ); my $ref = use_action( $normalized_target );
if ( $ref ) { if ( $ref ) {
my $result = process_action( $ref, $caller ); if ( my $result = process_action( $ref, $caller ) ) {
if ( $result & PARMSMODIFIED ) {
if ( $result & PARMSMODIFIED ) { delete $usedactions{$ref->{action}};
delete $usedactions{$ref->{action}};
} elsif ( $result & USEDCALLER ) {
#
# The chain uses @CALLER but doesn't modify the action parameters.
# We need to see if this chain has already called this action
#
my $renormalized_target = insert_caller( $normalized_target, $caller );
my $ref1 = $usedactions{$renormalized_target};
if ( $ref1 ) {
#
# It has -- use the prior chain
#
$ref = $ref1;
#
# We leave the new chain in place but delete it from %usedactions below
#
} else { } else {
# #
# This is the first time that the current chain has invoked this action # The chain uses @CALLER but doesn't modify the action parameters.
# We need to see if this chain has already called this action
# #
$usedactions{$renormalized_target} = $ref; my $renormalized_target = insert_caller( $normalized_target, $caller );
if ( my $ref1 = $usedactions{$renormalized_target} ) {
#
# It has -- use the prior chain
#
$ref = $ref1;
#
# We leave the new chain in place but delete it from %usedactions below
#
} else {
#
# This is the first time that the current chain has invoked this action
#
$usedactions{$renormalized_target} = $ref;
#
# Swap the action member
#
$ref->{action} = $renormalized_target;
}
# #
# Swap the action member # Delete the usedactions entry with the original normalized key
# #
$ref->{action} = $renormalized_target; delete $usedactions{$normalized_target};
} }
#
# Delete the usedactions entry with the original normalized key
#
delete $usedactions{$normalized_target};
} }
} else { } else {
$ref = $usedactions{$normalized_target}; $ref = $usedactions{$normalized_target};