Github
/
FTL
mirror of
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add some (non-breaking) extra debugging output to /api/history/clients 

Signed-off-by: DL6ER <dl6er@dl6er.de>
This commit is contained in:
DL6ER 2024-02-12 19:20:22 +01:00
parent 9e3ccd917d
commit 1f07502cb5
No known key found for this signature in database
GPG Key ID: 00135ACBD90B28DD
1 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/api/history.c
View File

@ -134,6 +134,8 @@ int api_history_clients(struct ftl_conn *api)
for(unsigned int slot = 0; slot < OVERTIME_SLOTS; slot++)
{
cJSON *item = JSON_NEW_OBJECT();
int sum = 0;
cJSON *clients = JSON_NEW_ARRAY();
JSON_ADD_NUMBER_TO_OBJECT(item, "timestamp", overTime[slot].timestamp);
// Loop over clients to generate output to be sent to the client
@ -149,6 +151,16 @@ int api_history_clients(struct ftl_conn *api)
if(client == NULL)
continue;
sum += client->overTime[slot];
cJSON *clientitem = JSON_NEW_OBJECT();
JSON_REF_STR_IN_OBJECT(clientitem, "name", getstr(client->namepos));
JSON_REF_STR_IN_OBJECT(clientitem, "ip", getstr(client->ippos));
JSON_ADD_NUMBER_TO_OBJECT(clientitem, "total", client->overTime[slot]);
JSON_ADD_BOOL_TO_OBJECT(clientitem, "skipclient", skipclient[clientID]);
JSON_ADD_BOOL_TO_OBJECT(clientitem, "id_large", id >= (int)Nc);
JSON_ADD_ITEM_TO_ARRAY(clients, clientitem);
// Skip clients which should be hidden and add them to the "others" counter.
// Also skip clients when we reached the maximum number of clients to return
if(skipclient[clientID] || id >= (int)Nc)
@ -164,6 +176,12 @@ int api_history_clients(struct ftl_conn *api)
JSON_ADD_NUMBER_TO_ARRAY(data, others);
JSON_ADD_ITEM_TO_OBJECT(item, "data", data);
JSON_ADD_ITEM_TO_OBJECT(item, "clients", clients);
JSON_ADD_NUMBER_TO_OBJECT(item, "sum", sum);
JSON_ADD_NUMBER_TO_OBJECT(item, "total", overTime[slot].total);
JSON_ADD_NUMBER_TO_OBJECT(item, "cached", overTime[slot].cached);
JSON_ADD_NUMBER_TO_OBJECT(item, "blocked", overTime[slot].blocked);
JSON_ADD_NUMBER_TO_OBJECT(item, "forwarded", overTime[slot].forwarded);
JSON_ADD_ITEM_TO_ARRAY(history, item);
}
cJSON *json = JSON_NEW_OBJECT();