projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
don't show error messages about FreesideStatus index already existing either
[freeside.git]
/
FS
/
FS
/
addr_block.pm
diff --git
a/FS/FS/addr_block.pm
b/FS/FS/addr_block.pm
index
c5ddca7
..
208684b
100755
(executable)
--- a/
FS/FS/addr_block.pm
+++ b/
FS/FS/addr_block.pm
@@
-122,7
+122,7
@@
sub check {
}
}
}
}
-
''
;
+
$self->SUPER::check
;
}
}
@@
-158,8
+158,18
@@
Returns a NetAddr::IP object for this block's address and netmask.
sub NetAddr {
my $self = shift;
sub NetAddr {
my $self = shift;
+ new NetAddr::IP ($self->ip_gateway, $self->ip_netmask);
+}
+
+=item cidr
+
+Returns a CIDR string for this block's address and netmask, i.e. 10.4.20.0/24
- return new NetAddr::IP ($self->ip_gateway, $self->ip_netmask);
+=cut
+
+sub cidr {
+ my $self = shift;
+ $self->NetAddr->cidr;
}
=item next_free_addr
}
=item next_free_addr
@@
-176,11
+186,12
@@
sub next_free_addr {
my $conf = new FS::Conf;
my @excludeaddr = $conf->config('exclude_ip_addr');
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 @used =
+( (map { $_->NetAddr->addr }
+ ($self,
+ qsearch('svc_broadband', { blocknum => $self->blocknum }))
+ ), @excludeaddr
+);
my @free = $self->NetAddr->hostenum;
while (my $ip = shift @free) {
my @free = $self->NetAddr->hostenum;
while (my $ip = shift @free) {