Added libnDPI global context init/deinit used for cache mgmt.

 * support for adding *.ndpiconf for nDPI config tests
 * all other configs should have the suffix *.conf
 * fixed nDPI malloc/free wrapper set (was already too late set)

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

2 files changed, 6 insertions, 6 deletions

diff --git a/test/results/influxd/caches_cfg/ookla.pcap.out b/test/results/influxd/caches_cfg/ookla.pcap.out
index 9a190f425..cb38b6ec2 100644
--- a/test/results/influxd/caches_cfg/ookla.pcap.out
+++ b/test/results/influxd/caches_cfg/ookla.pcap.out
@@ -1,5 +1,5 @@
-general json_lines=56,json_bytes=44318,flow_src_total_bytes=22732,flow_dst_total_bytes=8117
-events flow_new_count=6,flow_end_count=1,flow_idle_count=5,flow_update_count=0,flow_analyse_count=0,flow_guessed_count=1,flow_detected_count=5,flow_detection_update_count=4,flow_not_detected_count=0,flow_risky_count=2,packet_count=0,packet_flow_count=30,init_count=1,reconnect_count=0,shutdown_count=1,status_count=2,error_unknown_datalink=0,error_unknown_l3_protocol=0,error_unsupported_datalink=0,error_packet_too_short=0,error_packet_type_unknown=0,error_packet_header_invalid=0,error_ip4_packet_too_short=0,error_ip4_size_smaller_than_header=0,error_ip4_l4_payload_detection=0,error_ip6_packet_too_short=0,error_ip6_size_smaller_than_header=0,error_ip6_l4_payload_detection=0,error_tcp_packet_too_short=0,error_udp_packet_too_short=0,error_capture_size_smaller_than_packet=0,error_max_flows_to_track=0,error_flow_memory_alloc=0
+general json_lines=55,json_bytes=43272,flow_src_total_bytes=22732,flow_dst_total_bytes=8117
+events flow_new_count=6,flow_end_count=1,flow_idle_count=5,flow_update_count=0,flow_analyse_count=0,flow_guessed_count=1,flow_detected_count=5,flow_detection_update_count=3,flow_not_detected_count=0,flow_risky_count=2,packet_count=0,packet_flow_count=30,init_count=1,reconnect_count=0,shutdown_count=1,status_count=2,error_unknown_datalink=0,error_unknown_l3_protocol=0,error_unsupported_datalink=0,error_packet_too_short=0,error_packet_type_unknown=0,error_packet_header_invalid=0,error_ip4_packet_too_short=0,error_ip4_size_smaller_than_header=0,error_ip4_l4_payload_detection=0,error_ip6_packet_too_short=0,error_ip6_size_smaller_than_header=0,error_ip6_l4_payload_detection=0,error_tcp_packet_too_short=0,error_udp_packet_too_short=0,error_capture_size_smaller_than_packet=0,error_max_flows_to_track=0,error_flow_memory_alloc=0
 state flow_state_info=2,flow_state_finished=4
 breed flow_breed_safe_count=5,flow_breed_acceptable_count=0,flow_breed_fun_count=0,flow_breed_unsafe_count=0,flow_breed_potentially_dangerous_count=0,flow_breed_tracker_ads_count=0,flow_breed_dangerous_count=0,flow_breed_unrated_count=0,flow_breed_unknown_count=0
 category flow_category_unspecified_count=0,flow_category_media_count=0,flow_category_vpn_count=0,flow_category_email_count=0,flow_category_data_transfer_count=0,flow_category_web_count=1,flow_category_social_network_count=0,flow_category_download_count=0,flow_category_game_count=0,flow_category_chat_count=0,flow_category_voip_count=0,flow_category_database_count=0,flow_category_remote_access_count=0,flow_category_cloud_count=0,flow_category_network_count=4,flow_category_collaborative_count=0,flow_category_rpc_count=0,flow_category_streaming_count=0,flow_category_system_count=0,flow_category_software_update_count=0,flow_category_music_count=0,flow_category_video_count=0,flow_category_shopping_count=0,flow_category_productivity_count=0,flow_category_file_sharing_count=0,flow_category_conn_check_count=0,flow_category_iot_scada_count=0,flow_category_virt_assistant_count=0,flow_category_cybersecurity_count=0,flow_category_adult_content_count=0,flow_category_mining_count=0,flow_category_malware_count=0,flow_category_advertisment_count=0,flow_category_banned_site_count=0,flow_category_site_unavail_count=0,flow_category_allowed_site_count=0,flow_category_antimalware_count=0,flow_category_crypto_currency_count=0,flow_category_gambling_count=0,flow_category_unknown_count=0
