From 7109ab0b7108ee365fbc958eaaf9e473f2332c08 Mon Sep 17 00:00:00 2001 From: Ivan Kohler Date: Mon, 21 Mar 2016 18:00:34 -0700 Subject: [PATCH] set Motorola-Canopy-Gateway, RT#41261 --- FS/FS/svc_IP_Mixin.pm | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/FS/FS/svc_IP_Mixin.pm b/FS/FS/svc_IP_Mixin.pm index 5b06082a1..c0f202e6d 100644 --- a/FS/FS/svc_IP_Mixin.pm +++ b/FS/FS/svc_IP_Mixin.pm @@ -1,9 +1,10 @@ package FS::svc_IP_Mixin; +use base 'FS::IP_Mixin'; use strict; -use base 'FS::IP_Mixin'; -use FS::Record qw(qsearchs qsearch); use NEXT; +use FS::Record qw(qsearchs qsearch); +use FS::Conf; =item addr_block @@ -183,16 +184,18 @@ means "Framed-Route" if there's an attached router. sub radius_reply { my $self = shift; - my %reply; - my ($block) = $self->attached_block; - if ( $block ) { + my %reply = (); + if ( my $block = $self->attached_block ) { # block routed over dynamic IP: "192.168.100.0/29 0.0.0.0 1" # or # block routed over fixed IP: "192.168.100.0/29 192.168.100.1 1" # (the "1" at the end is the route metric) - $reply{'Framed-Route'} = - $block->cidr . ' ' . - ($self->ip_addr || '0.0.0.0') . ' 1'; + $reply{'Framed-Route'} = $block->cidr . ' ' . + ($self->ip_addr || '0.0.0.0') . ' 1'; + + $reply{'Motorola-Canopy-Gateway'} = $block->ip_gateway + if FS::Conf->new->exists('radius-canopy'); + } %reply; } -- 2.11.0