extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2025-01-15 18:18:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Make range-counting code a little less obscure

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

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

@ -650,11 +650,11 @@ sub do_proto( $$$ )
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};
for my $port ( @ports ) { my @ranges = grep /:/, @ports;
if ( $port =~ /:/ ) {
fatal_error "Port range in a list requires Extended Multiport Support in your kernel/iptables: $ports" unless $capabilities{XMULTIPORT}; if ( @ranges ) {
$count++; 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 $count > 15;
@ -671,11 +671,11 @@ sub do_proto( $$$ )
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};
for my $port ( @ports ) { my @ranges = grep /:/, @ports;
if ( $port =~ /:/ ) {
fatal_error "Port range in a list requires Extended Multiport Support in your kernel/iptables: $sports" unless $capabilities{XMULTIPORT}; if ( @ranges ) {
$count++; 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 $count > 15;

2
Shorewall-perl/Shorewall/Config.pm
View File

@ -31,7 +31,7 @@ use File::Basename;
our @ISA = qw(Exporter); our @ISA = qw(Exporter);
our @EXPORT = qw( our @EXPORT = qw(
warning_message warning_message
fatal_error fatal_error
find_file find_file
split_line split_line
open_file open_file