mirrors/pfsense
2
0
Fork 0
mirror of https://github.com/pfsense/pfsense.git synced 2025-10-26 11:38:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Correct the Called-Station-Id attribute setting to be the same on STOP/START packets

Browse Source
This commit is contained in:
Ermal 2012-01-20 12:21:19 +00:00
parent 26275879e9
commit cff5204a17
1 changed files with 32 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
usr/local/captiveportal/radius_accounting.inc
View File

@ -42,6 +42,34 @@
pfSense_MODULE: captiveportal
*/
/**
* Get the NAS-IP-Address based on the current wan address
*
* Use functions in interfaces.inc to find this out
*
*/
if (!function_exists('getNasIP')) {
function getNasIP()
{
global $config, $cpzone;
if (empty($config['captiveportal'][$cpzone]['radiussrcip_attribute'])) {
$nasIp = get_interface_ip();
} else {
if (is_ipaddr($config['captiveportal'][$cpzone]['radiussrcip_attribute']))
$nasIp = $config['captiveportal'][$cpzone]['radiussrcip_attribute'];
else
$nasIp = get_interface_ip($config['captiveportal'][$cpzone]['radiussrcip_attribute']);
}
if(!is_ipaddr($nasIp))
$nasIp = "0.0.0.0";
return $nasIp;
}
}
/*
RADIUS ACCOUNTING START
-----------------------
@ -67,12 +95,9 @@ function RADIUS_ACCOUNTING_START($ruleno, $username, $sessionid, $radiusservers,
break;
default:
if (is_ipaddr($config['captiveportal'][$cpzone]['radiussrcip_attribute']))
$calledstationid = $config['captiveportal'][$cpzone]['radiussrcip_attribute'];
else
$calledstationid = get_interface_ip($config['captiveportal'][$cpzone]['radiussrcip_attribute']);
$callingstationid = $clientmac;
$calledstationid = getNasIP();
$callingstationid = $clientmac;
break;
}
// Create our instance
@ -189,8 +214,9 @@ function RADIUS_ACCOUNTING_STOP($ruleno,$username,$sessionid,$start_time,$radius
break;
default:
$calledstationid = get_interface_ip("wan");
$calledstationid = getNasIP();
$callingstationid = $clientmac;
break;
}
// Create our instance, see if we should use Accounting Interim Updates or Accounting STOP messages