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

Always place 'nfacct' last

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2013-04-18 15:26:34 -07:00
parent d3e9a2f7e8
commit 9c010691a3
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Shorewall/Perl/Shorewall/Chains.pm
View File

@ -610,7 +610,8 @@ use constant { UNIQUE => 1,
EXCLUSIVE => 4, EXCLUSIVE => 4,
MATCH => 8, MATCH => 8,
CONTROL => 16, CONTROL => 16,
COMPLEX => 32 COMPLEX => 32,
LAST => 64,
}; };
our %opttype = ( rule => CONTROL, our %opttype = ( rule => CONTROL,
@ -646,6 +647,8 @@ our %opttype = ( rule => CONTROL,
jump => TARGET, jump => TARGET,
target => TARGET, target => TARGET,
targetopts => TARGET, targetopts => TARGET,
nfacct => LAST,
); );
our %aliases = ( protocol => 'p', our %aliases = ( protocol => 'p',
@ -1014,6 +1017,10 @@ sub format_rule( $$;$ ) {
$rule .= format_option( $_, pop_match( $ruleref, $_ ) ); $rule .= format_option( $_, pop_match( $ruleref, $_ ) );
} }
for ( grep( ( $opttype{$_} || 0 ) == LAST , @{$ruleref->{matches}} ) ) {
$rule .= format_option( $_, pop_match( $ruleref, $_ ) );
}
if ( $ruleref->{target} ) { if ( $ruleref->{target} ) {
$rule .= join( ' ', " -$ruleref->{jump}", $ruleref->{target} ); $rule .= join( ' ', " -$ruleref->{jump}", $ruleref->{target} );
$rule .= join( '', ' ', $ruleref->{targetopts} ) if $ruleref->{targetopts}; $rule .= join( '', ' ', $ruleref->{targetopts} ) if $ruleref->{targetopts};