From 54a5e4af5223ec6e3f881cfeec158105e9eaef75 Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Wed, 19 Mar 2014 10:24:30 -0700 Subject: [PATCH] A couple of minor tweaks to the Chains module. Signed-off-by: Tom Eastep --- Shorewall/Perl/Shorewall/Chains.pm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Shorewall/Perl/Shorewall/Chains.pm b/Shorewall/Perl/Shorewall/Chains.pm index e0ff5e12f..bd68d119c 100644 --- a/Shorewall/Perl/Shorewall/Chains.pm +++ b/Shorewall/Perl/Shorewall/Chains.pm @@ -825,12 +825,13 @@ sub get_opttype( $$ ) { # $option, $default $opttype{$_[0]} || $_[1]; } -# # Next a helper for setting an individual option +# +# Next a helper for setting an individual option # sub set_rule_option( $$$ ) { my ( $ruleref, $option, $value ) = @_; - assert( defined $value && reftype $ruleref , $value, $ruleref ); + assert( defined $value && reftype $ruleref , $option, $ruleref ); $ruleref->{simple} = 0; $ruleref->{complex} = 1 if reftype $value; @@ -2332,7 +2333,7 @@ sub add_jump( $$$;$$$ ) { # # If the destination is a chain, mark it referenced # - $toref->{referenced} = 1, add_reference $fromref, $toref if $toref; + $toref->{referenced} = 1, add_reference( $fromref, $toref ) if $toref; my $param = $goto_ok && $toref && have_capability( 'GOTO_TARGET' ) ? 'g' : 'j'; @@ -3182,6 +3183,7 @@ sub check_optimization( $ ) { # Perform Optimization # # When an unreferenced chain is found, it is deleted unless its 'dont_delete' flag is set. +# sub optimize_level0() { for my $table ( qw/raw rawpost mangle nat filter/ ) { my $tableref = $chain_table{$table};