X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2FFS%2Faddr_block.pm;h=1fb60606da9cd363d255f0a3adc3b33a704ec1d7;hp=b671723aafb9e1cb68f5305d8a60a9d4d9c29ea0;hb=649ceeca76084d16d22013124bd7f80f053d75c4;hpb=0354f39ed0e74fd2eae1d9da13906625b4f56591

diff --git a/FS/FS/addr_block.pm b/FS/FS/addr_block.pm
index b671723aa..1fb60606d 100755
--- a/FS/FS/addr_block.pm
+++ b/FS/FS/addr_block.pm
@@ -5,6 +5,7 @@ use vars qw( @ISA );
 use FS::Record qw( qsearchs qsearch dbh );
 use FS::router;
 use FS::svc_broadband;
+use FS::Conf;
 use NetAddr::IP;
 
 @ISA = qw( FS::Record );
@@ -121,7 +122,7 @@ sub check {
     }
   }
 
-  '';
+  $self->SUPER::check;
 }
 
 
@@ -172,9 +173,15 @@ there are no free addresses, returns false.
 sub next_free_addr {
   my $self = shift;
 
-  my @used = map { $_->NetAddr->addr } 
-      ($self, 
-       qsearch('svc_broadband', { blocknum => $self->blocknum }) );
+  my $conf = new FS::Conf;
+  my @excludeaddr = $conf->config('exclude_ip_addr');
+  
+my @used =
+( (map { $_->NetAddr->addr }
+    ($self,
+     qsearch('svc_broadband', { blocknum => $self->blocknum }))
+  ), @excludeaddr
+);
 
   my @free = $self->NetAddr->hostenum;
   while (my $ip = shift @free) {
@@ -318,5 +325,7 @@ To be implemented.
 Minimum block size should be a config option.  It's hardcoded at /30 right
 now because that's the smallest block that makes any sense at all.
 
+=cut
+
 1;