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

Remove two old and (not documented) debugging functions. 

Signed-off-by: DL6ER <dl6er@dl6er.de>
This commit is contained in:
DL6ER 2019-10-25 22:22:55 +02:00
parent 0fb2e95944
commit f2417b83cc
No known key found for this signature in database
GPG Key ID: 00135ACBD90B28DD
3 changed files with 4 additions and 149 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
src/api/api.c
View File

@ -1046,74 +1046,3 @@ void getClientNames(struct mg_connection *conn)
if(excludeclients != NULL)
clearSetupVarsArray();
}
void getUnknownQueries(struct mg_connection *conn)
{
// Exit before processing any data if requested via config setting
get_privacy_level(NULL);
if(config.privacylevel >= PRIVACY_HIDE_DOMAINS)
return;
for(int queryID = 0; queryID < counters->queries; queryID++)
{
const queriesData* query = getQuery(queryID, true);
if(query == NULL ||
(query->status != QUERY_UNKNOWN && query->complete))
continue;
char type[5];
if(query->type == TYPE_A)
{
strcpy(type,"IPv4");
}
else
{
strcpy(type,"IPv6");
}
// Get domain pointer
const domainsData* domain = getDomain(query->domainID, true);
// Get client pointer
const clientsData* client = getClient(query->clientID, true);
if(domain == NULL || client == NULL)
continue;
// Get client IP string
const char *clientIP = getstr(client->ippos);
http_send(conn, false, "%li %i %i %s %s %s %i %s\n", query->timestamp, queryID, query->id, type, getstr(domain->domainpos), clientIP, query->status, query->complete ? "true" : "false");
}
}
void getDomainDetails(const char *client_message, struct mg_connection *conn)
{
// Get domain name
bool show_all = false;
char domainString[128];
if(sscanf(client_message, "%*[^ ] %127s", domainString) < 1)
{
http_send(conn, false, "Need domain for this request\n");
return;
}
for(int domainID = 0; domainID < counters->domains; domainID++)
{
// Get domain pointer
const domainsData* domain = getDomain(domainID, true);
if(domain == NULL)
continue;
if(show_all || strcmp(getstr(domain->domainpos), domainString) == 0)
{
http_send(conn, false, "Domain \"%s\", ID: %i\n", domainString, domainID);
http_send(conn, false, "Total: %i\n", domain->count);
http_send(conn, false, "Blocked: %i\n", domain->blockedcount);
return;
}
}
// for loop finished without an exact match
http_send(conn, false, "Domain \"%s\" is unknown\n", domainString);
}

2
src/api/api.h
View File

@ -29,13 +29,11 @@ void getRecentBlocked(const char *client_message, struct mg_connection *conn);
void getQueryTypesOverTime(struct mg_connection *conn);
void getClientsOverTime(struct mg_connection *conn);
void getClientNames(struct mg_connection *conn);
void getDomainDetails(const char *client_message, struct mg_connection *conn);
// FTL methods
void getClientIP(struct mg_connection *conn);
void api_ftl_version(struct mg_connection *conn);
void api_ftl_db(struct mg_connection *conn);
void getUnknownQueries(struct mg_connection *conn);
// MessagePack serialization helpers
void pack_eom(const int sock);

80
src/api/http.c
View File

@ -24,19 +24,6 @@ static int send_http(struct mg_connection *conn, const char *mime_type, const ch
return 200;
}
/*
static int send_http_chunked_simulator(struct mg_connection *conn, const char *mime_type, const char *msg)
{
mg_send_http_ok(conn, mime_type, -1);
// Send bytes one after another
for(unsigned int i = 0; i < strlen(msg); i++)
{
char msgpart[2] = { 0 };
msgpart[0] = msg[i];
mg_send_chunk(conn, msgpart, strlen(msgpart));
}
return 200;
}
static int send_http_error(struct mg_connection *conn)
{
return mg_send_http_error(conn, 500, "Internal server error");
@ -69,61 +56,7 @@ void __attribute__ ((format (gnu_printf, 3, 4))) http_send(struct mg_connection
free(buffer);
}
}
/*
// Print passed string as JSON
static int print_json(struct mg_connection *conn, void *input)
{
// Create JSON object
cJSON *json = cJSON_CreateObject();
// Add string to created object
if(cJSON_AddStringToObject(json, "message", (const char*)input) == NULL)
{
cJSON_Delete(json);
send_http_error(conn);
return 500;
}
const struct mg_request_info *request = mg_get_request_info(conn);
// Add URL-decoded URI (relative) to created object
if(cJSON_AddStringToObject(json, "uri", request->local_uri) == NULL)
{
cJSON_Delete(json);
send_http_error(conn);
return 500;
}
// Add URL-decoded URI (relative) to created object
if(cJSON_AddStringToObject(json, "client", request->remote_addr) == NULL)
{
cJSON_Delete(json);
send_http_error(conn);
return 500;
}
// Generate string to be sent to the client
const char* msg = cJSON_PrintUnformatted(json);
if(msg == NULL)
{
cJSON_Delete(json);
send_http_error(conn);
return 500;
}
// Send JSON string
if(strcmp(request->local_uri, "/api/chunk_test") == 0)
send_http_chunked_simulator(conn, "application/json", msg);
else
send_http(conn, "application/json", msg);
// Free JSON ressources
cJSON_Delete(json);
// HTTP status code to return
return 200;
}
*/
// Print passed string directly
static int print_simple(struct mg_connection *conn, void *input)
{
@ -132,30 +65,26 @@ static int print_simple(struct mg_connection *conn, void *input)
static int api_handler(struct mg_connection *conn, void *ignored)
{
//mg_send_chunk(conn, "{", 2);
const struct mg_request_info *request = mg_get_request_info(conn);
/******************************** api/dns ********************************/
if(strcasecmp("/api/dns/status",request->local_uri) == 0)
if(strcasecmp("/api/dns/status", request->local_uri) == 0)
{
api_dns_status(conn);
}
/******************************** api/ftl ****************************/
else if(strcasecmp("/api/ftl/version",request->local_uri) == 0)
else if(strcasecmp("/api/ftl/version", request->local_uri) == 0)
{
api_ftl_version(conn);
}
else if(strcasecmp("/api/ftl/db",request->local_uri) == 0)
else if(strcasecmp("/api/ftl/db", request->local_uri) == 0)
{
api_ftl_db(conn);
}
/******************************** api/summary ****************************/
else if(strcasecmp("/api/stats/summary",request->local_uri) == 0)
else if(strcasecmp("/api/stats/summary", request->local_uri) == 0)
{
api_stats_summary(conn);
}
// mg_send_http_ok(conn, "application/json", -1);
//mg_send_chunk(conn, "}", 2);
return 200;
}
@ -190,7 +119,6 @@ void http_init(void)
/* Add simple demonstration callbacks */
mg_set_request_handler(ctx, "/ping", print_simple, (char*)"pong\n");
// mg_set_request_handler(ctx, "/json_test", print_json, (char*)"Greetings from FTL!");
mg_set_request_handler(ctx, "/api", api_handler, NULL);
}