From ed3d160f3d3b898f7265ea04f1486fa07d7e6da7 Mon Sep 17 00:00:00 2001 From: Nardi Ivan Date: Sun, 10 Dec 2023 13:37:45 +0100 Subject: [PATCH] ndpiReader: fix `guessed_flow_protocols` statistic Increment the counter only if the flow has been guessed --- example/ndpiReader.c | 2 +- example/reader_util.c | 2 +- tests/cfgs/caches_cfg/result/teams.pcap.out | 2 +- tests/cfgs/default/result/1kxun.pcap.out | 2 +- tests/cfgs/default/result/4in4tunnel.pcap.out | 2 +- tests/cfgs/default/result/4in6tunnel.pcap.out | 2 +- tests/cfgs/default/result/6in4tunnel.pcap.out | 2 +- tests/cfgs/default/result/6in6tunnel.pcap.out | 2 +- tests/cfgs/default/result/KakaoTalk_chat.pcap.out | 2 +- tests/cfgs/default/result/KakaoTalk_talk.pcap.out | 2 +- tests/cfgs/default/result/WebattackRCE.pcap.out | 2 +- tests/cfgs/default/result/ajp.pcap.out | 2 +- tests/cfgs/default/result/android.pcap.out | 2 +- tests/cfgs/default/result/anyconnect-vpn.pcap.out | 2 +- tests/cfgs/default/result/bt_search.pcap.out | 2 +- tests/cfgs/default/result/capwap.pcap.out | 2 +- tests/cfgs/default/result/capwap_data.pcapng.out | 2 +- tests/cfgs/default/result/cloudflare-warp.pcap.out | 2 +- tests/cfgs/default/result/dns_fragmented.pcap.out | 2 +- tests/cfgs/default/result/dns_invert_query.pcapng.out | 2 +- tests/cfgs/default/result/dtls.pcap.out | 2 +- tests/cfgs/default/result/dtls_certificate.pcapng.out | 2 +- tests/cfgs/default/result/encrypted_sni.pcap.out | 2 +- tests/cfgs/default/result/ftp.pcap.out | 2 +- tests/cfgs/default/result/fuzz-2006-06-26-2594.pcap.out | 2 +- tests/cfgs/default/result/fuzz-2006-09-29-28586.pcap.out | 2 +- tests/cfgs/default/result/fuzz-2020-02-16-11740.pcap.out | 2 +- tests/cfgs/default/result/fuzz-2021-10-13.pcap.out | 2 +- tests/cfgs/default/result/gnutella.pcap.out | 2 +- tests/cfgs/default/result/gtp_false_positive.pcapng.out | 2 +- tests/cfgs/default/result/h323-overflow.pcap.out | 2 +- tests/cfgs/default/result/http_asymmetric.pcapng.out | 2 +- tests/cfgs/default/result/imaps.pcap.out | 2 +- tests/cfgs/default/result/instagram.pcap.out | 2 +- tests/cfgs/default/result/ip_fragmented_garbage.pcap.out | 2 +- tests/cfgs/default/result/iphone.pcap.out | 2 +- tests/cfgs/default/result/ipv6_in_gtp.pcap.out | 2 +- tests/cfgs/default/result/kerberos.pcap.out | 2 +- tests/cfgs/default/result/kerberos_fuzz.pcapng.out | 2 +- tests/cfgs/default/result/kontiki.pcap.out | 2 +- tests/cfgs/default/result/linecall_falsepositve.pcap.out | 2 +- tests/cfgs/default/result/log4j-webapp-exploit.pcap.out | 2 +- tests/cfgs/default/result/lru_ipv6_caches.pcapng.out | 2 +- tests/cfgs/default/result/malware.pcap.out | 2 +- tests/cfgs/default/result/mongodb.pcap.out | 2 +- tests/cfgs/default/result/mpeg-dash.pcap.out | 2 +- tests/cfgs/default/result/natpmp.pcap.out | 2 +- tests/cfgs/default/result/netbios_wildcard_dns_query.pcap.out | 2 +- tests/cfgs/default/result/no_sni.pcap.out | 2 +- tests/cfgs/default/result/ocs.pcap.out | 2 +- tests/cfgs/default/result/ossfuzz_seed_fake_traces_3.pcapng.out | 2 +- tests/cfgs/default/result/ossfuzz_seed_fake_traces_4.pcapng.out | 2 +- tests/cfgs/default/result/pop3.pcap.out | 2 +- tests/cfgs/default/result/pops.pcapng.out | 2 +- tests/cfgs/default/result/pps.pcap.out | 2 +- tests/cfgs/default/result/punycode-idn.pcap.out | 2 +- tests/cfgs/default/result/quic_interop_V.pcapng.out | 2 +- tests/cfgs/default/result/quickplay.pcap.out | 2 +- tests/cfgs/default/result/reasm_crash_anon.pcapng.out | 2 +- tests/cfgs/default/result/shadowsocks.pcap.out | 2 +- tests/cfgs/default/result/skype.pcap.out | 2 +- tests/cfgs/default/result/skype_no_unknown.pcap.out | 2 +- tests/cfgs/default/result/snmp.pcap.out | 2 +- tests/cfgs/default/result/soap.pcap.out | 2 +- tests/cfgs/default/result/softether.pcap.out | 2 +- tests/cfgs/default/result/starcraft_battle.pcap.out | 2 +- tests/cfgs/default/result/stun.pcap.out | 2 +- .../default/result/stun_dtls_unidirectional_client.pcap.out | 2 +- .../default/result/stun_dtls_unidirectional_server.pcap.out | 2 +- .../default/result/stun_tcp_multiple_msgs_same_pkt.pcap.out | 2 +- tests/cfgs/default/result/synscan.pcap.out | 2 +- tests/cfgs/default/result/syslog.pcap.out | 2 +- .../default/result/targusdataspeed_false_positives.pcap.out | 2 +- tests/cfgs/default/result/tcp_scan.pcapng.out | 2 +- tests/cfgs/default/result/teams.pcap.out | 2 +- tests/cfgs/default/result/telegram.pcap.out | 2 +- tests/cfgs/default/result/telegram_videocall.pcapng.out | 2 +- tests/cfgs/default/result/tls-appdata.pcap.out | 2 +- tests/cfgs/default/result/tls-esni-fuzzed.pcap.out | 2 +- tests/cfgs/default/result/tls_alert.pcap.out | 2 +- tests/cfgs/default/result/tls_certificate_too_long.pcap.out | 2 +- tests/cfgs/default/result/tls_cipher_lens.pcap.out | 2 +- tests/cfgs/default/result/tls_false_positives.pcapng.out | 2 +- tests/cfgs/default/result/tls_invalid_reads.pcap.out | 2 +- tests/cfgs/default/result/tls_port_80.pcapng.out | 2 +- tests/cfgs/default/result/tunnelbear.pcap.out | 2 +- tests/cfgs/default/result/viber.pcap.out | 2 +- tests/cfgs/default/result/vk.pcapng.out | 2 +- tests/cfgs/default/result/wa_voice.pcap.out | 2 +- tests/cfgs/default/result/waze.pcap.out | 2 +- tests/cfgs/default/result/webex.pcap.out | 2 +- tests/cfgs/default/result/wechat.pcap.out | 2 +- tests/cfgs/default/result/weibo.pcap.out | 2 +- tests/cfgs/default/result/whatsapp_login_chat.pcap.out | 2 +- tests/cfgs/default/result/xiaomi.pcap.out | 2 +- tests/cfgs/default/result/yandex.pcapng.out | 2 +- tests/cfgs/default/result/zoom.pcap.out | 2 +- tests/cfgs/default/result/zoom_p2p.pcapng.out | 2 +- tests/cfgs/disable_protocols/result/soap.pcap.out | 2 +- .../disable_stun_monitoring/result/lru_ipv6_caches.pcapng.out | 2 +- tests/cfgs/enable_payload_stat/result/1kxun.pcap.out | 2 +- .../result/wa_voice.pcap.out | 2 +- 102 files changed, 102 insertions(+), 102 deletions(-) diff --git a/example/ndpiReader.c b/example/ndpiReader.c index 490e0f4cb07..0e0f8aa6576 100644 --- a/example/ndpiReader.c +++ b/example/ndpiReader.c @@ -2167,7 +2167,7 @@ static void node_proto_guess_walker(const void *node, ndpi_VISIT which, int dept flow->ndpi_flow, enable_protocol_guess, &proto_guessed); malloc_size_stats = 0; - if(enable_protocol_guess) ndpi_thread_info[thread_id].workflow->stats.guessed_flow_protocols++; + if(proto_guessed) ndpi_thread_info[thread_id].workflow->stats.guessed_flow_protocols++; } process_ndpi_collected_info(ndpi_thread_info[thread_id].workflow, flow); diff --git a/example/reader_util.c b/example/reader_util.c index 47873cbe0da..64b00b18f11 100644 --- a/example/reader_util.c +++ b/example/reader_util.c @@ -1744,7 +1744,7 @@ static struct ndpi_proto packet_processing(struct ndpi_workflow * workflow, flow->detected_protocol = ndpi_detection_giveup(workflow->ndpi_struct, flow->ndpi_flow, enable_protocol_guess, &proto_guessed); - if(enable_protocol_guess) workflow->stats.guessed_flow_protocols++; + if(proto_guessed) workflow->stats.guessed_flow_protocols++; } process_ndpi_collected_info(workflow, flow); diff --git a/tests/cfgs/caches_cfg/result/teams.pcap.out b/tests/cfgs/caches_cfg/result/teams.pcap.out index 51854e13eed..01013c5c416 100644 --- a/tests/cfgs/caches_cfg/result/teams.pcap.out +++ b/tests/cfgs/caches_cfg/result/teams.pcap.out @@ -1,4 +1,4 @@ -Guessed flow protos: 4 +Guessed flow protos: 2 DPI Packets (TCP): 337 (8.02 pkts/flow) DPI Packets (UDP): 74 (1.85 pkts/flow) diff --git a/tests/cfgs/default/result/1kxun.pcap.out b/tests/cfgs/default/result/1kxun.pcap.out index 7567528e432..c2f7811ca22 100644 --- a/tests/cfgs/default/result/1kxun.pcap.out +++ b/tests/cfgs/default/result/1kxun.pcap.out @@ -1,4 +1,4 @@ -Guessed flow protos: 25 +Guessed flow protos: 6 DPI Packets (TCP): 408 (4.16 pkts/flow) DPI Packets (UDP): 120 (1.21 pkts/flow) diff --git a/tests/cfgs/default/result/4in4tunnel.pcap.out b/tests/cfgs/default/result/4in4tunnel.pcap.out index 2c79ecbe1bf..702811947f2 100644 --- a/tests/cfgs/default/result/4in4tunnel.pcap.out +++ b/tests/cfgs/default/result/4in4tunnel.pcap.out @@ -1,4 +1,4 @@ -Guessed flow protos: 1 +Guessed flow protos: 0 DPI Packets (UDP): 5 (5.00 pkts/flow) Confidence Unknown : 1 (flows) diff --git a/tests/cfgs/default/result/4in6tunnel.pcap.out b/tests/cfgs/default/result/4in6tunnel.pcap.out index 38a9e74a512..786ccd0d38b 100644 --- a/tests/cfgs/default/result/4in6tunnel.pcap.out +++ b/tests/cfgs/default/result/4in6tunnel.pcap.out @@ -1,4 +1,4 @@ -Guessed flow protos: 1 +Guessed flow protos: 0 DPI Packets (TCP): 4 (4.00 pkts/flow) Confidence DPI : 1 (flows) diff --git a/tests/cfgs/default/result/6in4tunnel.pcap.out b/tests/cfgs/default/result/6in4tunnel.pcap.out index 54aa8cd92e9..828a803cf7d 100644 --- a/tests/cfgs/default/result/6in4tunnel.pcap.out +++ b/tests/cfgs/default/result/6in4tunnel.pcap.out @@ -1,4 +1,4 @@ -Guessed flow protos: 2 +Guessed flow protos: 0 DPI Packets (TCP): 29 (5.80 pkts/flow) DPI Packets (UDP): 4 (2.00 pkts/flow) diff --git a/tests/cfgs/default/result/6in6tunnel.pcap.out b/tests/cfgs/default/result/6in6tunnel.pcap.out index d4980a0de1d..e6c8bf3ceb2 100644 --- a/tests/cfgs/default/result/6in6tunnel.pcap.out +++ b/tests/cfgs/default/result/6in6tunnel.pcap.out @@ -1,4 +1,4 @@ -Guessed flow protos: 1 +Guessed flow protos: 0 DPI Packets (UDP): 2 (2.00 pkts/flow) Confidence Unknown : 1 (flows) diff --git a/tests/cfgs/default/result/KakaoTalk_chat.pcap.out b/tests/cfgs/default/result/KakaoTalk_chat.pcap.out index d6b4a52b21a..01a6c9cf10f 100644 --- a/tests/cfgs/default/result/KakaoTalk_chat.pcap.out +++ b/tests/cfgs/default/result/KakaoTalk_chat.pcap.out @@ -1,4 +1,4 @@ -Guessed flow protos: 8 +Guessed flow protos: 5 DPI Packets (TCP): 166 (8.74 pkts/flow) DPI Packets (UDP): 36 (2.00 pkts/flow) diff --git a/tests/cfgs/default/result/KakaoTalk_talk.pcap.out b/tests/cfgs/default/result/KakaoTalk_talk.pcap.out index d37db5dce4e..06b3b8f5810 100644 --- a/tests/cfgs/default/result/KakaoTalk_talk.pcap.out +++ b/tests/cfgs/default/result/KakaoTalk_talk.pcap.out @@ -1,4 +1,4 @@ -Guessed flow protos: 11 +Guessed flow protos: 9 DPI Packets (TCP): 71 (4.73 pkts/flow) DPI Packets (UDP): 10 (2.00 pkts/flow) diff --git a/tests/cfgs/default/result/WebattackRCE.pcap.out b/tests/cfgs/default/result/WebattackRCE.pcap.out index eced3dafcdd..f9a2247c0f1 100644 --- a/tests/cfgs/default/result/WebattackRCE.pcap.out +++ b/tests/cfgs/default/result/WebattackRCE.pcap.out @@ -1,4 +1,4 @@ -Guessed flow protos: 797 +Guessed flow protos: 0 DPI Packets (TCP): 797 (1.00 pkts/flow) Confidence DPI : 797 (flows) diff --git a/tests/cfgs/default/result/ajp.pcap.out b/tests/cfgs/default/result/ajp.pcap.out index ad4faa3fb36..d4c8fdd3178 100644 --- a/tests/cfgs/default/result/ajp.pcap.out +++ b/tests/cfgs/default/result/ajp.pcap.out @@ -1,4 +1,4 @@ -Guessed flow protos: 2 +Guessed flow protos: 0 DPI Packets (TCP): 8 (4.00 pkts/flow) DPI Packets (other): 6 (3.00 pkts/flow) diff --git a/tests/cfgs/default/result/android.pcap.out b/tests/cfgs/default/result/android.pcap.out index 4f8a581d9ea..13bed82d767 100644 --- a/tests/cfgs/default/result/android.pcap.out +++ b/tests/cfgs/default/result/android.pcap.out @@ -1,4 +1,4 @@ -Guessed flow protos: 7 +Guessed flow protos: 3 DPI Packets (TCP): 147 (5.25 pkts/flow) DPI Packets (UDP): 52 (1.68 pkts/flow) diff --git a/tests/cfgs/default/result/anyconnect-vpn.pcap.out b/tests/cfgs/default/result/anyconnect-vpn.pcap.out index d0361f19378..20e5fcaf891 100644 --- a/tests/cfgs/default/result/anyconnect-vpn.pcap.out +++ b/tests/cfgs/default/result/anyconnect-vpn.pcap.out @@ -1,4 +1,4 @@ -Guessed flow protos: 10 +Guessed flow protos: 6 DPI Packets (TCP): 131 (5.95 pkts/flow) DPI Packets (UDP): 82 (2.22 pkts/flow) diff --git a/tests/cfgs/default/result/bt_search.pcap.out b/tests/cfgs/default/result/bt_search.pcap.out index a1f4f982360..f6e449d5964 100644 --- a/tests/cfgs/default/result/bt_search.pcap.out +++ b/tests/cfgs/default/result/bt_search.pcap.out @@ -1,4 +1,4 @@ -Guessed flow protos: 1 +Guessed flow protos: 0 DPI Packets (UDP): 2 (2.00 pkts/flow) Confidence DPI : 1 (flows) diff --git a/tests/cfgs/default/result/capwap.pcap.out b/tests/cfgs/default/result/capwap.pcap.out index 03a1ee3b942..95650c3a5d3 100644 --- a/tests/cfgs/default/result/capwap.pcap.out +++ b/tests/cfgs/default/result/capwap.pcap.out @@ -1,4 +1,4 @@ -Guessed flow protos: 1 +Guessed flow protos: 0 DPI Packets (UDP): 7 (1.17 pkts/flow) DPI Packets (other): 4 (1.00 pkts/flow) diff --git a/tests/cfgs/default/result/capwap_data.pcapng.out b/tests/cfgs/default/result/capwap_data.pcapng.out index 349f4be5ad8..1f0690c1e70 100644 --- a/tests/cfgs/default/result/capwap_data.pcapng.out +++ b/tests/cfgs/default/result/capwap_data.pcapng.out @@ -1,4 +1,4 @@ -Guessed flow protos: 3 +Guessed flow protos: 0 DPI Packets (TCP): 14 (4.67 pkts/flow) Confidence DPI : 3 (flows) diff --git a/tests/cfgs/default/result/cloudflare-warp.pcap.out b/tests/cfgs/default/result/cloudflare-warp.pcap.out index 06df664e776..03641344bbd 100644 --- a/tests/cfgs/default/result/cloudflare-warp.pcap.out +++ b/tests/cfgs/default/result/cloudflare-warp.pcap.out @@ -1,4 +1,4 @@ -Guessed flow protos: 4 +Guessed flow protos: 3 DPI Packets (TCP): 41 (5.12 pkts/flow) Confidence Match by port : 2 (flows) diff --git a/tests/cfgs/default/result/dns_fragmented.pcap.out b/tests/cfgs/default/result/dns_fragmented.pcap.out index e86b802f22b..4e5c38c452d 100644 --- a/tests/cfgs/default/result/dns_fragmented.pcap.out +++ b/tests/cfgs/default/result/dns_fragmented.pcap.out @@ -1,4 +1,4 @@ -Guessed flow protos: 1 +Guessed flow protos: 0 DPI Packets (TCP): 12 (6.00 pkts/flow) DPI Packets (UDP): 39 (2.05 pkts/flow) diff --git a/tests/cfgs/default/result/dns_invert_query.pcapng.out b/tests/cfgs/default/result/dns_invert_query.pcapng.out index 81a90c8a445..921e8c7c600 100644 --- a/tests/cfgs/default/result/dns_invert_query.pcapng.out +++ b/tests/cfgs/default/result/dns_invert_query.pcapng.out @@ -1,4 +1,4 @@ -Guessed flow protos: 1 +Guessed flow protos: 0 DPI Packets (UDP): 2 (2.00 pkts/flow) Confidence DPI : 1 (flows) diff --git a/tests/cfgs/default/result/dtls.pcap.out b/tests/cfgs/default/result/dtls.pcap.out index 542c8471656..5ab7622a803 100644 --- a/tests/cfgs/default/result/dtls.pcap.out +++ b/tests/cfgs/default/result/dtls.pcap.out @@ -1,4 +1,4 @@ -Guessed flow protos: 1 +Guessed flow protos: 0 DPI Packets (UDP): 2 (2.00 pkts/flow) Confidence DPI : 1 (flows) diff --git a/tests/cfgs/default/result/dtls_certificate.pcapng.out b/tests/cfgs/default/result/dtls_certificate.pcapng.out index 8f2b8dd5954..e704d64f5ac 100644 --- a/tests/cfgs/default/result/dtls_certificate.pcapng.out +++ b/tests/cfgs/default/result/dtls_certificate.pcapng.out @@ -1,4 +1,4 @@ -Guessed flow protos: 1 +Guessed flow protos: 0 DPI Packets (UDP): 1 (1.00 pkts/flow) Confidence DPI : 1 (flows) diff --git a/tests/cfgs/default/result/encrypted_sni.pcap.out b/tests/cfgs/default/result/encrypted_sni.pcap.out index d7d28c7d8b2..dec3ef07a33 100644 --- a/tests/cfgs/default/result/encrypted_sni.pcap.out +++ b/tests/cfgs/default/result/encrypted_sni.pcap.out @@ -1,4 +1,4 @@ -Guessed flow protos: 3 +Guessed flow protos: 0 DPI Packets (TCP): 3 (1.00 pkts/flow) Confidence DPI : 3 (flows) diff --git a/tests/cfgs/default/result/ftp.pcap.out b/tests/cfgs/default/result/ftp.pcap.out index 1727f1c9527..e88a846b6a5 100644 --- a/tests/cfgs/default/result/ftp.pcap.out +++ b/tests/cfgs/default/result/ftp.pcap.out @@ -1,4 +1,4 @@ -Guessed flow protos: 1 +Guessed flow protos: 0 DPI Packets (TCP): 39 (13.00 pkts/flow) Confidence Unknown : 1 (flows) diff --git a/tests/cfgs/default/result/fuzz-2006-06-26-2594.pcap.out b/tests/cfgs/default/result/fuzz-2006-06-26-2594.pcap.out index 4c89f618809..7135c244ef7 100644 --- a/tests/cfgs/default/result/fuzz-2006-06-26-2594.pcap.out +++ b/tests/cfgs/default/result/fuzz-2006-06-26-2594.pcap.out @@ -1,4 +1,4 @@ -Guessed flow protos: 172 +Guessed flow protos: 27 DPI Packets (TCP): 48 (2.29 pkts/flow) DPI Packets (UDP): 369 (1.64 pkts/flow) diff --git a/tests/cfgs/default/result/fuzz-2006-09-29-28586.pcap.out b/tests/cfgs/default/result/fuzz-2006-09-29-28586.pcap.out index 0a62eae84a0..c0269f48323 100644 --- a/tests/cfgs/default/result/fuzz-2006-09-29-28586.pcap.out +++ b/tests/cfgs/default/result/fuzz-2006-09-29-28586.pcap.out @@ -1,4 +1,4 @@ -Guessed flow protos: 36 +Guessed flow protos: 26 DPI Packets (TCP): 104 (2.67 pkts/flow) DPI Packets (other): 1 (1.00 pkts/flow) diff --git a/tests/cfgs/default/result/fuzz-2020-02-16-11740.pcap.out b/tests/cfgs/default/result/fuzz-2020-02-16-11740.pcap.out index 6a73c303866..d88c0a5d9cf 100644 --- a/tests/cfgs/default/result/fuzz-2020-02-16-11740.pcap.out +++ b/tests/cfgs/default/result/fuzz-2020-02-16-11740.pcap.out @@ -1,4 +1,4 @@ -Guessed flow protos: 22 +Guessed flow protos: 3 DPI Packets (UDP): 70 (1.00 pkts/flow) DPI Packets (other): 7 (1.00 pkts/flow) diff --git a/tests/cfgs/default/result/fuzz-2021-10-13.pcap.out b/tests/cfgs/default/result/fuzz-2021-10-13.pcap.out index 0e643f65ef2..b4bd5c2aca6 100644 --- a/tests/cfgs/default/result/fuzz-2021-10-13.pcap.out +++ b/tests/cfgs/default/result/fuzz-2021-10-13.pcap.out @@ -1,4 +1,4 @@ -Guessed flow protos: 1 +Guessed flow protos: 0 DPI Packets (TCP): 1 (1.00 pkts/flow) Confidence Unknown : 1 (flows) diff --git a/tests/cfgs/default/result/gnutella.pcap.out b/tests/cfgs/default/result/gnutella.pcap.out index 1cf6f521dff..c4663e310fd 100644 --- a/tests/cfgs/default/result/gnutella.pcap.out +++ b/tests/cfgs/default/result/gnutella.pcap.out @@ -1,4 +1,4 @@ -Guessed flow protos: 394 +Guessed flow protos: 1 DPI Packets (TCP): 528 (3.85 pkts/flow) DPI Packets (UDP): 886 (1.45 pkts/flow) diff --git a/tests/cfgs/default/result/gtp_false_positive.pcapng.out b/tests/cfgs/default/result/gtp_false_positive.pcapng.out index 082ad4820ee..96596bc00a5 100644 --- a/tests/cfgs/default/result/gtp_false_positive.pcapng.out +++ b/tests/cfgs/default/result/gtp_false_positive.pcapng.out @@ -1,4 +1,4 @@ -Guessed flow protos: 3 +Guessed flow protos: 2 DPI Packets (UDP): 7 (2.33 pkts/flow) Confidence Unknown : 1 (flows) diff --git a/tests/cfgs/default/result/h323-overflow.pcap.out b/tests/cfgs/default/result/h323-overflow.pcap.out index e64e0bd30a9..bfa23d58c98 100644 --- a/tests/cfgs/default/result/h323-overflow.pcap.out +++ b/tests/cfgs/default/result/h323-overflow.pcap.out @@ -1,4 +1,4 @@ -Guessed flow protos: 1 +Guessed flow protos: 0 DPI Packets (TCP): 1 (1.00 pkts/flow) Confidence nBPF : 1 (flows) diff --git a/tests/cfgs/default/result/http_asymmetric.pcapng.out b/tests/cfgs/default/result/http_asymmetric.pcapng.out index 50c52b91859..d2636c65487 100644 --- a/tests/cfgs/default/result/http_asymmetric.pcapng.out +++ b/tests/cfgs/default/result/http_asymmetric.pcapng.out @@ -1,4 +1,4 @@ -Guessed flow protos: 1 +Guessed flow protos: 0 DPI Packets (TCP): 21 (10.50 pkts/flow) Confidence DPI : 2 (flows) diff --git a/tests/cfgs/default/result/imaps.pcap.out b/tests/cfgs/default/result/imaps.pcap.out index e08b5a94450..e3500fd6b45 100644 --- a/tests/cfgs/default/result/imaps.pcap.out +++ b/tests/cfgs/default/result/imaps.pcap.out @@ -1,4 +1,4 @@ -Guessed flow protos: 1 +Guessed flow protos: 0 DPI Packets (TCP): 15 (7.50 pkts/flow) Confidence DPI : 2 (flows) diff --git a/tests/cfgs/default/result/instagram.pcap.out b/tests/cfgs/default/result/instagram.pcap.out index a3e17b16b20..3e7b2a9e87d 100644 --- a/tests/cfgs/default/result/instagram.pcap.out +++ b/tests/cfgs/default/result/instagram.pcap.out @@ -1,4 +1,4 @@ -Guessed flow protos: 12 +Guessed flow protos: 7 DPI Packets (TCP): 219 (7.30 pkts/flow) DPI Packets (UDP): 10 (1.43 pkts/flow) diff --git a/tests/cfgs/default/result/ip_fragmented_garbage.pcap.out b/tests/cfgs/default/result/ip_fragmented_garbage.pcap.out index f240d1a92bf..7dc6ba4589e 100644 --- a/tests/cfgs/default/result/ip_fragmented_garbage.pcap.out +++ b/tests/cfgs/default/result/ip_fragmented_garbage.pcap.out @@ -1,4 +1,4 @@ -Guessed flow protos: 1 +Guessed flow protos: 0 DPI Packets (TCP): 29 (29.00 pkts/flow) Confidence Unknown : 1 (flows) diff --git a/tests/cfgs/default/result/iphone.pcap.out b/tests/cfgs/default/result/iphone.pcap.out index 44462c6a536..38ad14c952d 100644 --- a/tests/cfgs/default/result/iphone.pcap.out +++ b/tests/cfgs/default/result/iphone.pcap.out @@ -1,4 +1,4 @@ -Guessed flow protos: 3 +Guessed flow protos: 1 DPI Packets (TCP): 107 (7.13 pkts/flow) DPI Packets (UDP): 55 (1.77 pkts/flow) diff --git a/tests/cfgs/default/result/ipv6_in_gtp.pcap.out b/tests/cfgs/default/result/ipv6_in_gtp.pcap.out index 6a265d5cfd7..ba79751180d 100644 --- a/tests/cfgs/default/result/ipv6_in_gtp.pcap.out +++ b/tests/cfgs/default/result/ipv6_in_gtp.pcap.out @@ -1,4 +1,4 @@ -Guessed flow protos: 1 +Guessed flow protos: 0 DPI Packets (UDP): 1 (1.00 pkts/flow) DPI Packets (other): 1 (1.00 pkts/flow) diff --git a/tests/cfgs/default/result/kerberos.pcap.out b/tests/cfgs/default/result/kerberos.pcap.out index d84de7644b1..b9846873ecf 100644 --- a/tests/cfgs/default/result/kerberos.pcap.out +++ b/tests/cfgs/default/result/kerberos.pcap.out @@ -1,4 +1,4 @@ -Guessed flow protos: 29 +Guessed flow protos: 23 DPI Packets (TCP): 77 (2.14 pkts/flow) Confidence Unknown : 2 (flows) diff --git a/tests/cfgs/default/result/kerberos_fuzz.pcapng.out b/tests/cfgs/default/result/kerberos_fuzz.pcapng.out index db7b0ebfac9..d0dc03a7330 100644 --- a/tests/cfgs/default/result/kerberos_fuzz.pcapng.out +++ b/tests/cfgs/default/result/kerberos_fuzz.pcapng.out @@ -1,4 +1,4 @@ -Guessed flow protos: 1 +Guessed flow protos: 0 DPI Packets (TCP): 1 (1.00 pkts/flow) Confidence DPI : 1 (flows) diff --git a/tests/cfgs/default/result/kontiki.pcap.out b/tests/cfgs/default/result/kontiki.pcap.out index 82b55e5e1d6..726f1e4c497 100644 --- a/tests/cfgs/default/result/kontiki.pcap.out +++ b/tests/cfgs/default/result/kontiki.pcap.out @@ -1,4 +1,4 @@ -Guessed flow protos: 2 +Guessed flow protos: 0 DPI Packets (UDP): 6 (1.50 pkts/flow) DPI Packets (other): 4 (1.00 pkts/flow) diff --git a/tests/cfgs/default/result/linecall_falsepositve.pcap.out b/tests/cfgs/default/result/linecall_falsepositve.pcap.out index 905c761fe9e..89c1c2f2c0a 100644 --- a/tests/cfgs/default/result/linecall_falsepositve.pcap.out +++ b/tests/cfgs/default/result/linecall_falsepositve.pcap.out @@ -1,4 +1,4 @@ -Guessed flow protos: 1 +Guessed flow protos: 0 DPI Packets (UDP): 13 (13.00 pkts/flow) Confidence Unknown : 1 (flows) diff --git a/tests/cfgs/default/result/log4j-webapp-exploit.pcap.out b/tests/cfgs/default/result/log4j-webapp-exploit.pcap.out index fbb5083f024..30095a4c15b 100644 --- a/tests/cfgs/default/result/log4j-webapp-exploit.pcap.out +++ b/tests/cfgs/default/result/log4j-webapp-exploit.pcap.out @@ -1,4 +1,4 @@ -Guessed flow protos: 2 +Guessed flow protos: 0 DPI Packets (TCP): 56 (8.00 pkts/flow) Confidence Unknown : 2 (flows) diff --git a/tests/cfgs/default/result/lru_ipv6_caches.pcapng.out b/tests/cfgs/default/result/lru_ipv6_caches.pcapng.out index 19e22069d5c..9cd50fb9b92 100644 --- a/tests/cfgs/default/result/lru_ipv6_caches.pcapng.out +++ b/tests/cfgs/default/result/lru_ipv6_caches.pcapng.out @@ -1,4 +1,4 @@ -Guessed flow protos: 3 +Guessed flow protos: 0 DPI Packets (TCP): 9 (3.00 pkts/flow) DPI Packets (UDP): 36 (4.00 pkts/flow) diff --git a/tests/cfgs/default/result/malware.pcap.out b/tests/cfgs/default/result/malware.pcap.out index 5e239e8a120..02b9a5c8c42 100644 --- a/tests/cfgs/default/result/malware.pcap.out +++ b/tests/cfgs/default/result/malware.pcap.out @@ -1,4 +1,4 @@ -Guessed flow protos: 2 +Guessed flow protos: 1 DPI Packets (TCP): 26 (6.50 pkts/flow) DPI Packets (UDP): 2 (2.00 pkts/flow) diff --git a/tests/cfgs/default/result/mongodb.pcap.out b/tests/cfgs/default/result/mongodb.pcap.out index d38404b7f7e..08bec4098b1 100644 --- a/tests/cfgs/default/result/mongodb.pcap.out +++ b/tests/cfgs/default/result/mongodb.pcap.out @@ -1,4 +1,4 @@ -Guessed flow protos: 3 +Guessed flow protos: 2 DPI Packets (TCP): 27 (3.38 pkts/flow) Confidence Unknown : 1 (flows) diff --git a/tests/cfgs/default/result/mpeg-dash.pcap.out b/tests/cfgs/default/result/mpeg-dash.pcap.out index 79eeb085f06..61d3a211636 100644 --- a/tests/cfgs/default/result/mpeg-dash.pcap.out +++ b/tests/cfgs/default/result/mpeg-dash.pcap.out @@ -1,4 +1,4 @@ -Guessed flow protos: 3 +Guessed flow protos: 0 DPI Packets (TCP): 13 (3.25 pkts/flow) Confidence DPI : 4 (flows) diff --git a/tests/cfgs/default/result/natpmp.pcap.out b/tests/cfgs/default/result/natpmp.pcap.out index ad73b4ab120..f78e119422c 100644 --- a/tests/cfgs/default/result/natpmp.pcap.out +++ b/tests/cfgs/default/result/natpmp.pcap.out @@ -1,4 +1,4 @@ -Guessed flow protos: 4 +Guessed flow protos: 0 DPI Packets (UDP): 11 (2.75 pkts/flow) Confidence DPI : 4 (flows) diff --git a/tests/cfgs/default/result/netbios_wildcard_dns_query.pcap.out b/tests/cfgs/default/result/netbios_wildcard_dns_query.pcap.out index 64c254eab56..5c18eb39c32 100644 --- a/tests/cfgs/default/result/netbios_wildcard_dns_query.pcap.out +++ b/tests/cfgs/default/result/netbios_wildcard_dns_query.pcap.out @@ -1,4 +1,4 @@ -Guessed flow protos: 1 +Guessed flow protos: 0 DPI Packets (UDP): 1 (1.00 pkts/flow) Confidence DPI : 1 (flows) diff --git a/tests/cfgs/default/result/no_sni.pcap.out b/tests/cfgs/default/result/no_sni.pcap.out index 768acd8f1ff..b7aec9a647a 100644 --- a/tests/cfgs/default/result/no_sni.pcap.out +++ b/tests/cfgs/default/result/no_sni.pcap.out @@ -1,4 +1,4 @@ -Guessed flow protos: 1 +Guessed flow protos: 0 DPI Packets (TCP): 51 (6.38 pkts/flow) Confidence DPI : 8 (flows) diff --git a/tests/cfgs/default/result/ocs.pcap.out b/tests/cfgs/default/result/ocs.pcap.out index da3d22289f8..7312aac6885 100644 --- a/tests/cfgs/default/result/ocs.pcap.out +++ b/tests/cfgs/default/result/ocs.pcap.out @@ -1,4 +1,4 @@ -Guessed flow protos: 13 +Guessed flow protos: 2 DPI Packets (TCP): 92 (7.67 pkts/flow) DPI Packets (UDP): 8 (1.00 pkts/flow) diff --git a/tests/cfgs/default/result/ossfuzz_seed_fake_traces_3.pcapng.out b/tests/cfgs/default/result/ossfuzz_seed_fake_traces_3.pcapng.out index 0442a08d2fe..132d169c0eb 100644 --- a/tests/cfgs/default/result/ossfuzz_seed_fake_traces_3.pcapng.out +++ b/tests/cfgs/default/result/ossfuzz_seed_fake_traces_3.pcapng.out @@ -1,4 +1,4 @@ -Guessed flow protos: 1 +Guessed flow protos: 0 DPI Packets (TCP): 4 (4.00 pkts/flow) Confidence DPI : 1 (flows) diff --git a/tests/cfgs/default/result/ossfuzz_seed_fake_traces_4.pcapng.out b/tests/cfgs/default/result/ossfuzz_seed_fake_traces_4.pcapng.out index 0860aa9c686..133c478dc8a 100644 --- a/tests/cfgs/default/result/ossfuzz_seed_fake_traces_4.pcapng.out +++ b/tests/cfgs/default/result/ossfuzz_seed_fake_traces_4.pcapng.out @@ -1,4 +1,4 @@ -Guessed flow protos: 1 +Guessed flow protos: 0 DPI Packets (UDP): 2 (2.00 pkts/flow) Confidence Unknown : 1 (flows) diff --git a/tests/cfgs/default/result/pop3.pcap.out b/tests/cfgs/default/result/pop3.pcap.out index d8c1040f6e1..b9f5278eb87 100644 --- a/tests/cfgs/default/result/pop3.pcap.out +++ b/tests/cfgs/default/result/pop3.pcap.out @@ -1,4 +1,4 @@ -Guessed flow protos: 2 +Guessed flow protos: 0 DPI Packets (TCP): 83 (13.83 pkts/flow) Confidence DPI : 6 (flows) diff --git a/tests/cfgs/default/result/pops.pcapng.out b/tests/cfgs/default/result/pops.pcapng.out index 419a23cec8d..9eece430118 100644 --- a/tests/cfgs/default/result/pops.pcapng.out +++ b/tests/cfgs/default/result/pops.pcapng.out @@ -1,4 +1,4 @@ -Guessed flow protos: 1 +Guessed flow protos: 0 DPI Packets (TCP): 5 (5.00 pkts/flow) Confidence DPI : 1 (flows) diff --git a/tests/cfgs/default/result/pps.pcap.out b/tests/cfgs/default/result/pps.pcap.out index baa0429fa84..2f72cdb1036 100644 --- a/tests/cfgs/default/result/pps.pcap.out +++ b/tests/cfgs/default/result/pps.pcap.out @@ -1,4 +1,4 @@ -Guessed flow protos: 38 +Guessed flow protos: 2 DPI Packets (TCP): 141 (2.24 pkts/flow) DPI Packets (UDP): 136 (3.09 pkts/flow) diff --git a/tests/cfgs/default/result/punycode-idn.pcap.out b/tests/cfgs/default/result/punycode-idn.pcap.out index 68745f731e4..226ad59feb4 100644 --- a/tests/cfgs/default/result/punycode-idn.pcap.out +++ b/tests/cfgs/default/result/punycode-idn.pcap.out @@ -1,4 +1,4 @@ -Guessed flow protos: 1 +Guessed flow protos: 0 DPI Packets (TCP): 8 (8.00 pkts/flow) DPI Packets (UDP): 4 (2.00 pkts/flow) diff --git a/tests/cfgs/default/result/quic_interop_V.pcapng.out b/tests/cfgs/default/result/quic_interop_V.pcapng.out index c6e5621058a..38f522d62e3 100644 --- a/tests/cfgs/default/result/quic_interop_V.pcapng.out +++ b/tests/cfgs/default/result/quic_interop_V.pcapng.out @@ -1,4 +1,4 @@ -Guessed flow protos: 33 +Guessed flow protos: 0 DPI Packets (UDP): 113 (1.79 pkts/flow) DPI Packets (other): 14 (1.00 pkts/flow) diff --git a/tests/cfgs/default/result/quickplay.pcap.out b/tests/cfgs/default/result/quickplay.pcap.out index 48b4f2ab4c5..aabf41328a9 100644 --- a/tests/cfgs/default/result/quickplay.pcap.out +++ b/tests/cfgs/default/result/quickplay.pcap.out @@ -1,4 +1,4 @@ -Guessed flow protos: 8 +Guessed flow protos: 0 DPI Packets (TCP): 78 (3.71 pkts/flow) Confidence DPI : 21 (flows) diff --git a/tests/cfgs/default/result/reasm_crash_anon.pcapng.out b/tests/cfgs/default/result/reasm_crash_anon.pcapng.out index 4c8818efa72..492b823a183 100644 --- a/tests/cfgs/default/result/reasm_crash_anon.pcapng.out +++ b/tests/cfgs/default/result/reasm_crash_anon.pcapng.out @@ -1,4 +1,4 @@ -Guessed flow protos: 1 +Guessed flow protos: 0 DPI Packets (TCP): 23 (23.00 pkts/flow) Confidence Unknown : 1 (flows) diff --git a/tests/cfgs/default/result/shadowsocks.pcap.out b/tests/cfgs/default/result/shadowsocks.pcap.out index 4331b38e750..258acf5c4e1 100644 --- a/tests/cfgs/default/result/shadowsocks.pcap.out +++ b/tests/cfgs/default/result/shadowsocks.pcap.out @@ -1,4 +1,4 @@ -Guessed flow protos: 1 +Guessed flow protos: 0 DPI Packets (TCP): 21 (10.50 pkts/flow) Confidence Unknown : 1 (flows) diff --git a/tests/cfgs/default/result/skype.pcap.out b/tests/cfgs/default/result/skype.pcap.out index dde906da30a..dd506e06f90 100644 --- a/tests/cfgs/default/result/skype.pcap.out +++ b/tests/cfgs/default/result/skype.pcap.out @@ -1,4 +1,4 @@ -Guessed flow protos: 95 +Guessed flow protos: 28 DPI Packets (TCP): 1493 (15.39 pkts/flow) DPI Packets (UDP): 337 (1.76 pkts/flow) diff --git a/tests/cfgs/default/result/skype_no_unknown.pcap.out b/tests/cfgs/default/result/skype_no_unknown.pcap.out index 958f93457f3..709c4691cd5 100644 --- a/tests/cfgs/default/result/skype_no_unknown.pcap.out +++ b/tests/cfgs/default/result/skype_no_unknown.pcap.out @@ -1,4 +1,4 @@ -Guessed flow protos: 69 +Guessed flow protos: 22 DPI Packets (TCP): 1053 (13.86 pkts/flow) DPI Packets (UDP): 288 (1.55 pkts/flow) diff --git a/tests/cfgs/default/result/snmp.pcap.out b/tests/cfgs/default/result/snmp.pcap.out index 528d131ac67..3f1550c2e3b 100644 --- a/tests/cfgs/default/result/snmp.pcap.out +++ b/tests/cfgs/default/result/snmp.pcap.out @@ -1,4 +1,4 @@ -Guessed flow protos: 2 +Guessed flow protos: 0 DPI Packets (UDP): 24 (1.41 pkts/flow) Confidence DPI : 17 (flows) diff --git a/tests/cfgs/default/result/soap.pcap.out b/tests/cfgs/default/result/soap.pcap.out index 89289626aa3..e236eb9a287 100644 --- a/tests/cfgs/default/result/soap.pcap.out +++ b/tests/cfgs/default/result/soap.pcap.out @@ -1,4 +1,4 @@ -Guessed flow protos: 2 +Guessed flow protos: 1 DPI Packets (TCP): 20 (6.67 pkts/flow) Confidence Match by port : 1 (flows) diff --git a/tests/cfgs/default/result/softether.pcap.out b/tests/cfgs/default/result/softether.pcap.out index 955faea742d..b90e3b96ac1 100644 --- a/tests/cfgs/default/result/softether.pcap.out +++ b/tests/cfgs/default/result/softether.pcap.out @@ -1,4 +1,4 @@ -Guessed flow protos: 1 +Guessed flow protos: 0 DPI Packets (TCP): 4 (4.00 pkts/flow) DPI Packets (UDP): 31 (10.33 pkts/flow) diff --git a/tests/cfgs/default/result/starcraft_battle.pcap.out b/tests/cfgs/default/result/starcraft_battle.pcap.out index 253b130fd06..0bf5bddaffa 100644 --- a/tests/cfgs/default/result/starcraft_battle.pcap.out +++ b/tests/cfgs/default/result/starcraft_battle.pcap.out @@ -1,4 +1,4 @@ -Guessed flow protos: 15 +Guessed flow protos: 13 DPI Packets (TCP): 165 (4.34 pkts/flow) DPI Packets (UDP): 36 (2.77 pkts/flow) diff --git a/tests/cfgs/default/result/stun.pcap.out b/tests/cfgs/default/result/stun.pcap.out index f4078a04e0a..5522185b11d 100644 --- a/tests/cfgs/default/result/stun.pcap.out +++ b/tests/cfgs/default/result/stun.pcap.out @@ -1,4 +1,4 @@ -Guessed flow protos: 1 +Guessed flow protos: 0 DPI Packets (TCP): 9 (4.50 pkts/flow) DPI Packets (UDP): 16 (3.20 pkts/flow) diff --git a/tests/cfgs/default/result/stun_dtls_unidirectional_client.pcap.out b/tests/cfgs/default/result/stun_dtls_unidirectional_client.pcap.out index 5c41173be47..0acba5a7f57 100644 --- a/tests/cfgs/default/result/stun_dtls_unidirectional_client.pcap.out +++ b/tests/cfgs/default/result/stun_dtls_unidirectional_client.pcap.out @@ -1,4 +1,4 @@ -Guessed flow protos: 1 +Guessed flow protos: 0 DPI Packets (UDP): 6 (6.00 pkts/flow) Confidence DPI : 1 (flows) diff --git a/tests/cfgs/default/result/stun_dtls_unidirectional_server.pcap.out b/tests/cfgs/default/result/stun_dtls_unidirectional_server.pcap.out index 45f162e20b5..10e3013e03d 100644 --- a/tests/cfgs/default/result/stun_dtls_unidirectional_server.pcap.out +++ b/tests/cfgs/default/result/stun_dtls_unidirectional_server.pcap.out @@ -1,4 +1,4 @@ -Guessed flow protos: 1 +Guessed flow protos: 0 DPI Packets (UDP): 6 (6.00 pkts/flow) Confidence DPI : 1 (flows) diff --git a/tests/cfgs/default/result/stun_tcp_multiple_msgs_same_pkt.pcap.out b/tests/cfgs/default/result/stun_tcp_multiple_msgs_same_pkt.pcap.out index 29624e0894c..fdddc4d395c 100644 --- a/tests/cfgs/default/result/stun_tcp_multiple_msgs_same_pkt.pcap.out +++ b/tests/cfgs/default/result/stun_tcp_multiple_msgs_same_pkt.pcap.out @@ -1,4 +1,4 @@ -Guessed flow protos: 1 +Guessed flow protos: 0 DPI Packets (TCP): 5 (5.00 pkts/flow) Confidence DPI : 1 (flows) diff --git a/tests/cfgs/default/result/synscan.pcap.out b/tests/cfgs/default/result/synscan.pcap.out index a195a5d2f85..8481dc0771b 100644 --- a/tests/cfgs/default/result/synscan.pcap.out +++ b/tests/cfgs/default/result/synscan.pcap.out @@ -1,4 +1,4 @@ -Guessed flow protos: 1992 +Guessed flow protos: 132 DPI Packets (TCP): 2011 (1.01 pkts/flow) Confidence Unknown : 1860 (flows) diff --git a/tests/cfgs/default/result/syslog.pcap.out b/tests/cfgs/default/result/syslog.pcap.out index 04072093b9f..e20cd3a750c 100644 --- a/tests/cfgs/default/result/syslog.pcap.out +++ b/tests/cfgs/default/result/syslog.pcap.out @@ -1,4 +1,4 @@ -Guessed flow protos: 1 +Guessed flow protos: 0 DPI Packets (TCP): 10 (5.00 pkts/flow) DPI Packets (UDP): 20 (1.00 pkts/flow) diff --git a/tests/cfgs/default/result/targusdataspeed_false_positives.pcap.out b/tests/cfgs/default/result/targusdataspeed_false_positives.pcap.out index 7eb91c5764f..c5c074511dc 100644 --- a/tests/cfgs/default/result/targusdataspeed_false_positives.pcap.out +++ b/tests/cfgs/default/result/targusdataspeed_false_positives.pcap.out @@ -1,4 +1,4 @@ -Guessed flow protos: 2 +Guessed flow protos: 0 DPI Packets (UDP): 4 (2.00 pkts/flow) Confidence DPI : 2 (flows) diff --git a/tests/cfgs/default/result/tcp_scan.pcapng.out b/tests/cfgs/default/result/tcp_scan.pcapng.out index 3089bf814d5..c043935a85e 100644 --- a/tests/cfgs/default/result/tcp_scan.pcapng.out +++ b/tests/cfgs/default/result/tcp_scan.pcapng.out @@ -1,4 +1,4 @@ -Guessed flow protos: 7 +Guessed flow protos: 4 DPI Packets (TCP): 18 (2.57 pkts/flow) Confidence Unknown : 3 (flows) diff --git a/tests/cfgs/default/result/teams.pcap.out b/tests/cfgs/default/result/teams.pcap.out index bb94160376c..766aa6eb44c 100644 --- a/tests/cfgs/default/result/teams.pcap.out +++ b/tests/cfgs/default/result/teams.pcap.out @@ -1,4 +1,4 @@ -Guessed flow protos: 4 +Guessed flow protos: 2 DPI Packets (TCP): 337 (8.02 pkts/flow) DPI Packets (UDP): 74 (1.85 pkts/flow) diff --git a/tests/cfgs/default/result/telegram.pcap.out b/tests/cfgs/default/result/telegram.pcap.out index 324406025e9..c4f82d3fd64 100644 --- a/tests/cfgs/default/result/telegram.pcap.out +++ b/tests/cfgs/default/result/telegram.pcap.out @@ -1,4 +1,4 @@ -Guessed flow protos: 6 +Guessed flow protos: 0 DPI Packets (UDP): 82 (1.71 pkts/flow) Confidence Unknown : 3 (flows) diff --git a/tests/cfgs/default/result/telegram_videocall.pcapng.out b/tests/cfgs/default/result/telegram_videocall.pcapng.out index 9ff77a2e7ac..d87aed34b44 100644 --- a/tests/cfgs/default/result/telegram_videocall.pcapng.out +++ b/tests/cfgs/default/result/telegram_videocall.pcapng.out @@ -1,4 +1,4 @@ -Guessed flow protos: 20 +Guessed flow protos: 9 DPI Packets (TCP): 113 (11.30 pkts/flow) DPI Packets (UDP): 82 (4.32 pkts/flow) diff --git a/tests/cfgs/default/result/tls-appdata.pcap.out b/tests/cfgs/default/result/tls-appdata.pcap.out index 41c30ee27d8..29121967ce5 100644 --- a/tests/cfgs/default/result/tls-appdata.pcap.out +++ b/tests/cfgs/default/result/tls-appdata.pcap.out @@ -1,4 +1,4 @@ -Guessed flow protos: 1 +Guessed flow protos: 0 DPI Packets (TCP): 17 (8.50 pkts/flow) Confidence DPI : 2 (flows) diff --git a/tests/cfgs/default/result/tls-esni-fuzzed.pcap.out b/tests/cfgs/default/result/tls-esni-fuzzed.pcap.out index 1760a33b9f2..5c27043de00 100644 --- a/tests/cfgs/default/result/tls-esni-fuzzed.pcap.out +++ b/tests/cfgs/default/result/tls-esni-fuzzed.pcap.out @@ -1,4 +1,4 @@ -Guessed flow protos: 3 +Guessed flow protos: 0 DPI Packets (TCP): 3 (1.00 pkts/flow) Confidence DPI : 3 (flows) diff --git a/tests/cfgs/default/result/tls_alert.pcap.out b/tests/cfgs/default/result/tls_alert.pcap.out index f4f44384ef4..2ec8e29c7eb 100644 --- a/tests/cfgs/default/result/tls_alert.pcap.out +++ b/tests/cfgs/default/result/tls_alert.pcap.out @@ -1,4 +1,4 @@ -Guessed flow protos: 1 +Guessed flow protos: 0 DPI Packets (TCP): 12 (6.00 pkts/flow) Confidence DPI : 2 (flows) diff --git a/tests/cfgs/default/result/tls_certificate_too_long.pcap.out b/tests/cfgs/default/result/tls_certificate_too_long.pcap.out index 0708231a6ee..54f7f4760d1 100644 --- a/tests/cfgs/default/result/tls_certificate_too_long.pcap.out +++ b/tests/cfgs/default/result/tls_certificate_too_long.pcap.out @@ -1,4 +1,4 @@ -Guessed flow protos: 4 +Guessed flow protos: 1 DPI Packets (TCP): 105 (6.56 pkts/flow) DPI Packets (UDP): 33 (1.94 pkts/flow) diff --git a/tests/cfgs/default/result/tls_cipher_lens.pcap.out b/tests/cfgs/default/result/tls_cipher_lens.pcap.out index a23e4228250..ec5801e060c 100644 --- a/tests/cfgs/default/result/tls_cipher_lens.pcap.out +++ b/tests/cfgs/default/result/tls_cipher_lens.pcap.out @@ -1,4 +1,4 @@ -Guessed flow protos: 5 +Guessed flow protos: 0 DPI Packets (TCP): 5 (1.00 pkts/flow) Confidence DPI : 5 (flows) diff --git a/tests/cfgs/default/result/tls_false_positives.pcapng.out b/tests/cfgs/default/result/tls_false_positives.pcapng.out index 057c7aa607a..66a65f44605 100644 --- a/tests/cfgs/default/result/tls_false_positives.pcapng.out +++ b/tests/cfgs/default/result/tls_false_positives.pcapng.out @@ -1,4 +1,4 @@ -Guessed flow protos: 1 +Guessed flow protos: 0 DPI Packets (TCP): 13 (13.00 pkts/flow) Confidence Unknown : 1 (flows) diff --git a/tests/cfgs/default/result/tls_invalid_reads.pcap.out b/tests/cfgs/default/result/tls_invalid_reads.pcap.out index f7cb3303637..e2b6353a858 100644 --- a/tests/cfgs/default/result/tls_invalid_reads.pcap.out +++ b/tests/cfgs/default/result/tls_invalid_reads.pcap.out @@ -1,4 +1,4 @@ -Guessed flow protos: 2 +Guessed flow protos: 1 DPI Packets (TCP): 10 (3.33 pkts/flow) Confidence Match by port : 1 (flows) diff --git a/tests/cfgs/default/result/tls_port_80.pcapng.out b/tests/cfgs/default/result/tls_port_80.pcapng.out index 7d1c3f6b0ac..26f5c9e8ff7 100644 --- a/tests/cfgs/default/result/tls_port_80.pcapng.out +++ b/tests/cfgs/default/result/tls_port_80.pcapng.out @@ -1,4 +1,4 @@ -Guessed flow protos: 1 +Guessed flow protos: 0 DPI Packets (TCP): 13 (13.00 pkts/flow) Confidence DPI : 1 (flows) diff --git a/tests/cfgs/default/result/tunnelbear.pcap.out b/tests/cfgs/default/result/tunnelbear.pcap.out index 0de9fb15056..8fe3ca4fec8 100644 --- a/tests/cfgs/default/result/tunnelbear.pcap.out +++ b/tests/cfgs/default/result/tunnelbear.pcap.out @@ -1,4 +1,4 @@ -Guessed flow protos: 3 +Guessed flow protos: 1 DPI Packets (TCP): 125 (5.95 pkts/flow) Confidence Match by port : 1 (flows) diff --git a/tests/cfgs/default/result/viber.pcap.out b/tests/cfgs/default/result/viber.pcap.out index 20c898f8eda..bd9a967ecb7 100644 --- a/tests/cfgs/default/result/viber.pcap.out +++ b/tests/cfgs/default/result/viber.pcap.out @@ -1,4 +1,4 @@ -Guessed flow protos: 5 +Guessed flow protos: 4 DPI Packets (TCP): 94 (7.23 pkts/flow) DPI Packets (UDP): 27 (1.93 pkts/flow) diff --git a/tests/cfgs/default/result/vk.pcapng.out b/tests/cfgs/default/result/vk.pcapng.out index d31a555de6a..edb9d084b0d 100644 --- a/tests/cfgs/default/result/vk.pcapng.out +++ b/tests/cfgs/default/result/vk.pcapng.out @@ -1,4 +1,4 @@ -Guessed flow protos: 3 +Guessed flow protos: 0 DPI Packets (TCP): 107 (10.70 pkts/flow) Confidence DPI : 10 (flows) diff --git a/tests/cfgs/default/result/wa_voice.pcap.out b/tests/cfgs/default/result/wa_voice.pcap.out index 3d665945ec7..e7977f20267 100644 --- a/tests/cfgs/default/result/wa_voice.pcap.out +++ b/tests/cfgs/default/result/wa_voice.pcap.out @@ -1,4 +1,4 @@ -Guessed flow protos: 3 +Guessed flow protos: 0 DPI Packets (TCP): 20 (3.33 pkts/flow) DPI Packets (UDP): 33 (1.57 pkts/flow) diff --git a/tests/cfgs/default/result/waze.pcap.out b/tests/cfgs/default/result/waze.pcap.out index cea40705a4c..6a8a9112c32 100644 --- a/tests/cfgs/default/result/waze.pcap.out +++ b/tests/cfgs/default/result/waze.pcap.out @@ -1,4 +1,4 @@ -Guessed flow protos: 10 +Guessed flow protos: 9 DPI Packets (TCP): 208 (6.50 pkts/flow) DPI Packets (UDP): 1 (1.00 pkts/flow) diff --git a/tests/cfgs/default/result/webex.pcap.out b/tests/cfgs/default/result/webex.pcap.out index 8e22adfc8f9..ee8e582205b 100644 --- a/tests/cfgs/default/result/webex.pcap.out +++ b/tests/cfgs/default/result/webex.pcap.out @@ -1,4 +1,4 @@ -Guessed flow protos: 17 +Guessed flow protos: 4 DPI Packets (TCP): 395 (7.18 pkts/flow) DPI Packets (UDP): 14 (7.00 pkts/flow) diff --git a/tests/cfgs/default/result/wechat.pcap.out b/tests/cfgs/default/result/wechat.pcap.out index f950f1dc44f..7aa0af4a03f 100644 --- a/tests/cfgs/default/result/wechat.pcap.out +++ b/tests/cfgs/default/result/wechat.pcap.out @@ -1,4 +1,4 @@ -Guessed flow protos: 43 +Guessed flow protos: 25 DPI Packets (TCP): 448 (7.59 pkts/flow) DPI Packets (UDP): 70 (1.89 pkts/flow) diff --git a/tests/cfgs/default/result/weibo.pcap.out b/tests/cfgs/default/result/weibo.pcap.out index 2dcc57c7627..e3ad26db22b 100644 --- a/tests/cfgs/default/result/weibo.pcap.out +++ b/tests/cfgs/default/result/weibo.pcap.out @@ -1,4 +1,4 @@ -Guessed flow protos: 27 +Guessed flow protos: 21 DPI Packets (TCP): 100 (3.33 pkts/flow) DPI Packets (UDP): 43 (3.07 pkts/flow) diff --git a/tests/cfgs/default/result/whatsapp_login_chat.pcap.out b/tests/cfgs/default/result/whatsapp_login_chat.pcap.out index dcdc299a011..e0365562a82 100644 --- a/tests/cfgs/default/result/whatsapp_login_chat.pcap.out +++ b/tests/cfgs/default/result/whatsapp_login_chat.pcap.out @@ -1,4 +1,4 @@ -Guessed flow protos: 2 +Guessed flow protos: 0 DPI Packets (TCP): 17 (5.67 pkts/flow) DPI Packets (UDP): 7 (1.17 pkts/flow) diff --git a/tests/cfgs/default/result/xiaomi.pcap.out b/tests/cfgs/default/result/xiaomi.pcap.out index a436d831a31..90a929230e9 100644 --- a/tests/cfgs/default/result/xiaomi.pcap.out +++ b/tests/cfgs/default/result/xiaomi.pcap.out @@ -1,4 +1,4 @@ -Guessed flow protos: 1 +Guessed flow protos: 0 DPI Packets (TCP): 19 (2.71 pkts/flow) Confidence DPI : 7 (flows) diff --git a/tests/cfgs/default/result/yandex.pcapng.out b/tests/cfgs/default/result/yandex.pcapng.out index 3f2ad8cc94c..b828eb00fc6 100644 --- a/tests/cfgs/default/result/yandex.pcapng.out +++ b/tests/cfgs/default/result/yandex.pcapng.out @@ -1,4 +1,4 @@ -Guessed flow protos: 4 +Guessed flow protos: 0 DPI Packets (TCP): 78 (8.67 pkts/flow) Confidence DPI : 9 (flows) diff --git a/tests/cfgs/default/result/zoom.pcap.out b/tests/cfgs/default/result/zoom.pcap.out index 87bfccdd87a..f461329b2dd 100644 --- a/tests/cfgs/default/result/zoom.pcap.out +++ b/tests/cfgs/default/result/zoom.pcap.out @@ -1,4 +1,4 @@ -Guessed flow protos: 5 +Guessed flow protos: 2 DPI Packets (TCP): 110 (7.86 pkts/flow) DPI Packets (UDP): 23 (1.35 pkts/flow) diff --git a/tests/cfgs/default/result/zoom_p2p.pcapng.out b/tests/cfgs/default/result/zoom_p2p.pcapng.out index a58a5a66517..a9282da78b9 100644 --- a/tests/cfgs/default/result/zoom_p2p.pcapng.out +++ b/tests/cfgs/default/result/zoom_p2p.pcapng.out @@ -1,4 +1,4 @@ -Guessed flow protos: 5 +Guessed flow protos: 4 DPI Packets (UDP): 52 (5.20 pkts/flow) DPI Packets (other): 2 (1.00 pkts/flow) diff --git a/tests/cfgs/disable_protocols/result/soap.pcap.out b/tests/cfgs/disable_protocols/result/soap.pcap.out index 5bbbc57bd35..d1417060f40 100644 --- a/tests/cfgs/disable_protocols/result/soap.pcap.out +++ b/tests/cfgs/disable_protocols/result/soap.pcap.out @@ -1,4 +1,4 @@ -Guessed flow protos: 3 +Guessed flow protos: 2 DPI Packets (TCP): 20 (6.67 pkts/flow) Confidence Match by port : 2 (flows) diff --git a/tests/cfgs/disable_stun_monitoring/result/lru_ipv6_caches.pcapng.out b/tests/cfgs/disable_stun_monitoring/result/lru_ipv6_caches.pcapng.out index 19e22069d5c..9cd50fb9b92 100644 --- a/tests/cfgs/disable_stun_monitoring/result/lru_ipv6_caches.pcapng.out +++ b/tests/cfgs/disable_stun_monitoring/result/lru_ipv6_caches.pcapng.out @@ -1,4 +1,4 @@ -Guessed flow protos: 3 +Guessed flow protos: 0 DPI Packets (TCP): 9 (3.00 pkts/flow) DPI Packets (UDP): 36 (4.00 pkts/flow) diff --git a/tests/cfgs/enable_payload_stat/result/1kxun.pcap.out b/tests/cfgs/enable_payload_stat/result/1kxun.pcap.out index 447eb4d0ecb..7b86352bf5a 100644 --- a/tests/cfgs/enable_payload_stat/result/1kxun.pcap.out +++ b/tests/cfgs/enable_payload_stat/result/1kxun.pcap.out @@ -1,4 +1,4 @@ -Guessed flow protos: 25 +Guessed flow protos: 6 DPI Packets (TCP): 408 (4.16 pkts/flow) DPI Packets (UDP): 120 (1.21 pkts/flow) diff --git a/tests/cfgs/enable_stun_monitoring_with_subproto/result/wa_voice.pcap.out b/tests/cfgs/enable_stun_monitoring_with_subproto/result/wa_voice.pcap.out index ee7f07b1539..86cd2a88df6 100644 --- a/tests/cfgs/enable_stun_monitoring_with_subproto/result/wa_voice.pcap.out +++ b/tests/cfgs/enable_stun_monitoring_with_subproto/result/wa_voice.pcap.out @@ -1,4 +1,4 @@ -Guessed flow protos: 8 +Guessed flow protos: 0 DPI Packets (TCP): 20 (3.33 pkts/flow) DPI Packets (UDP): 102 (4.86 pkts/flow)