pi-hole/web
1
0
Fork 0
mirror of https://github.com/pi-hole/web.git synced 2024-12-06 19:36:21 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #696 from pi-hole/tweak/longterm-resolvehostnames

Browse Source 
Use better client host name caching for DB queries
This commit is contained in:
DL6ER
2018-04-04 23:11:59 +02:00
committed by GitHub
parent ce96f6a57e 322b87befe
commit 90dc9fb623
1 changed files with 42 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
api_db.php
+42 -39
View File
@@ -16,6 +16,37 @@ check_cors();
ini_set("max_execution_time","600");
$data = array();
$clients = array();
function resolveHostname($clientip, $printIP)
{
global $clients;
$ipaddr = strtolower($clientip);
if(array_key_exists($clientip, $clients))
{
// Entry already exists
$clientname = $clients[$ipaddr];
if($printIP)
return $clientname."|".$clientip;
return $clientname;
}
else if(filter_var($clientip, FILTER_VALIDATE_IP))
{
// Get host name of client and convert to lower case
$clientname = strtolower(gethostbyaddr($ipaddr));
}
else
{
// This is already a host name
$clientname = $ipaddr;
}
// Buffer result
$clients[$ipaddr] = $clientname;
if($printIP)
return $clientname."|".$clientip;
return $clientname;
}
// Get posible non-standard location of FTL's database
$FTLsettings = parse_ini_file("/etc/pihole/pihole-FTL.conf");
@@ -74,31 +105,10 @@ if (isset($_GET['getAllQueries']) && $auth)
$stmt->bindValue(":from", intval($from), SQLITE3_INTEGER);
$stmt->bindValue(":until", intval($until), SQLITE3_INTEGER);
$results = $stmt->execute();
$clients = array();
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 = resolveHostname($row[3],false);
$allQueries[] = [$row[0],$row[1] == 1 ? "IPv4" : "IPv6",$row[2],$c,$row[4]];
}
}
@@ -127,40 +137,33 @@ if (isset($_GET['topClients']) && $auth)
$stmt->bindValue(":until", intval($_GET['until']), SQLITE3_INTEGER);
$results = $stmt->execute();
$clients = array();
$clientnums = array();
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]);
}
if(array_key_exists($c, $clients))
$c = resolveHostname($row[0],false);
if(array_key_exists($c, $clientnums))
{
// Entry already exists, add to it (might appear multiple times due to mixed capitalization in the database)
$clients[$c] += intval($row[1]);
$clientnums[$c] += intval($row[1]);
}
else
{
// Entry does not yet exist
$clients[$c] = intval($row[1]);
$clientnums[$c] = intval($row[1]);
}
}
// Sort by number of hits
arsort($clients);
arsort($clientnums);
// Extract only the first ten entries
$clients = array_slice($clients, 0, 10);
$clientnums = array_slice($clientnums, 0, 10);
$result = array('top_sources' => $clients);
$result = array('top_sources' => $clientnums);
$data = array_merge($data, $result);
}