diff options
| author | Ermal <eri@pfsense.org> | 2011-09-07 06:42:58 +0000 |
|---|---|---|
| committer | Ermal <eri@pfsense.org> | 2011-09-07 13:04:01 +0000 |
| commit | b4792bf8fe3b1cef416c7135fea88c1a0b08800a (patch) | |
| tree | d32a5fb188939e28cd42c92aa9b4cf6729ff4947 /usr/local/captiveportal/radius_accounting.inc | |
| parent | 9b55203f878786a2bbd0b7d5dda4474d2533695b (diff) | |
| download | pfsense-b4792bf8fe3b1cef416c7135fea88c1a0b08800a.zip pfsense-b4792bf8fe3b1cef416c7135fea88c1a0b08800a.tar.gz | |
Add the multi instance CP to master branch. This allows to define CP with different properties on different interfaces.
Diffstat (limited to 'usr/local/captiveportal/radius_accounting.inc')
| -rw-r--r-- | usr/local/captiveportal/radius_accounting.inc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/usr/local/captiveportal/radius_accounting.inc b/usr/local/captiveportal/radius_accounting.inc index 704c229..1f24e65 100644 --- a/usr/local/captiveportal/radius_accounting.inc +++ b/usr/local/captiveportal/radius_accounting.inc @@ -51,13 +51,13 @@ PEAR::loadExtension('bcmath'); function RADIUS_ACCOUNTING_START($ruleno, $username, $sessionid, $radiusservers, $clientip, $clientmac) { - global $config; + global $config, $cpzone; $retvalue = array(); $nas_mac = mac_format(get_interface_mac("wan")); $clientmac = mac_format($clientmac); $nas_port = intval($ruleno); - $radiusvendor = $config['captiveportal']['radiusvendor'] ? $config['captiveportal']['radiusvendor'] : null; + $radiusvendor = $config['captiveportal'][$cpzone]['radiusvendor'] ? $config['captiveportal'][$cpzone]['radiusvendor'] : null; switch($radiusvendor) { @@ -67,10 +67,10 @@ function RADIUS_ACCOUNTING_START($ruleno, $username, $sessionid, $radiusservers, break; default: - if (is_ipaddr($config['captiveportal']['radiussrcip_attribute'])) - $calledstationid = $config['captiveportal']['radiussrcip_attribute']; + if (is_ipaddr($config['captiveportal'][$cpzone]['radiussrcip_attribute'])) + $calledstationid = $config['captiveportal'][$cpzone]['radiussrcip_attribute']; else - $calledstationid = get_interface_ip($config['captiveportal']['radiussrcip_attribute']); + $calledstationid = get_interface_ip($config['captiveportal'][$cpzone]['radiussrcip_attribute']); $callingstationid = $clientmac; $callingstationid = $clientmac; } @@ -166,13 +166,13 @@ RADIUS ACCOUNTING STOP/UPDATE function RADIUS_ACCOUNTING_STOP($ruleno,$username,$sessionid,$start_time,$radiusservers,$clientip,$clientmac, $term_cause = 1, $interimupdate=false,$stop_time = null) { - global $config; + global $config, $cpzone; $retvalue = array(); $nas_mac = mac_format(get_interface_mac("wan")); $clientmac = mac_format($clientmac); $nas_port = intval($ruleno); - $radiusvendor = $config['captiveportal']['radiusvendor'] ? $config['captiveportal']['radiusvendor'] : null; + $radiusvendor = $config['captiveportal'][$cpzone]['radiusvendor'] ? $config['captiveportal'][$cpzone]['radiusvendor'] : null; $stop_time = (empty($stop_time)) ? time() : $stop_time; $session_time = $stop_time - $start_time; $volume = getVolume($clientip); |
