diff options
author | Ermal <eri@pfsense.org> | 2013-01-24 11:47:41 +0000 |
---|---|---|
committer | Ermal <eri@pfsense.org> | 2013-01-24 11:47:41 +0000 |
commit | 338c0941ef9a90d33b02627a320fb642d192b172 (patch) | |
tree | 23b15398c5d62125c97e2a4e90d9ac9c0b2f1e43 /usr/local/captiveportal | |
parent | a689bab69d566424d8ecd9e0fde210ccfc08713d (diff) | |
download | pfsense-338c0941ef9a90d33b02627a320fb642d192b172.zip pfsense-338c0941ef9a90d33b02627a320fb642d192b172.tar.gz |
Merge #237 manually whitout the GUI option for specifying interim interval. It will read now this attribute if present in a reply and use it. Fixes #1492
Diffstat (limited to 'usr/local/captiveportal')
-rw-r--r-- | usr/local/captiveportal/radius_accounting.inc | 2 | ||||
-rw-r--r-- | usr/local/captiveportal/radius_authentication.inc | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/usr/local/captiveportal/radius_accounting.inc b/usr/local/captiveportal/radius_accounting.inc index 0a1300c..2485f06 100644 --- a/usr/local/captiveportal/radius_accounting.inc +++ b/usr/local/captiveportal/radius_accounting.inc @@ -149,7 +149,6 @@ function RADIUS_ACCOUNTING_START($ruleno, $username, $sessionid, $radiusservers, */ // Default attributes - $racct->putAttribute(RADIUS_SERVICE_TYPE, RADIUS_LOGIN); $racct->putAttribute(RADIUS_NAS_PORT_TYPE, RADIUS_ETHERNET); $racct->putAttribute(RADIUS_NAS_PORT, $nas_port, 'integer'); $racct->putAttribute(RADIUS_ACCT_SESSION_ID, $sessionid); @@ -257,7 +256,6 @@ function RADIUS_ACCOUNTING_STOP($ruleno,$username,$sessionid,$start_time,$radius define("RADIUS_ACCT_OUTPUT_GIGAWORDS", "53"); // Default attributes - $racct->putAttribute(RADIUS_SERVICE_TYPE, RADIUS_LOGIN); $racct->putAttribute(RADIUS_NAS_PORT_TYPE, RADIUS_ETHERNET); $racct->putAttribute(RADIUS_NAS_PORT, $nas_port, 'integer'); $racct->putAttribute(RADIUS_ACCT_SESSION_ID, $sessionid); diff --git a/usr/local/captiveportal/radius_authentication.inc b/usr/local/captiveportal/radius_authentication.inc index df9a368..92890b8 100644 --- a/usr/local/captiveportal/radius_authentication.inc +++ b/usr/local/captiveportal/radius_authentication.inc @@ -85,7 +85,8 @@ function RADIUS_AUTHENTICATION($username,$password,$radiusservers,$clientip,$cli $radiusvendor = $config['captiveportal'][$cpzone]['radiusvendor'] ? $config['captiveportal'][$cpzone]['radiusvendor'] : null; $radius_protocol = $config['captiveportal'][$cpzone]['radius_protocol']; // Do we even need to set it to NULL? - $retvalue['error'] = $retvalue['reply_message'] = $retvalue['url_redirection'] = $retvalue['session_timeout'] = $retvalue['idle_timeout'] = $retvalue['session_terminate_time'] = null; + $retvalue['error'] = $retvalue['reply_message'] = $retvalue['url_redirection'] = $retvalue['session_timeout'] = null; + $retvalue['idle_timeout'] = $retvalue['session_terminate_time'] = $retvalue['interim_interval'] = null; switch($radiusvendor) { |