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

Another fix for IPv6 address lists.

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2013-02-13 07:44:19 -08:00
parent 394850e68e
commit c5bb16ac26
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Shorewall/Perl/Shorewall/IPAddrs.pm
View File

@ -646,8 +646,15 @@ sub resolve_6dnsname( $ ) {
} }
sub validate_6net( $$ ) { sub validate_6net( $$ ) {
my ($net, $vlsm, $rest) = split( '/', $_[0], 3 ); my ( $net, $allow_name ) = @_;
my $allow_name = $_[0];
if ( $net =~ /^\[(.*)]$/ ) {
$net = $1;
} elsif ( $net =~ /^\[(.*)\]\/(\d+)$/ ) {
$net = join( '/', $1, $2 );
}
($net, my $vlsm, my $rest) = split( '/', $net, 3 );
if ( $net =~ /\+(\[?)/ ) { if ( $net =~ /\+(\[?)/ ) {
if ( $1 ) { if ( $1 ) {
@ -661,7 +668,6 @@ sub validate_6net( $$ ) {
fatal_error "Invalid Network address ($_[0])" unless supplied $net; fatal_error "Invalid Network address ($_[0])" unless supplied $net;
$net = $1 if $net =~ /^\[(.*)\]$/;
if ( defined $vlsm ) { if ( defined $vlsm ) {
fatal_error "Invalid VLSM ($vlsm)" unless $vlsm =~ /^\d+$/ && $vlsm <= 128; fatal_error "Invalid VLSM ($vlsm)" unless $vlsm =~ /^\d+$/ && $vlsm <= 128;