diff options
| author | bcyrill <cyrill@bannwart.info> | 2012-06-09 22:33:24 +0200 |
|---|---|---|
| committer | bcyrill <cyrill@bannwart.info> | 2012-06-09 22:33:24 +0200 |
| commit | 54df925b9ea447bdd10f88a886e2ef11d44c3059 (patch) | |
| tree | f844373c0c3488b6c405e342e67e16aa7c0b26a7 /usr/local/captiveportal | |
| parent | 52a43b2fa3c018b145de759af4da823fcb6260fc (diff) | |
| download | pfsense-54df925b9ea447bdd10f88a886e2ef11d44c3059.zip pfsense-54df925b9ea447bdd10f88a886e2ef11d44c3059.tar.gz | |
Make mac_format aware of multiple Captiveportal instances
Diffstat (limited to 'usr/local/captiveportal')
| -rw-r--r-- | usr/local/captiveportal/radius_accounting.inc | 8 | ||||
| -rw-r--r-- | usr/local/captiveportal/radius_authentication.inc | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/usr/local/captiveportal/radius_accounting.inc b/usr/local/captiveportal/radius_accounting.inc index 0a1300c..0061f71 100644 --- a/usr/local/captiveportal/radius_accounting.inc +++ b/usr/local/captiveportal/radius_accounting.inc @@ -82,8 +82,8 @@ function RADIUS_ACCOUNTING_START($ruleno, $username, $sessionid, $radiusservers, global $config, $cpzone; $retvalue = array(); - $nas_mac = mac_format(get_interface_mac("wan")); - $clientmac = mac_format($clientmac); + $nas_mac = mac_format(get_interface_mac("wan"), $cpzone); + $clientmac = mac_format($clientmac, $cpzone); $nas_port = intval($ruleno); $radiusvendor = $config['captiveportal'][$cpzone]['radiusvendor'] ? $config['captiveportal'][$cpzone]['radiusvendor'] : null; @@ -194,8 +194,8 @@ function RADIUS_ACCOUNTING_STOP($ruleno,$username,$sessionid,$start_time,$radius global $config, $cpzone; $retvalue = array(); - $nas_mac = mac_format(get_interface_mac("wan")); - $clientmac = mac_format($clientmac); + $nas_mac = mac_format(get_interface_mac("wan"), $cpzone); + $clientmac = mac_format($clientmac, $cpzone); $nas_port = intval($ruleno); $radiusvendor = $config['captiveportal'][$cpzone]['radiusvendor'] ? $config['captiveportal'][$cpzone]['radiusvendor'] : null; $stop_time = (empty($stop_time)) ? time() : $stop_time; diff --git a/usr/local/captiveportal/radius_authentication.inc b/usr/local/captiveportal/radius_authentication.inc index df9a368..f201ba0 100644 --- a/usr/local/captiveportal/radius_authentication.inc +++ b/usr/local/captiveportal/radius_authentication.inc @@ -80,7 +80,7 @@ function RADIUS_AUTHENTICATION($username,$password,$radiusservers,$clientip,$cli global $config, $cpzone; $retvalue = array(); - $clientmac = mac_format($clientmac); + $clientmac = mac_format($clientmac, $cpzone); $nas_port = $ruleno; $radiusvendor = $config['captiveportal'][$cpzone]['radiusvendor'] ? $config['captiveportal'][$cpzone]['radiusvendor'] : null; $radius_protocol = $config['captiveportal'][$cpzone]['radius_protocol']; |
