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

Handle port numbers being passed to one of the tcp-specific actions

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2013-02-02 12:48:54 -08:00
parent ca5a70aa6f
commit ebef29e161
2 changed files with 10 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

@ -748,6 +748,15 @@ sub set_rule_option( $$$ ) {
} elsif ( $opttype == EXCLUSIVE ) { } elsif ( $opttype == EXCLUSIVE ) {
$ruleref->{$option} .= ",$value"; $ruleref->{$option} .= ",$value";
} elsif ( $opttype == UNIQUE ) { } elsif ( $opttype == UNIQUE ) {
#
# Shorewall::Rules::perl_action_tcp_helper() can produce rules that have two -p specifications.
# The first will have a modifier like '! --syn' while the second will not. We want to retain
# the first while
if ( $option eq 'p' ) {
my ( $proto ) = split( ' ', $ruleref->{p} );
return if $proto eq $value;
}
fatal_error "Multiple $option settings in one rule is prohibited"; fatal_error "Multiple $option settings in one rule is prohibited";
} else { } else {
assert(0, $opttype ); assert(0, $opttype );

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

@ -2786,7 +2786,7 @@ sub perl_action_tcp_helper($$) {
merge_target( $ref, $target ), merge_target( $ref, $target ),
'', '',
@columns[0,1], @columns[0,1],
'-', 6,
@columns[3..LAST_COLUMN] @columns[3..LAST_COLUMN]
); );
} else { } else {