diff options
author | Luca Deri <lucaderi@users.noreply.github.com> | 2020-06-28 21:32:08 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-06-28 21:32:08 +0200 |
commit | 93a4a4387af951a4680061bf4e1effa87fa65406 (patch) | |
tree | 5cf4f6cf539587d2e73dd751ac38b7547a3a1533 /example/ndpiReader.c | |
parent | b2e89e67361a931672281f680faede0551542eea (diff) | |
parent | f39e3c98f05e84f263af7d74bcedb1051efa7169 (diff) |
Merge pull request #938 from IvanNardi/errors
Errors
Diffstat (limited to 'example/ndpiReader.c')
-rw-r--r-- | example/ndpiReader.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/example/ndpiReader.c b/example/ndpiReader.c index 57f8048df..2ded09888 100644 --- a/example/ndpiReader.c +++ b/example/ndpiReader.c @@ -843,9 +843,6 @@ static void parseOptions(int argc, char **argv) { } } - if(_pcap_file[0] == NULL) - help(0); - if(csv_fp) printCSVHeader(); @@ -855,6 +852,9 @@ static void parseOptions(int argc, char **argv) { extcap_capture(); } + if(_pcap_file[0] == NULL) + help(0); + if(strchr(_pcap_file[0], ',')) { /* multiple ingress interfaces */ num_threads = 0; /* setting number of threads = number of interfaces */ __pcap_file = strtok(_pcap_file[0], ","); @@ -1823,13 +1823,13 @@ static void node_idle_scan_walker(const void *node, ndpi_VISIT which, int depth, /* update stats */ node_proto_guess_walker(node, which, depth, user_data); + if(verbose == 3) + port_stats_walker(node, which, depth, user_data); if((flow->detected_protocol.app_protocol == NDPI_PROTOCOL_UNKNOWN) && !undetected_flows_deleted) undetected_flows_deleted = 1; - ndpi_free_flow_info_half(flow); - ndpi_free_flow_data_analysis(flow); - ndpi_free_flow_tls_data(flow); + ndpi_flow_info_free_data(flow); ndpi_thread_info[thread_id].workflow->stats.ndpi_flow_count--; /* adding to a queue (we can't delete it from the tree inline ) */ @@ -3089,6 +3089,10 @@ void test_lib() { } } +#ifdef USE_DPDK + dpdk_port_deinit(dpdk_port_id); +#endif + gettimeofday(&end, NULL); processing_time_usec = end.tv_sec*1000000 + end.tv_usec - (begin.tv_sec*1000000 + begin.tv_usec); setup_time_usec = begin.tv_sec*1000000 + begin.tv_usec - (startup_time.tv_sec*1000000 + startup_time.tv_usec); |