pi-hole/FTL
1
0
Fork 0
mirror of https://github.com/pi-hole/FTL.git synced 2024-10-26 16:52:18 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add Query Log filtering for new virtual other upstream

Browse Source 
Signed-off-by: DL6ER <dl6er@dl6er.de>
This commit is contained in:
DL6ER
2022-01-19 22:25:09 +01:00
parent 14db6b47a4
commit 6a11211d01
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/api/api.c
+11 -6
View File
@@ -542,7 +542,7 @@ void getUpstreamDestinations(const char *client_message, const int *sock)
name = ip;
if(counters->queries > 0)
// Whats the percentage of locked queries on the total amount of queries?
// Whats the percentage of blocked queries on the total amount of queries?
percentage = 1e2f * blocked_queries() / counters->queries;
}
else if(i == -2)
@@ -731,10 +731,12 @@ void getAllQueries(const char *client_message, const int *sock)
sscanf(client_message, ">getallqueries-forward %255s", forwarddest);
filterforwarddest = true;
if(strcmp(forwarddest, "cache") == 0)
forwarddestid = -1;
else if(strcmp(forwarddest, "blocklist") == 0)
if(strcmp(forwarddest, "blocklist") == 0)
forwarddestid = -3;
else if(strcmp(forwarddest, "cache") == 0)
forwarddestid = -2;
else if(strcmp(forwarddest, "other") == 0)
forwarddestid = -1;
else
{
// Extract address/name and port
@@ -987,10 +989,13 @@ void getAllQueries(const char *client_message, const int *sock)
if(filterforwarddest)
{
// Skip if not from the virtual blocking "upstream" server
if(forwarddestid == -2 && !query->flags.blocked)
if(forwarddestid == -3 && !query->flags.blocked)
continue;
// Does the user want to see queries answered from local cache?
else if(forwarddestid == -1 && query->status != QUERY_CACHE)
else if(forwarddestid == -2 && query->status != QUERY_CACHE)
continue;
// Does the user want to see queries from the "other" category
else if(forwarddestid == -1 && query->status != QUERY_IN_PROGRESS)
continue;
// Does the user want to see queries answered by an upstream server?
else if(forwarddestid >= 0 && forwarddestid != query->upstreamID)