X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Faddr_block.pm;h=5fd64bf7a861b6df848f92a9f844f93bb047b576;hb=c2dbe36096332d1e09bc58d7d9903e05247f0c9b;hp=eb84dafc32ed03d0c201a1c46599b314d043e8fe;hpb=b79b0ebca0c15ad527de3d589cda36da63b0601e;p=freeside.git diff --git a/FS/FS/addr_block.pm b/FS/FS/addr_block.pm index eb84dafc3..5fd64bf7a 100755 --- a/FS/FS/addr_block.pm +++ b/FS/FS/addr_block.pm @@ -209,7 +209,7 @@ sub cidr { =item free_addrs -Returns a sorted list of free addresses in the block. +Returns an aref sorted list of free addresses in the block. =cut @@ -218,10 +218,14 @@ sub free_addrs { my %used_addr_map = map {$_ => 1} - FS::IP_Mixin->used_addresses_in_block($self), + FS::IP_Mixin->used_addresses($self), FS::Conf->new()->config('exclude_ip_addr'); - grep { !exists $used_addr_map{$_} } map { $_->addr } $self->NetAddr->hostenum; + [ + grep { !exists $used_addr_map{$_} } + map { $_->addr } + $self->NetAddr->hostenum + ]; } =item next_free_addr @@ -250,7 +254,7 @@ sub next_free_addr { $selfaddr->addr, $selfaddr->network->addr, $selfaddr->broadcast->addr, - FS::IP_Mixin->used_addresses_in_block($self) + FS::IP_Mixin->used_addresses($self) ); # just do a linear search of the block