diff options
| author | Toni Uhlig <matzeton@googlemail.com> | 2021-01-27 17:10:06 +0100 |
|---|---|---|
| committer | Toni Uhlig <matzeton@googlemail.com> | 2021-01-27 17:19:29 +0100 |
| commit | 9564b0ce2c239b02235414d908829fff9c684a8c (patch) | |
| tree | 7ed1623ef3335e79b558211b9f740460ed47646c /examples | |
| parent | 102b61175ccb8a8e16444b25b319b8e3806eba1c (diff) | |
Increased JSON buffer size to 12288 (libnDPI serializes more and more information).
* Making Compare&Fetch mandatory.
* Added some more Compare&Fetch to prevent TSAN complaining about data races.
Fixed possible but more ore less harmless data races during shutdown process.
* Shrink SIGNAL handler to a minimum. SYSV Signal handling and MT-safety is awkward.
Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/c-captured/c-captured.c | 16 | ||||
| -rw-r--r-- | examples/go-dashboard/main.go | 2 |
2 files changed, 11 insertions, 7 deletions
diff --git a/examples/c-captured/c-captured.c b/examples/c-captured/c-captured.c index a7370ccbd..b75b4e463 100644 --- a/examples/c-captured/c-captured.c +++ b/examples/c-captured/c-captured.c @@ -93,7 +93,8 @@ static char * generate_pcap_filename(struct nDPIsrvd_flow const * const flow, { if (flow_user->guessed != 0 || flow_user->detected == 0) { - int ret = snprintf(dest, size, "flow-%s-%s.pcap", (flow_user->guessed != 0 ? "guessed" : "undetected"), flow->id); + int ret = + snprintf(dest, size, "flow-%s-%s.pcap", (flow_user->guessed != 0 ? "guessed" : "undetected"), flow->id); if (ret <= 0 || (size_t)ret > size) { return NULL; @@ -220,16 +221,19 @@ enum nDPIsrvd_callback_return nDPIsrvd_json_callback(struct nDPIsrvd_socket * co utarray_push_back(flow_user->packets, &cb_user_data->tmp.pkt); } flow_user->pkt_datalink = cb_user_data->tmp.pkt_datalink; - } else { - if (cb_user_data->tmp.guessed != 0) { + } + else + { + if (cb_user_data->tmp.guessed != 0) + { flow_user->guessed = cb_user_data->tmp.guessed; } - if (cb_user_data->tmp.detected != 0) { + if (cb_user_data->tmp.detected != 0) + { flow_user->detected = cb_user_data->tmp.detected; } } - if (cb_user_data->tmp.flow_end_or_idle == 1 && - (flow_user->guessed != 0 || flow_user->detected == 0)) + if (cb_user_data->tmp.flow_end_or_idle == 1 && (flow_user->guessed != 0 || flow_user->detected == 0)) { if (flow_user->packets != NULL) { diff --git a/examples/go-dashboard/main.go b/examples/go-dashboard/main.go index efd01974b..f1acfebb3 100644 --- a/examples/go-dashboard/main.go +++ b/examples/go-dashboard/main.go @@ -19,7 +19,7 @@ var ( InfoLogger *log.Logger ErrorLogger *log.Logger - NETWORK_BUFFER_MAX_SIZE uint16 = 9216 + NETWORK_BUFFER_MAX_SIZE uint16 = 12288 nDPIsrvd_JSON_BYTES uint16 = 4 ) |