From 46f68501d575431656b5254a4bda8acb2982ab77 Mon Sep 17 00:00:00 2001 From: Toni Uhlig Date: Sun, 6 Mar 2022 17:31:26 +0100 Subject: Added daemon event: DAEMON_EVENT_STATUS (periodically send's daemon statistics.) * Improved distributor timeout handling (per-thread). * flow-info.py / flow-dash.py: Distinguish between flow risk severities. * nDPId: Skip tag switch datalink packet dissection / processing. * nDPId: Fixed incorrect value for current active flows. * Improved JSON schema's. Signed-off-by: Toni Uhlig --- examples/c-captured/c-captured.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'examples/c-captured/c-captured.c') diff --git a/examples/c-captured/c-captured.c b/examples/c-captured/c-captured.c index 3437091f1..f8b716c53 100644 --- a/examples/c-captured/c-captured.c +++ b/examples/c-captured/c-captured.c @@ -370,8 +370,8 @@ static enum nDPIsrvd_callback_return captured_json_callback(struct nDPIsrvd_sock return CALLBACK_ERROR; } - nDPIsrvd_ull ts_msec = 0ull; - perror_ull(TOKEN_VALUE_TO_ULL(TOKEN_GET_SZ(sock, "ts_msec"), &ts_msec), "ts_msec"); + nDPIsrvd_ull thread_ts_msec = 0ull; + perror_ull(TOKEN_VALUE_TO_ULL(TOKEN_GET_SZ(sock, "thread_ts_msec"), &thread_ts_msec), "thread_ts_msec"); nDPIsrvd_ull pkt_len = 0ull; perror_ull(TOKEN_VALUE_TO_ULL(TOKEN_GET_SZ(sock, "pkt_len"), &pkt_len), "pkt_len"); @@ -382,8 +382,8 @@ static enum nDPIsrvd_callback_return captured_json_callback(struct nDPIsrvd_sock nDPIsrvd_ull pkt_l4_offset = 0ull; perror_ull(TOKEN_VALUE_TO_ULL(TOKEN_GET_SZ(sock, "pkt_l4_offset"), &pkt_l4_offset), "pkt_l4_offset"); - struct packet_data pd = {.packet_ts_sec = ts_msec / 1000, - .packet_ts_usec = (ts_msec % 1000) * 1000, + struct packet_data pd = {.packet_ts_sec = thread_ts_msec / 1000, + .packet_ts_usec = (thread_ts_msec % 1000) * 1000, .packet_len = pkt_len, .base64_packet_size = pkt->value_length, .base64_packet_const = pkt->value}; @@ -437,10 +437,11 @@ static enum nDPIsrvd_callback_return captured_json_callback(struct nDPIsrvd_sock { while ((current = token_get_next_child(sock, flow_risk, &next_child_index)) != NULL) { - nDPIsrvd_ull numeric_risk_value = 0ull; + nDPIsrvd_ull numeric_risk_value = (nDPIsrvd_ull)-1; if (TOKEN_KEY_TO_ULL(current, &numeric_risk_value) == CONVERSION_OK && - numeric_risk_value < NDPI_MAX_RISK && has_ndpi_risk(&process_risky, numeric_risk_value) != 0) + numeric_risk_value < NDPI_MAX_RISK && + has_ndpi_risk(&process_risky, numeric_risk_value) != 0) { flow_user->risky = 1; } -- cgit v1.2.3