Commit 9fffcf48 authored by Ad Schellevis's avatar Ad Schellevis

remove non-functional pfSense_ipfw_getTablestats from captive portal code

was used in some parts for radius, which is still quite messy code and probably not fully functional.
parent bdc51d07
...@@ -222,20 +222,6 @@ function portal_allow($clientip,$clientmac,$username,$password = null, $attribut ...@@ -222,20 +222,6 @@ function portal_allow($clientip,$clientmac,$username,$password = null, $attribut
return $sessionid; return $sessionid;
} }
// TODO: fix statistics request
/* get last activity timestamp given client IP address */
function captiveportal_get_last_activity($ip, $mac = NULL) {
global $cpzone;
$ipfwoutput = pfSense_ipfw_getTablestats($cpzone, 1, $ip, $mac);
/* Reading only from one of the tables is enough of approximation. */
if (is_array($ipfwoutput)) {
return $ipfwoutput['timestamp'];
}
return 0;
}
// //
// //
// //
...@@ -761,21 +747,6 @@ function captiveportal_prune_old() ...@@ -761,21 +747,6 @@ function captiveportal_prune_old()
} }
} }
/* check if the radius idle_timeout attribute has been set and if its set change the idletimeout to this value */
$uidletimeout = (is_numeric($cpentry[8])) ? $cpentry[8] : $idletimeout;
/* if an idle timeout is specified, get last activity timestamp from ipfw */
if (!$timedout && $uidletimeout > 0) {
$lastact = captiveportal_get_last_activity($cpentry[2], $cpentry[3]);
/* If the user has logged on but not sent any traffic they will never be logged out.
* We "fix" this by setting lastact to the login timestamp.
*/
$lastact = $lastact ? $lastact : $cpentry[0];
if ($lastact && (($pruning_time - $lastact) >= $uidletimeout)) {
$timedout = true;
$term_cause = 4; // Idle-Timeout
$stop_time = $lastact; // Entry added to comply with WISPr
}
}
/* if vouchers are configured, activate session timeouts */ /* if vouchers are configured, activate session timeouts */
if (!$timedout && isset($vcpcfg['enable']) && !empty($cpentry[7])) { if (!$timedout && isset($vcpcfg['enable']) && !empty($cpentry[7])) {
......
...@@ -185,7 +185,6 @@ $mac_man = load_mac_manufacturer_table(); ...@@ -185,7 +185,6 @@ $mac_man = load_mac_manufacturer_table();
<td class="listr"><?=htmlspecialchars($cpent->username);?>&nbsp;</td> <td class="listr"><?=htmlspecialchars($cpent->username);?>&nbsp;</td>
<td class="listr"><?=htmlspecialchars(date("m/d/Y H:i:s", $cpent->allow_time));?></td> <td class="listr"><?=htmlspecialchars(date("m/d/Y H:i:s", $cpent->allow_time));?></td>
<?php if ($_GET['showact']): <?php if ($_GET['showact']):
//$last_act = captiveportal_get_last_activity($cpent->ip, $cpent->mac);
if ( array_key_exists($cpent->ip,$accounting_info) ) $last_act = $accounting_info[$cpent->ip]['last_accessed'] ; if ( array_key_exists($cpent->ip,$accounting_info) ) $last_act = $accounting_info[$cpent->ip]['last_accessed'] ;
else $last_act=0; else $last_act=0;
?> ?>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment