projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
9e0d1da
)
set Motorola-Canopy-Gateway, RT#41261
author
Ivan Kohler
<ivan@freeside.biz>
Tue, 5 Apr 2016 01:58:11 +0000
(18:58 -0700)
committer
Ivan Kohler
<ivan@freeside.biz>
Tue, 5 Apr 2016 01:58:11 +0000
(18:58 -0700)
FS/FS/svc_IP_Mixin.pm
patch
|
blob
|
history
diff --git
a/FS/FS/svc_IP_Mixin.pm
b/FS/FS/svc_IP_Mixin.pm
index
abafe86
..
8b2b5f1
100644
(file)
--- a/
FS/FS/svc_IP_Mixin.pm
+++ b/
FS/FS/svc_IP_Mixin.pm
@@
-186,7
+186,9
@@
means "Framed-Route" if there's an attached router.
sub radius_reply {
my $self = shift;
sub radius_reply {
my $self = shift;
+
my %reply = ();
my %reply = ();
+
if ( my $block = $self->attached_block ) {
# block routed over dynamic IP: "192.168.100.0/29 0.0.0.0 1"
# or
if ( my $block = $self->attached_block ) {
# block routed over dynamic IP: "192.168.100.0/29 0.0.0.0 1"
# or
@@
-196,21
+198,9
@@
sub radius_reply {
($self->ip_addr || '0.0.0.0') . ' 1';
}
($self->ip_addr || '0.0.0.0') . ' 1';
}
- if ( $self->router_routernum && FS::Conf->new->exists('radius-canopy') ) {
-
- my @addr_block =
- qsearch('addr_block', { routernum => $self->router_routernum } );
- if ( @addr_block ) {
-
- #?
- warn "Multiple address blocks attached to this service's router; using first"
- if scalar(@addr_block) > 1;
+ $reply{'Motorola-Canopy-Gateway'} = $self->addr_block->ip_gateway
+ if FS::Conf->new->exists('radius-canopy') && $self->addr_block;
- $reply{'Motorola-Canopy-Gateway'} = $addr_block[0]->ip_gateway
-
- }
-
- }
%reply;
}
%reply;
}