diff options
| author | Toni Uhlig <matzeton@googlemail.com> | 2022-09-23 00:13:19 +0200 |
|---|---|---|
| committer | Toni Uhlig <matzeton@googlemail.com> | 2022-09-23 00:13:19 +0200 |
| commit | 36f1786bde2572cf7eb44aa1384b61ecfebdeff3 (patch) | |
| tree | 83d4f3d5abc6d19ee4df1686c4cad7655cd1b335 /examples | |
| parent | 9a28475bba88b711b7075b58473b7e5b5df1f393 (diff) | |
nDPIsrvd.h: Fixed bug during token parsing/hashing. Do not hash array contents.
Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/c-collectd/c-collectd.c | 8 | ||||
| -rwxr-xr-x | examples/py-flow-info/flow-info.py | 21 |
2 files changed, 19 insertions, 10 deletions
diff --git a/examples/c-collectd/c-collectd.c b/examples/c-collectd/c-collectd.c index 811eeee08..fbad4d2e5 100644 --- a/examples/c-collectd/c-collectd.c +++ b/examples/c-collectd/c-collectd.c @@ -457,10 +457,14 @@ static enum nDPIsrvd_callback_return captured_json_callback(struct nDPIsrvd_sock (void)sock; (void)instance; (void)thread_data; - (void)flow; struct nDPIsrvd_json_token const * const flow_event_name = TOKEN_GET_SZ(sock, "flow_event_name"); - struct flow_user_data * const flow_user_data = (struct flow_user_data *)flow->flow_user_data; + struct flow_user_data * flow_user_data = NULL; + + if (flow != NULL) + { + flow_user_data = (struct flow_user_data *)flow->flow_user_data; + } if (flow_user_data != NULL) { diff --git a/examples/py-flow-info/flow-info.py b/examples/py-flow-info/flow-info.py index 686ba2436..3c58858ed 100755 --- a/examples/py-flow-info/flow-info.py +++ b/examples/py-flow-info/flow-info.py @@ -363,14 +363,15 @@ def onJsonLineRecvd(json_dict, instance, current_flow, global_user_data): flow_event_name += '{}{:>16}{}'.format(TermColor.WARNING, json_dict['flow_event_name'], TermColor.END) if args.print_analyse_results is True: - next_lines = ['[min|max|avg|stddev|variance|entropy]'] + next_lines = [' {:>9}|{:>9}|{:>9}|{:>9}|{:>9}|{:>9}'.format( + 'min', 'max', 'avg', 'stddev', 'variance', 'entropy')] next_lines += ['[IAT.........: {:>9.3f}|{:>9.3f}|{:>9.3f}|{:>9.3f}|{:>9.3f}|{:>9.3f}]'.format( - nDPIsrvd.toSeconds(json_dict['data_analysis']['iat']['min']), - nDPIsrvd.toSeconds(json_dict['data_analysis']['iat']['max']), - nDPIsrvd.toSeconds(json_dict['data_analysis']['iat']['avg']), - nDPIsrvd.toSeconds(json_dict['data_analysis']['iat']['stddev']), - nDPIsrvd.toSeconds(json_dict['data_analysis']['iat']['var']), - nDPIsrvd.toSeconds(json_dict['data_analysis']['iat']['ent']) + nDPIsrvd.toSeconds(json_dict['data_analysis']['iat']['min']), + nDPIsrvd.toSeconds(json_dict['data_analysis']['iat']['max']), + nDPIsrvd.toSeconds(json_dict['data_analysis']['iat']['avg']), + nDPIsrvd.toSeconds(json_dict['data_analysis']['iat']['stddev']), + nDPIsrvd.toSeconds(json_dict['data_analysis']['iat']['var']), + nDPIsrvd.toSeconds(json_dict['data_analysis']['iat']['ent']) )] next_lines += [''] next_lines[-1] += '[PKTLEN......: {:>9.3f}|{:>9.3f}|{:>9.3f}|{:>9.3f}|{:>9.3f}|{:>9.3f}]'.format( @@ -388,7 +389,11 @@ def onJsonLineRecvd(json_dict, instance, current_flow, global_user_data): next_lines += [''] next_lines[-1] += '[DIRECTIONS..: {}]'.format(','.join([str(n) for n in json_dict['data_analysis']['directions']])) next_lines += [''] - next_lines[-1] += '[IATS........: {}]'.format(','.join([str(n) for n in json_dict['data_analysis']['iat']['data']])) + iats = '' + for n in json_dict['data_analysis']['iat']['data']: + iats += '{:.1f},'.format(n / 1000.0) + iats = iats[:-1] + next_lines[-1] += '[IATS(ms)....: {}]'.format(iats) next_lines += [''] next_lines[-1] += '[PKTLENS.....: {}]'.format(','.join([str(n) for n in json_dict['data_analysis']['pktlen']['data']])) else: |