On 03/18/2016 07:33 AM, Ed W wrote:
> On 07/03/2016 21:22, Tom Eastep wrote:
>> On 03/05/2016 05:28 PM, Tom Eastep wrote:
>>> On 03/04/2016 09:45 AM, Ed W wrote:
>>>> Hi, Can I suggest a new feature:
>>>>
>>>> - I seem to be ending up with quite a lot of lines in my mangle file...
>>>> - Could it be possible to support the action.xxx method of creating new
>>>> tables through this file?
>>>>
> ...
>> Hi Ed,
>>
>> This will be in Shorewall 5.0.7 Beta 1. As implemented, mangle actions
>> must be declared as such in /etc/shorewall/actions.
> 
> Oh, yet again, fantastic support!!  Thanks!
> 
> Apologies for being stupidly slow in replying!!  I will test ASAP. It 
> will be much slower than I desire because I have to pull everything into 
> a build script for my embedded test environment (slows down development 
> significantly)
> 
> However, once again, thanks so much for being so responsive and quick 
> with these requests!!

Happy to help. You probably want to test with the attached patch; it
fixes a rather serious problem with mangle actions that Steven Springl
reported on the Development List.

Regards,
-Tom
-- 
Tom Eastep        \ When I die, I want to go like my Grandfather who
Shoreline,         \ died peacefully in his sleep. Not screaming like
Washington, USA     \ all of the passengers in his car
http://shorewall.net \________________________________________________
diff --git a/Shorewall/Perl/Shorewall/Rules.pm b/Shorewall/Perl/Shorewall/Rules.pm
index e2a698a..fc6488b 100644
--- a/Shorewall/Perl/Shorewall/Rules.pm
+++ b/Shorewall/Perl/Shorewall/Rules.pm
@@ -535,13 +535,13 @@ sub process_default_action( $$$$ ) {
 	} elsif ( ( $targets{$def} || 0 ) == INLINE ) {
 	    $default = $def;
 	    $default = "$def($param)" if supplied $param;
+	    $default = join( ':', $default, $level ) if $level ne 'none';
 	} elsif ( $default_option ) {
 	    fatal_error "Unknown Action ($default) in $policy setting";
 	} else {
 	    fatal_error "Unknown Default Action ($default)";
 	}
 
-	$default = join( ':', $default, $level ) if $level ne 'none';
     } else {
 	$default = $default_actions{$policy} || 'none';
     }
@@ -4544,14 +4544,14 @@ sub process_mangle_rule1( $$$$$$$$$$$$$$$$$$ ) {
 		#
 		# Capture the name of the action chain
 		#
-		$target = $ref->{name};
 	    } else {
 		#
 		# We've seen this tuple before
 		#
-		$target = $usedactions{$normalized_target}->{name};
+		$ref = $usedactions{$normalized_target};
 	    }
 
+	    $target = $ref->{name};
 	    $commandref->{allowedchains} = $ref->{allowedchains};
 	}
     };

Attachment: signature.asc
Description: OpenPGP digital signature

------------------------------------------------------------------------------
Transform Data into Opportunity.
Accelerate data analysis in your applications with
Intel Data Analytics Acceleration Library.
Click to learn more.
http://pubads.g.doubleclick.net/gampad/clk?id=278785231&iu=/4140
_______________________________________________
Shorewall-users mailing list
Shorewall-users@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/shorewall-users

Reply via email to