From 58439a676116baffb04a24a59ebae81780528327 Mon Sep 17 00:00:00 2001 From: Toni Uhlig Date: Fri, 27 Jan 2023 01:39:03 +0100 Subject: Minor fixes. Signed-off-by: Toni Uhlig --- examples/c-analysed/c-analysed.c | 4 +++- examples/py-flow-info/flow-info.py | 4 ++++ utils.c | 6 ++++++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/examples/c-analysed/c-analysed.c b/examples/c-analysed/c-analysed.c index e7aa865db..1a9e56280 100644 --- a/examples/c-analysed/c-analysed.c +++ b/examples/c-analysed/c-analysed.c @@ -148,7 +148,7 @@ static void csv_buf_add(csv_buf_t buf, size_t * const csv_buf_used, char const * { size_t len; - if (siz_len > 0 && str != NULL) + if (siz_len > 1 && str != NULL) { len = MIN(BUFFER_REMAINING(*csv_buf_used), siz_len); if (len == 0) @@ -564,6 +564,8 @@ static int mainloop(void) int main(int argc, char ** argv) { + init_logging("nDPIsrvd-analysed"); + sock = nDPIsrvd_socket_init(0, 0, 0, 0, simple_json_callback, NULL, NULL); if (sock == NULL) { diff --git a/examples/py-flow-info/flow-info.py b/examples/py-flow-info/flow-info.py index c4324ef53..6f94dbece 100755 --- a/examples/py-flow-info/flow-info.py +++ b/examples/py-flow-info/flow-info.py @@ -235,6 +235,10 @@ def onFlowCleanup(instance, current_flow, global_user_data): def onJsonLineRecvd(json_dict, instance, current_flow, global_user_data): stats = global_user_data stats.update(json_dict, current_flow) + + if 'packet_event_id' in json_dict: + return True + stats.resetStatus() instance_and_source = '' diff --git a/utils.c b/utils.c index fbdc2b79e..486387cb9 100644 --- a/utils.c +++ b/utils.c @@ -144,6 +144,12 @@ int daemonize_with_pidfile(char const * const pidfile) if (daemonize != 0) { + if (pidfile == NULL) + { + logger_early(1, "%s", "Missing pidfile."); + return 1; + } + if (is_daemon_running(pidfile, ps) != 0) { logger_early(1, "Pidfile %s found and daemon %s still running", pidfile, ps); -- cgit v1.2.3