projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
RT# 39340 - fixed skin_info caching issue
[freeside.git]
/
FS
/
FS
/
addr_block.pm
diff --git
a/FS/FS/addr_block.pm
b/FS/FS/addr_block.pm
index
eb84daf
..
5fd64bf
100755
(executable)
--- a/
FS/FS/addr_block.pm
+++ b/
FS/FS/addr_block.pm
@@
-209,7
+209,7
@@
sub cidr {
=item free_addrs
=item free_addrs
-Returns a sorted list of free addresses in the block.
+Returns a
n aref
sorted list of free addresses in the block.
=cut
=cut
@@
-218,10
+218,14
@@
sub free_addrs {
my %used_addr_map =
map {$_ => 1}
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');
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
}
=item next_free_addr
@@
-250,7
+254,7
@@
sub next_free_addr {
$selfaddr->addr,
$selfaddr->network->addr,
$selfaddr->broadcast->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
);
# just do a linear search of the block