use vars qw( @ISA );
use FS::Record qw( qsearchs qsearch dbh );
use FS::router;
+use FS::addr_range;
use FS::svc_broadband;
+use FS::svc_acct;
use FS::Conf;
+use FS::IP_Mixin;
use NetAddr::IP;
use Carp qw( carp );
use List::Util qw( first );
return qsearch('svc_broadband', { blocknum => $self->blocknum });
}
+=item svc_acct
+
+Returns a list of FS::svc_broadband objects associated
+with this object.
+
+=cut
+
+sub svc_acct {
+ my $self = shift;
+ return qsearch('svc_acct', { blocknum => $self->blocknum });
+}
+
=item NetAddr
Returns a NetAddr::IP object for this block's address and netmask.
my $self = shift;
my $selfaddr = $self->NetAddr;
- return if $self->manual_flag;
+ return () if $self->manual_flag;
my $conf = new FS::Conf;
my @excludeaddr = $conf->config('exclude_ip_addr');
$selfaddr->addr,
$selfaddr->network->addr,
$selfaddr->broadcast->addr,
- (map { $_->NetAddr->addr }
- qsearch('svc_broadband', { blocknum => $self->blocknum })
- ), @excludeaddr
+ FS::IP_Mixin->used_addresses($self)
);
# just do a linear search of the block
my $freeaddr = $selfaddr->network + 1;
while ( $freeaddr < $selfaddr->broadcast ) {
- return $freeaddr unless $used{ $freeaddr->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->addr);
+ if ( !$range ) {
+ # then we've found a free address
+ return $freeaddr;
+ }
+ # otherwise, skip to the end of the range
+ $freeaddr = NetAddr::IP->new($range->end, $self->ip_netmask);
+ }
$freeaddr++;
}
return;
($router ? $router->routername : '(unallocated)'). ':'. $self->NetAddr;
}
-=back
-
=head1 BUGS
Minimum block size should be a config option. It's hardcoded at /30 right