diff --git a/test/results/influxd/caches_cfg/teams.pcap.out b/test/results/influxd/caches_cfg/teams.pcap.out
index 9eded9c00..903b41212 100644
--- a/test/results/influxd/caches_cfg/teams.pcap.out
+++ b/test/results/influxd/caches_cfg/teams.pcap.out
@@ -1,9 +1,9 @@
-general json_lines=682,json_bytes=653540,flow_src_total_bytes=293772,flow_dst_total_bytes=293323
+general json_lines=682,json_bytes=653166,flow_src_total_bytes=293772,flow_dst_total_bytes=293323
 events flow_new_count=83,flow_end_count=17,flow_idle_count=66,flow_update_count=0,flow_analyse_count=16,flow_guessed_count=2,flow_detected_count=80,flow_detection_update_count=65,flow_not_detected_count=1,flow_risky_count=29,packet_count=16,packet_flow_count=317,init_count=1,reconnect_count=0,shutdown_count=1,status_count=1,error_unknown_datalink=0,error_unknown_l3_protocol=0,error_unsupported_datalink=0,error_packet_too_short=0,error_packet_type_unknown=16,error_packet_header_invalid=0,error_ip4_packet_too_short=0,error_ip4_size_smaller_than_header=0,error_ip4_l4_payload_detection=0,error_ip6_packet_too_short=0,error_ip6_size_smaller_than_header=0,error_ip6_l4_payload_detection=0,error_tcp_packet_too_short=0,error_udp_packet_too_short=0,error_capture_size_smaller_than_packet=0,error_max_flows_to_track=0,error_flow_memory_alloc=0
 state flow_state_info=24,flow_state_finished=59
-breed flow_breed_safe_count=42,flow_breed_acceptable_count=37,flow_breed_fun_count=1,flow_breed_unsafe_count=0,flow_breed_potentially_dangerous_count=0,flow_breed_tracker_ads_count=0,flow_breed_dangerous_count=0,flow_breed_unrated_count=0,flow_breed_unknown_count=0
-category flow_category_unspecified_count=0,flow_category_media_count=0,flow_category_vpn_count=0,flow_category_email_count=0,flow_category_data_transfer_count=0,flow_category_web_count=2,flow_category_social_network_count=0,flow_category_download_count=0,flow_category_game_count=0,flow_category_chat_count=0,flow_category_voip_count=20,flow_category_database_count=0,flow_category_remote_access_count=0,flow_category_cloud_count=11,flow_category_network_count=27,flow_category_collaborative_count=19,flow_category_rpc_count=0,flow_category_streaming_count=0,flow_category_system_count=0,flow_category_software_update_count=0,flow_category_music_count=1,flow_category_video_count=0,flow_category_shopping_count=0,flow_category_productivity_count=0,flow_category_file_sharing_count=0,flow_category_conn_check_count=0,flow_category_iot_scada_count=0,flow_category_virt_assistant_count=0,flow_category_cybersecurity_count=0,flow_category_adult_content_count=0,flow_category_mining_count=0,flow_category_malware_count=0,flow_category_advertisment_count=0,flow_category_banned_site_count=0,flow_category_site_unavail_count=0,flow_category_allowed_site_count=0,flow_category_antimalware_count=0,flow_category_crypto_currency_count=0,flow_category_gambling_count=0,flow_category_unknown_count=0
-confidence flow_confidence_by_port=0,flow_confidence_dpi_partial=6,flow_confidence_dpi_partial_cache=0,flow_confidence_dpi_cache=0,flow_confidence_dpi=74,flow_confidence_nbpf=0,flow_confidence_by_ip=0,flow_confidence_dpi_aggressive=0,flow_confidence_custom_rule=0,flow_confidence_unknown=0
+breed flow_breed_safe_count=46,flow_breed_acceptable_count=33,flow_breed_fun_count=1,flow_breed_unsafe_count=0,flow_breed_potentially_dangerous_count=0,flow_breed_tracker_ads_count=0,flow_breed_dangerous_count=0,flow_breed_unrated_count=0,flow_breed_unknown_count=0
+category flow_category_unspecified_count=0,flow_category_media_count=0,flow_category_vpn_count=0,flow_category_email_count=0,flow_category_data_transfer_count=0,flow_category_web_count=6,flow_category_social_network_count=0,flow_category_download_count=0,flow_category_game_count=0,flow_category_chat_count=0,flow_category_voip_count=16,flow_category_database_count=0,flow_category_remote_access_count=0,flow_category_cloud_count=11,flow_category_network_count=27,flow_category_collaborative_count=19,flow_category_rpc_count=0,flow_category_streaming_count=0,flow_category_system_count=0,flow_category_software_update_count=0,flow_category_music_count=1,flow_category_video_count=0,flow_category_shopping_count=0,flow_category_productivity_count=0,flow_category_file_sharing_count=0,flow_category_conn_check_count=0,flow_category_iot_scada_count=0,flow_category_virt_assistant_count=0,flow_category_cybersecurity_count=0,flow_category_adult_content_count=0,flow_category_mining_count=0,flow_category_malware_count=0,flow_category_advertisment_count=0,flow_category_banned_site_count=0,flow_category_site_unavail_count=0,flow_category_allowed_site_count=0,flow_category_antimalware_count=0,flow_category_crypto_currency_count=0,flow_category_gambling_count=0,flow_category_unknown_count=0
+confidence flow_confidence_by_port=0,flow_confidence_dpi_partial=2,flow_confidence_dpi_partial_cache=0,flow_confidence_dpi_cache=0,flow_confidence_dpi=78,flow_confidence_nbpf=0,flow_confidence_by_ip=0,flow_confidence_dpi_aggressive=0,flow_confidence_custom_rule=0,flow_confidence_unknown=0
 severity flow_severity_low=42,flow_severity_medium=12,flow_severity_high=2,flow_severity_severe=0,flow_severity_critical=0,flow_severity_emergency=0,flow_severity_unknown=0
 layer3 flow_l3_ip4_count=83,flow_l3_ip6_count=0,flow_l3_other_count=0
 layer4 flow_l4_tcp_count=42,flow_l4_udp_count=40,flow_l4_icmp_count=1,flow_l4_other_count=0