projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
merging RT 4.0.6
[freeside.git]
/
FS
/
FS
/
router.pm
diff --git
a/FS/FS/router.pm
b/FS/FS/router.pm
index
f66f2ce
..
6fa44b4
100755
(executable)
--- a/
FS/FS/router.pm
+++ b/
FS/FS/router.pm
@@
-40,6
+40,10
@@
fields are currently supported:
=item svcnum - svcnum of the owning FS::svc_broadband, if appropriate
=item svcnum - svcnum of the owning FS::svc_broadband, if appropriate
+=item manual_addr - set to 'Y' to allow services linked to this router
+to have any IP address, rather than one in an address block belonging
+to the router.
+
=back
=head1 METHODS
=back
=head1 METHODS
@@
-83,6
+87,7
@@
sub check {
my $error =
$self->ut_numbern('routernum')
|| $self->ut_text('routername')
my $error =
$self->ut_numbern('routernum')
|| $self->ut_text('routername')
+ || $self->ut_enum('manual_addr', [ '', 'Y' ])
|| $self->ut_agentnum_acl('agentnum', 'Broadband global configuration')
;
return $error if $error;
|| $self->ut_agentnum_acl('agentnum', 'Broadband global configuration')
;
return $error if $error;
@@
-128,6
+133,11
@@
sub delete {
Returns a list of FS::addr_block objects (address blocks) associated
with this object.
Returns a list of FS::addr_block objects (address blocks) associated
with this object.
+=item auto_addr_block
+
+Returns a list of address blocks on which auto-assignment of IP addresses
+is enabled.
+
=cut
sub addr_block {
=cut
sub addr_block {
@@
-135,6
+145,13
@@
sub addr_block {
return qsearch('addr_block', { routernum => $self->routernum });
}
return qsearch('addr_block', { routernum => $self->routernum });
}
+sub auto_addr_block {
+ my $self = shift;
+ return () if $self->manual_addr;
+ return qsearch('addr_block', { routernum => $self->routernum,
+ manual_flag => '' });
+}
+
=item part_svc_router
Returns a list of FS::part_svc_router objects associated with this
=item part_svc_router
Returns a list of FS::part_svc_router objects associated with this