X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=FS%2FFS%2Faddr_block.pm;h=a39e1f1bb6e70362b62d7ee96e8a2a6250cef4f3;hb=2ee7f0c27233d800254d5244fc5913d881b48800;hp=686bdbd1819c486d9072a434c52bdf6f8d73bed2;hpb=0af38652da3b3be7da2d35b048285ef6f2194e1a;p=freeside.git

diff --git a/FS/FS/addr_block.pm b/FS/FS/addr_block.pm
index 686bdbd18..a39e1f1bb 100755
--- a/FS/FS/addr_block.pm
+++ b/FS/FS/addr_block.pm
@@ -4,8 +4,11 @@ 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::svc_acct;
 use FS::Conf;
+use FS::IP_Mixin;
 use NetAddr::IP;
 use Carp qw( carp );
 use List::Util qw( first );
@@ -201,6 +204,18 @@ sub svc_broadband {
   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.
@@ -223,6 +238,23 @@ sub cidr {
   $self->NetAddr->cidr;
 }
 
+=item free_addrs
+
+Returns a sorted list of free addresses in the block.
+
+=cut
+
+sub free_addrs {
+  my $self = shift;
+
+  my %used_addr_map =
+    map {$_ => 1}
+    FS::IP_Mixin->used_addresses_in_block($self),
+    FS::Conf->new()->config('exclude_ip_addr');
+
+  grep { !exists $used_addr_map{$_} } map { $_->addr } $self->NetAddr->hostenum;
+}
+
 =item next_free_addr
 
 Returns a NetAddr::IP object corresponding to the first unassigned address 
@@ -238,7 +270,7 @@ sub next_free_addr {
   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');
@@ -249,15 +281,23 @@ sub next_free_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;
@@ -402,8 +442,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
@@ -412,4 +450,3 @@ now because that's the smallest block that makes any sense at all.
 =cut
 
 1;
-