summaryrefslogtreecommitdiffstats
path: root/usr/local/captiveportal
diff options
context:
space:
mode:
authorErmal <eri@pfsense.org>2012-06-11 07:00:48 +0000
committerErmal <eri@pfsense.org>2012-06-11 07:00:48 +0000
commit805b9ab69b868f385cb95742e3b9b53068ffb7f0 (patch)
tree363a7595537f4694692db39eeb8991fa6c644b7e /usr/local/captiveportal
parente0ad13cdf6fc1f61727c84a0db8f59f28fb8a79c (diff)
downloadpfsense-805b9ab69b868f385cb95742e3b9b53068ffb7f0.zip
pfsense-805b9ab69b868f385cb95742e3b9b53068ffb7f0.tar.gz
Revert "Make mac_format aware of multiple Captiveportal instances"
This reverts commit 54df925b9ea447bdd10f88a886e2ef11d44c3059.
Diffstat (limited to 'usr/local/captiveportal')
-rw-r--r--usr/local/captiveportal/radius_accounting.inc8
-rw-r--r--usr/local/captiveportal/radius_authentication.inc2
2 files changed, 5 insertions, 5 deletions
diff --git a/usr/local/captiveportal/radius_accounting.inc b/usr/local/captiveportal/radius_accounting.inc
index 0061f71..0a1300c 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"), $cpzone);
- $clientmac = mac_format($clientmac, $cpzone);
+ $nas_mac = mac_format(get_interface_mac("wan"));
+ $clientmac = mac_format($clientmac);
$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"), $cpzone);
- $clientmac = mac_format($clientmac, $cpzone);
+ $nas_mac = mac_format(get_interface_mac("wan"));
+ $clientmac = mac_format($clientmac);
$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 f201ba0..df9a368 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, $cpzone);
+ $clientmac = mac_format($clientmac);
$nas_port = $ruleno;
$radiusvendor = $config['captiveportal'][$cpzone]['radiusvendor'] ? $config['captiveportal'][$cpzone]['radiusvendor'] : null;
$radius_protocol = $config['captiveportal'][$cpzone]['radius_protocol'];
OpenPOWER on IntegriCloud