extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2024-12-23 22:58:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add address normalization to IPv6 range checking

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@9069 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2008-12-16 01:08:10 +00:00
parent 823ed26e30
commit 0b253b3b8a
1 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
Shorewall-perl/Shorewall/IPAddrs.pm
View File

@ -491,7 +491,7 @@ sub valid_6address( $ ) {
} }
return 0 if @address > $max; return 0 if @address > $max;
return 0 if @address < $max && ! $address =~ /::/; return 0 unless ( @address == $max ) || $address =~ /::/;
return 0 if $address =~ /:::/ || $address =~ /::.*::/; return 0 if $address =~ /:::/ || $address =~ /::.*::/;
if ( $address =~ /^:/ ) { if ( $address =~ /^:/ ) {
@ -546,22 +546,35 @@ sub validate_6net( $$ ) {
} }
} }
#
# Note: the input is assumed to be a valid IPv6 address
#
sub normalize_6addr( $ ) {
my $addr = shift;
while ( $addr =~ tr/:/:/ < 6 ) {
$addr =~ s/::/:0::/;
}
$addr =~ s/::/:0:/;
$addr;
}
sub validate_6range( $$ ) { sub validate_6range( $$ ) {
my ( $low, $high ) = @_; my ( $low, $high ) = @_;
validate_6address $low, 0; validate_6address $low, 0;
validate_6address $high, 0; validate_6address $high, 0;
my @low = split ":", $low; my @low = split ":", normalize_6addr( $low );
my @high = split ":", $high; my @high = split ":", normalize_6addr( $high );
if ( @low == @high ) { while ( @low ) {
while ( @low ) { my ( $l, $h) = ( shift @low, shift @high );
my ( $l, $h) = ( shift @low, shift @high ); next if $l eq $h;
next if $l eq $h; return 1 if hex "0x$l" < hex "0x$h";
return 1 if hex "0x$l" < hex "0x$h";
}
} }
fatal_error "Invalid IPv6 Range ($low-$high)"; fatal_error "Invalid IPv6 Range ($low-$high)";