mirror of
https://gitlab.com/shorewall/code.git
synced 2024-12-16 03:10:39 +01:00
Take Guenther's advice
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@5987 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
parent
3a4f05823f
commit
e7ba2aa3c1
@ -645,19 +645,11 @@ sub do_proto( $$$ )
|
||||
if ( $proto =~ /^(tcp|udp|6|17)$/i ) {
|
||||
$output = "-p $proto ";
|
||||
my @ports = split /,/, $ports;
|
||||
my $count = @ports;
|
||||
if ( $count ) {
|
||||
if ( $count > 1 ) {
|
||||
if ( @ports ) {
|
||||
if ( @ports > 1 ) {
|
||||
fatal_error "Port list requires Multiport support in your kernel/iptables: $ports" unless $capabilities{MULTIPORT};
|
||||
|
||||
my @ranges = grep /:/, @ports;
|
||||
|
||||
if ( @ranges ) {
|
||||
fatal_error "Port range in a list requires Extended Multiport Support in your kernel/iptables: $ports" unless $capabilities{XMULTIPORT};
|
||||
$count += @ranges;
|
||||
}
|
||||
|
||||
fatal_error "Too many entries in port list: $ports" if $count > 15;
|
||||
fatal_error "Too many entries in port list: $ports" if $ports =~ tr/,:/,:/ > 14;
|
||||
|
||||
$output .= "-m multiport --dports $ports ";
|
||||
} else {
|
||||
@ -666,20 +658,12 @@ sub do_proto( $$$ )
|
||||
}
|
||||
|
||||
@ports = split /,/, $sports;
|
||||
$count = @ports;
|
||||
if ( $count ) {
|
||||
if ( $count > 1 ) {
|
||||
if ( @ports ) {
|
||||
if ( @ports > 1 ) {
|
||||
fatal_error "Port list requires Multiport support in your kernel/iptables: $sports" unless $capabilities{MULTIPORT};
|
||||
|
||||
my @ranges = grep /:/, @ports;
|
||||
|
||||
if ( @ranges ) {
|
||||
fatal_error "Port range in a list requires Extended Multiport Support in your kernel/iptables: $ports" unless $capabilities{XMULTIPORT};
|
||||
$count += @ranges;
|
||||
}
|
||||
|
||||
fatal_error "Too many entries in port list: $sports" if $count > 15;
|
||||
|
||||
|
||||
fatal_error "Too many entries in port list: $sports" if $sports =~ tr/,:/,:/ > 14;
|
||||
|
||||
$output .= "-m multiport --sports $sports ";
|
||||
} else {
|
||||
$output .= "--sport $sports ";
|
||||
|
Loading…
Reference in New Issue
Block a user