Fixed an event issue.

 * a "detection-update" event was thrown even if nothing changed
 * in some cases "not-detected" events were spammed if detection not completed
 * tell `libnDPI` how many packets per flow we want to dissect
 * `nDPId-test` validates total active flows in the right way

Signed-off-by: Toni Uhlig <matzeton@googlemail.com>

1 files changed, 8 insertions, 8 deletions

diff --git a/test/results/stats/default/imap-starttls.pcap.out b/test/results/stats/default/imap-starttls.pcap.out
index 3fa407c53..5835c7add 100644
--- a/test/results/stats/default/imap-starttls.pcap.out
+++ b/test/results/stats/default/imap-starttls.pcap.out
@@ -1,5 +1,5 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:16
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:16011
+PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:15
+PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:14694
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:0
@@ -7,7 +7,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:3
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:540
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:5653
@@ -18,7 +18,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:4
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
@@ -29,7 +29,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:4
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_data_transfer_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interval=60 N:0
@@ -91,7 +91,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_5_count" interval=60 N:4
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_7_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_8_count" interval=60 N:0
@@ -101,7 +101,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_11_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_12_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_13_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_15_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_15_count" interval=60 N:3
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_16_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_17_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_18_count" interval=60 N:0
@@ -110,7 +110,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_20_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_21_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_22_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_23_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_24_count" interval=60 N:4
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_24_count" interval=60 N:3
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_25_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_26_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_27_count" interval=60 N:0