Pi-Hole/web
1
0
Fork 0
mirror of https://github.com/pi-hole/web.git synced 2025-12-24 20:55:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use better client host name caching for DB queries

Browse Source 
Signed-off-by: DL6ER <dl6er@dl6er.de>
This commit is contained in:
DL6ER
2018-03-05 09:18:37 +01:00
parent f32de004cb
commit f132122e57
1 changed files with 28 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
api_db.php
View File

@@ -16,6 +16,30 @@ check_cors();
ini_set("max_execution_time","600");
$data = array();
$clients = [];
function resolveOnlyHostname($clientip)
{
if(array_key_exists($clientip, $clients))
{
// Entry already exists
$clientname = $clients[$clientip];
return $clientname;
}
if(filter_var($clientip, FILTER_VALIDATE_IP))
{
// Get host name of client and convert to lower case
$clientname = strtolower(gethostbyaddr($clientip));
}
else
{
// This is already a host name
$clientname = strtolower($clientip);
}
// Buffer result
$clients[$clientname] = $clientip;
return $clientname;
}
// Get posible non-standard location of FTL's database
$FTLsettings = parse_ini_file("/etc/pihole/pihole-FTL.conf");
@@ -78,27 +102,7 @@ if (isset($_GET['getAllQueries']) && $auth)
if(!is_bool($results))
while ($row = $results->fetchArray())
{
$c = $row[3];
if(array_key_exists($row[3], $clients))
{
// Entry already exists
$c = $clients[$row[3]];
}
else
{
if(filter_var($row[3], FILTER_VALIDATE_IP))
{
// Get host name of client and convert to lower case
$c = strtolower(gethostbyaddr($row[3]));
}
else
{
// This is already a host name
$c = strtolower($row[3]);
}
// Buffer result
$clients[$row[3]] = $c;
}
$c = resolveOnlyHostname($row[3]);
$allQueries[] = [$row[0],$row[1] == 1 ? "IPv4" : "IPv6",$row[2],$c,$row[4]];
}
}
@@ -132,16 +136,9 @@ if (isset($_GET['topClients']) && $auth)
if(!is_bool($results))
while ($row = $results->fetchArray())
{
if(filter_var($row[0], FILTER_VALIDATE_IP))
{
// Get host name of client and convert to lower case
$c = strtolower(gethostbyaddr($row[0]));
}
else
{
// This is already a host name
$c = strtolower($row[0]);
}
$c = resolveOnlyHostname($row[0]);
if(array_key_exists($c, $clients))
{
// Entry already exists, add to it (might appear multiple times due to mixed capitalization in the database)