projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
68b54c1
)
When next_free_addr returned undef, we were trying to call addr on an undefined objec...
author
khoff
<khoff>
Fri, 27 Feb 2004 21:21:51 +0000
(21:21 +0000)
committer
khoff
<khoff>
Fri, 27 Feb 2004 21:21:51 +0000
(21:21 +0000)
FS/FS/svc_broadband.pm
patch
|
blob
|
history
diff --git
a/FS/FS/svc_broadband.pm
b/FS/FS/svc_broadband.pm
index
ec91532
..
7789806
100755
(executable)
--- a/
FS/FS/svc_broadband.pm
+++ b/
FS/FS/svc_broadband.pm
@@
-155,8
+155,10
@@
sub check {
if($self->speed_down < 0) { return 'speed_down must be positive'; }
if (not($self->ip_addr) or $self->ip_addr eq '0.0.0.0') {
if($self->speed_down < 0) { return 'speed_down must be positive'; }
if (not($self->ip_addr) or $self->ip_addr eq '0.0.0.0') {
- $self->ip_addr($self->addr_block->next_free_addr->addr);
- if (not $self->ip_addr) {
+ my $next_addr = $self->addr_block->next_free_addr;
+ if ($next_addr) {
+ $self->ip_addr($next_addr->addr);
+ } else {
return "No free addresses in addr_block (blocknum: ".$self->blocknum.")";
}
}
return "No free addresses in addr_block (blocknum: ".$self->blocknum.")";
}
}