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

Do not try to reduce timespan but always return all overtime data when requested

Browse Source 
Signed-off-by: DL6ER <dl6er@dl6er.de>
This commit is contained in:
DL6ER
2022-05-01 15:04:25 +02:00
parent aad2ad6573
commit 16e38bef2a
1 changed files with 5 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/api/api.c
+5 -35
View File
@@ -152,39 +152,9 @@ void getStats(const int *sock)
void getOverTime(const int *sock)
{
int from = 0, until = OVERTIME_SLOTS;
bool found = false;
time_t mintime = overTime[0].timestamp;
// Start with the first non-empty overTime slot
for(int slot = 0; slot < OVERTIME_SLOTS; slot++)
{
if((overTime[slot].total > 0 || overTime[slot].blocked > 0) &&
overTime[slot].timestamp >= mintime)
{
from = slot;
found = true;
break;
}
}
// End with last non-empty overTime slot
for(int slot = 0; slot < OVERTIME_SLOTS; slot++)
{
if(overTime[slot].timestamp >= time(NULL))
{
until = slot;
break;
}
}
// Check if there is any data to be sent
if(!found)
return;
if(istelnet[*sock])
{
for(int slot = from; slot < until; slot++)
for(int slot = 0; slot < OVERTIME_SLOTS; slot++)
{
ssend(*sock,"%lli %i %i\n",
(long long)overTime[slot].timestamp,
@@ -198,15 +168,15 @@ void getOverTime(const int *sock)
// and map16 can hold up to (2^16)-1 = 65535 pairs
// Send domains over time
pack_map16_start(*sock, (uint16_t) (until - from));
for(int slot = from; slot < until; slot++) {
pack_map16_start(*sock, (uint16_t) OVERTIME_SLOTS);
for(int slot = 0; slot < OVERTIME_SLOTS; slot++) {
pack_int32(*sock, (int32_t)overTime[slot].timestamp);
pack_int32(*sock, overTime[slot].total);
}
// Send ads over time
pack_map16_start(*sock, (uint16_t) (until - from));
for(int slot = from; slot < until; slot++) {
pack_map16_start(*sock, (uint16_t) OVERTIME_SLOTS);
for(int slot = 0; slot < OVERTIME_SLOTS; slot++) {
pack_int32(*sock, (int32_t)overTime[slot].timestamp);
pack_int32(*sock, overTime[slot].blocked);
}