diff options
| author | Toni Uhlig <matzeton@googlemail.com> | 2021-10-08 19:01:39 +0200 |
|---|---|---|
| committer | Toni Uhlig <matzeton@googlemail.com> | 2021-10-08 19:01:39 +0200 |
| commit | 8ecd1b48eff8b12131dad82c260ce419591acb85 (patch) | |
| tree | dbb817f02a83d6d397551656644ecdeb1b5dd023 | |
| parent | 3af8de5a58b16c6503ce07aab43eab865e1f51cf (diff) | |
c-captured: Improved format string in nDPIsrvd_write_flow_info_cb.
Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
| -rw-r--r-- | dependencies/nDPIsrvd.h | 2 | ||||
| -rw-r--r-- | examples/c-captured/c-captured.c | 43 |
2 files changed, 37 insertions, 8 deletions
diff --git a/dependencies/nDPIsrvd.h b/dependencies/nDPIsrvd.h index 13d9ed0bd..33dd1a217 100644 --- a/dependencies/nDPIsrvd.h +++ b/dependencies/nDPIsrvd.h @@ -940,7 +940,7 @@ static inline void nDPIsrvd_write_flow_info(int outfd, struct nDPIsrvd_socket co HASH_ITER(hh, sock->flow_table, current_flow, ftmp) { - dprintf(outfd, "[Flow %llu]", current_flow->id_as_ull); + dprintf(outfd, "[Flow %4llu]", current_flow->id_as_ull); write_cb(outfd, current_flow); dprintf(outfd, "%c", '\n'); } diff --git a/examples/c-captured/c-captured.c b/examples/c-captured/c-captured.c index 1d5cc2e55..dbbe1c728 100644 --- a/examples/c-captured/c-captured.c +++ b/examples/c-captured/c-captured.c @@ -386,7 +386,8 @@ static enum nDPIsrvd_callback_return captured_json_callback(struct nDPIsrvd_sock &flow_user->flow_tot_l4_payload_len), "flow_tot_l4_payload_len"); - perror_ull(TOKEN_VALUE_TO_ULL(TOKEN_GET_SZ(sock, "flow_last_seen"), &flow_user->flow_last_seen_ts_sec), "flow_last_seen"); + perror_ull(TOKEN_VALUE_TO_ULL(TOKEN_GET_SZ(sock, "flow_last_seen"), &flow_user->flow_last_seen_ts_sec), + "flow_last_seen"); } if (TOKEN_VALUE_EQUALS_SZ(flow_event_name, "new") != 0) @@ -484,19 +485,47 @@ static void nDPIsrvd_write_flow_info_cb(int outfd, struct nDPIsrvd_flow * const struct flow_user_data * const flow_user = (struct flow_user_data *)flow->flow_user_data; dprintf(outfd, - "[ptr: %p][last-seen: %llu][finished: %u][detected: %u][midstream: %u][risky: %u][total-L4-payload-length: " - "%llu][packets-captured: %u]", - flow, flow_user->flow_last_seen_ts_sec, + "[ptr: " +#ifdef __LP64__ + "0x%016llx" +#else + "0x%08lx" +#endif + "][last-seen: %13llu][new-seen: %u][finished: %u][detected: %u][midstream: %u][risky: " + "%u][total-L4-payload-length: " + "%4llu][packets-captured: %u]", +#ifdef __LP64__ + (unsigned long long int)flow, +#else + (unsigned long int)flow, +#endif + flow_user->flow_last_seen_ts_sec, + flow_user->flow_new_seen, flow_user->detection_finished, flow_user->detected, flow_user->flow_new_seen == 0, flow_user->risky, flow_user->flow_tot_l4_payload_len, flow_user->packets != NULL ? utarray_len(flow_user->packets) : 0); + syslog(LOG_DAEMON, - "[ptr: %p][last-seen: %llu][finished: %u][detected: %u][midstream: %u][risky: %u][total-L4-payload-length: " - "%llu][packets-captured: %u]", - flow, flow_user->flow_last_seen_ts_sec, + "[Flow %4llu][ptr: " +#ifdef __LP64__ + "0x%016llx" +#else + "0x%08lx" +#endif + "][last-seen: %13llu][new-seen: %u][finished: %u][detected: %u][midstream: %u][risky: " + "%u][total-L4-payload-length: " + "%4llu][packets-captured: %u]", + flow->id_as_ull, +#ifdef __LP64__ + (unsigned long long int)flow, +#else + (unsigned long int)flow, +#endif + flow_user->flow_last_seen_ts_sec, + flow_user->flow_new_seen, flow_user->detection_finished, flow_user->detected, flow_user->flow_new_seen == 0, |