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

Little cleanup of Steven's patch

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@5985 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2007-04-17 22:05:40 +00:00
parent cffa16852b
commit ddc6b76e93
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Shorewall-perl/Shorewall/Chains.pm
View File

@ -647,7 +647,6 @@ sub do_proto( $$$ )
my @ports = split /,/, $ports; my @ports = split /,/, $ports;
my $count = @ports; my $count = @ports;
if ( $count ) { if ( $count ) {
if ( $count > 1 ) { if ( $count > 1 ) {
fatal_error "Port list requires Multiport support in your kernel/iptables: $ports" unless $capabilities{MULTIPORT}; fatal_error "Port list requires Multiport support in your kernel/iptables: $ports" unless $capabilities{MULTIPORT};
@ -669,7 +668,6 @@ sub do_proto( $$$ )
@ports = split /,/, $sports; @ports = split /,/, $sports;
$count = @ports; $count = @ports;
if ( $count ) { if ( $count ) {
if ( $count > 1 ) { if ( $count > 1 ) {
fatal_error "Port list requires Multiport support in your kernel/iptables: $sports" unless $capabilities{MULTIPORT}; fatal_error "Port list requires Multiport support in your kernel/iptables: $sports" unless $capabilities{MULTIPORT};
@ -689,10 +687,9 @@ sub do_proto( $$$ )
} }
} elsif ( $proto =~ /^(icmp|1)$/i ) { } elsif ( $proto =~ /^(icmp|1)$/i ) {
my @ports = split /,/, $ports; my @ports = split /,/, $ports;
my $count = @ports; fatal_error 'Multiple ICMP types are not permitted' if @ports > 1;
fatal_error 'Multiple ICMP types are not permitted' if $count > 1;
$output .= "-p icmp "; $output .= "-p icmp ";
$output .= "--icmp-type $ports " if $count; $output .= "--icmp-type $ports " if @ports;
fatal_error 'SOURCE PORT(S) not permitted with ICMP' if $sports ne ''; fatal_error 'SOURCE PORT(S) not permitted with ICMP' if $sports ne '';
} elsif ( $proto =~ /^(ipp2p(:(tcp|udp|all)))?$/i ) { } elsif ( $proto =~ /^(ipp2p(:(tcp|udp|all)))?$/i ) {
require_capability( 'IPP2P' , 'PROTO = ipp2p' ); require_capability( 'IPP2P' , 'PROTO = ipp2p' );