From 127d46d1f9e4db73cade5939bea3b0eec5d54975 Mon Sep 17 00:00:00 2001 From: Mcat12 Date: Wed, 7 Nov 2018 16:59:38 -0500 Subject: [PATCH 1/2] Fix query types in long term query log being incorrect Besides A and AAAA, the other query types would show up as AAAA instead of their actual name. Signed-off-by: Mcat12 --- api_db.php | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/api_db.php b/api_db.php index daa04813..156fdf78 100644 --- a/api_db.php +++ b/api_db.php @@ -128,7 +128,37 @@ if (isset($_GET['getAllQueries']) && $auth) while ($row = $results->fetchArray()) { $c = resolveHostname($row[3],false); - $allQueries[] = [$row[0],$row[1] == 1 ? "IPv4" : "IPv6",$row[2],$c,$row[4]]; + + // Convert query type ID to name + // Names taken from FTL's query type names + switch($row[1]) { + case 1: + $query_type = "A"; + break; + case 2: + $query_type = "AAAA"; + break; + case 3: + $query_type = "ANY"; + break; + case 4: + $query_type = "SRV"; + break; + case 5: + $query_type = "SOA"; + break; + case 6: + $query_type = "PTR"; + break; + case 7: + $query_type = "TXT"; + break; + default: + $query_type = "UNKN"; + break; + } + + $allQueries[] = [$row[0], $query_type, $row[2], $c, $row[4]]; } } $result = array('data' => $allQueries); From 47d71f4708c9ccec1622032823dbba3928aaacbf Mon Sep 17 00:00:00 2001 From: Mcat12 Date: Wed, 7 Nov 2018 17:06:02 -0500 Subject: [PATCH 2/2] Change spaces to tabs in bugfix Signed-off-by: Mcat12 --- api_db.php | 52 ++++++++++++++++++++++++++-------------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/api_db.php b/api_db.php index 156fdf78..79812981 100644 --- a/api_db.php +++ b/api_db.php @@ -130,33 +130,33 @@ if (isset($_GET['getAllQueries']) && $auth) $c = resolveHostname($row[3],false); // Convert query type ID to name - // Names taken from FTL's query type names + // Names taken from FTL's query type names switch($row[1]) { - case 1: - $query_type = "A"; - break; - case 2: - $query_type = "AAAA"; - break; - case 3: - $query_type = "ANY"; - break; - case 4: - $query_type = "SRV"; - break; - case 5: - $query_type = "SOA"; - break; - case 6: - $query_type = "PTR"; - break; - case 7: - $query_type = "TXT"; - break; - default: - $query_type = "UNKN"; - break; - } + case 1: + $query_type = "A"; + break; + case 2: + $query_type = "AAAA"; + break; + case 3: + $query_type = "ANY"; + break; + case 4: + $query_type = "SRV"; + break; + case 5: + $query_type = "SOA"; + break; + case 6: + $query_type = "PTR"; + break; + case 7: + $query_type = "TXT"; + break; + default: + $query_type = "UNKN"; + break; + } $allQueries[] = [$row[0], $query_type, $row[2], $c, $row[4]]; }