Reset `Unidirectional Traffc` risk if packets from both directions processed.1.6rc2

 * Fixed risk hash value calculation, which was only done lower 32 bits.
 * Reduced default reader threads count to two if cross compiling.

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

2 files changed, 12 insertions, 12 deletions

diff --git a/test/results/stats/caches_cfg/ookla.pcap.out b/test/results/stats/caches_cfg/ookla.pcap.out
index fa7e4bf5d..6019f8a70 100644
--- a/test/results/stats/caches_cfg/ookla.pcap.out
+++ b/test/results/stats/caches_cfg/ookla.pcap.out
@@ -1,5 +1,5 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:55
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:41844
+PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:56
+PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:43459
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:6
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:5
@@ -7,18 +7,18 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:5
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:3
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:4
 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:22919
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:9629
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:30
 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:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:8
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:9
 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
@@ -40,7 +40,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_database_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_remote_access_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cloud_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:5
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:6
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_collaborative_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_rpc_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_streaming_count" interval=60 N:0
@@ -133,7 +133,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_43_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_44_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_45_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_46_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_48_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_49_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_50_count" interval=60 N:0
diff --git a/test/results/stats/caches_cfg/teams.pcap.out b/test/results/stats/caches_cfg/teams.pcap.out
index a7f97ebeb..9573110cb 100644
--- a/test/results/stats/caches_cfg/teams.pcap.out
+++ b/test/results/stats/caches_cfg/teams.pcap.out
@@ -1,5 +1,5 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:680
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:648796
+PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:682
+PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:654701
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:83
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:17
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:66
@@ -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:16
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:2
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:80
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:63
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:65
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:293772
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:293323
@@ -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:88
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:90
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:54
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
@@ -31,7 +31,7 @@ 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:0
 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:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_web_count" interval=60 N:4
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_social_network_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_download_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_game_count" interval=60 N:0