X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Faddr_block.pm;h=7687334d7e9d5f0286a9c595d78d46ad32f98f39;hb=d4241783f38422179fe88e65175995f0d1804e69;hp=1f4000b75b3353e5c094d0e830d225fc0945e515;hpb=cf176d7745fa93c96c44f2802d02576e36e4bf98;p=freeside.git diff --git a/FS/FS/addr_block.pm b/FS/FS/addr_block.pm index 1f4000b75..7687334d7 100755 --- a/FS/FS/addr_block.pm +++ b/FS/FS/addr_block.pm @@ -4,6 +4,7 @@ use strict; use vars qw( @ISA ); use FS::Record qw( qsearchs qsearch dbh ); use FS::router; +use FS::addr_range; use FS::svc_broadband; use FS::Conf; use FS::IP_Mixin; @@ -259,7 +260,7 @@ sub next_free_addr { # also make sure it's not blocked from assignment by an address range if ( !$used{$freeaddr->addr } ) { my ($range) = grep { !$_->allow_use } - FS::addr_range->any_contains($freeaddr); + FS::addr_range->any_contains($freeaddr->addr); if ( !$range ) { # then we've found a free address return $freeaddr; @@ -411,8 +412,6 @@ sub label { ($router ? $router->routername : '(unallocated)'). ':'. $self->NetAddr; } -=back - =head1 BUGS Minimum block size should be a config option. It's hardcoded at /30 right