Pi-Hole/web
1
0
Fork 0
mirror of https://github.com/pi-hole/web.git synced 2026-04-24 18:59:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Check if we can get a host name from the database when looking up the MAC address of this client instead

Browse Source 
Signed-off-by: DL6ER <dl6er@dl6er.de>
This commit is contained in:
DL6ER
2021-04-29 09:28:12 +02:00
parent dff02dd4be
commit ca71bc8df8
1 changed files with 38 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
scripts/pi-hole/php/groups.php
View File

@@ -203,9 +203,45 @@ if ($_POST['action'] == 'get_groups') {
throw new Exception('While executing network table statement: ' . $db->lastErrorMsg());
}
// There will always be a result. Unknown host names are NULL
// Check if got a hostname from the database. This may not be the case if the client is
// specified by MAC address, a hostname or via a more general selector like an interface.
$name_result = $result->fetchArray(SQLITE3_ASSOC);
$res['name'] = $name_result['name'];
if(!is_bool($name_result))
{
$res['name'] = $name_result['name'];
error_log("IP: ".$name_result['name']);
}
else
{
// Check if we can get a host name from the database when looking up the MAC
// address of this client instead.
$stmt = $FTLdb->prepare('SELECT name FROM network n JOIN network_addresses na ON na.network_id = n.id WHERE hwaddr=:hwaddr COLLATE NOCASE AND name IS NOT NULL;');
if (!$stmt) {
throw new Exception('Error while preparing network table statement: ' . $db->lastErrorMsg());
}
if (!$stmt->bindValue(':hwaddr', $res['ip'], SQLITE3_TEXT)) {
throw new Exception('While binding to network table statement: ' . $db->lastErrorMsg());
}
$result = $stmt->execute();
if (!$result) {
throw new Exception('While executing network table statement: ' . $db->lastErrorMsg());
}
// Check if we found a result. There may be multiple entries for
// this client in the network_addresses table. We use the first
// hostname we find for the sake of simplicity.
$name_result = $result->fetchArray(SQLITE3_ASSOC);
if(!is_bool($name_result))
{
$res['name'] = $name_result['name'];
}
else
{
$res['name'] = null;
}
}
$groups = array();
while ($gres = $group_query->fetchArray(SQLITE3_ASSOC)) {