From be50493f4480a17fbcd88a4ae9cc6b825bc5970d Mon Sep 17 00:00:00 2001 From: Vladimir Gavrilov <105977161+0xA50C1A1@users.noreply.github.com> Date: Tue, 5 Dec 2023 10:06:15 +0300 Subject: [PATCH] Add IEEE C37.118 protocol dissector (#2193) --- doc/protocols.rst | 9 ++ src/include/ndpi_protocol_ids.h | 1 + src/lib/ndpi_main.c | 7 ++ src/lib/ndpi_private.h | 1 + src/lib/protocols/ieee-c37118.c | 93 ++++++++++++++++++ tests/cfgs/caches_cfg/result/ookla.pcap.out | 2 +- tests/cfgs/caches_cfg/result/teams.pcap.out | 2 +- tests/cfgs/default/pcap/ieee_c37118.pcap | Bin 0 -> 86506 bytes tests/cfgs/default/result/1kxun.pcap.out | 2 +- tests/cfgs/default/result/443-chrome.pcap.out | 2 +- tests/cfgs/default/result/443-opvn.pcap.out | 2 +- tests/cfgs/default/result/4in4tunnel.pcap.out | 2 +- tests/cfgs/default/result/6in6tunnel.pcap.out | 2 +- tests/cfgs/default/result/EAQ.pcap.out | 2 +- .../FAX-Call-t38-CA-TDM-SIP-FB-1.pcap.out | 2 +- .../default/result/KakaoTalk_chat.pcap.out | 2 +- .../default/result/KakaoTalk_talk.pcap.out | 2 +- tests/cfgs/default/result/Oscar.pcap.out | 2 +- .../cfgs/default/result/alexa-app.pcapng.out | 2 +- tests/cfgs/default/result/amqp.pcap.out | 2 +- .../default/result/anyconnect-vpn.pcap.out | 2 +- .../result/bittorrent_tcp_miss.pcapng.out | 2 +- tests/cfgs/default/result/cassandra.pcap.out | 2 +- .../default/result/cloudflare-warp.pcap.out | 2 +- tests/cfgs/default/result/collectd.pcap.out | 2 +- .../result/custom_rules_ipv6.pcapng.out | 10 +- ...om_rules_same-ip_multiple_ports.pcapng.out | 6 +- .../cfgs/default/result/dhcp-fuzz.pcapng.out | 2 +- tests/cfgs/default/result/discord.pcap.out | 2 +- .../default/result/discord_mid_flow.pcap.out | 2 +- .../dnscrypt-v1-and-resolver-pings.pcap.out | 2 +- .../cfgs/default/result/dnscrypt-v2.pcap.out | 2 +- .../dnscrypt_skype_false_positive.pcapng.out | 2 +- tests/cfgs/default/result/edonkey.pcap.out | 2 +- tests/cfgs/default/result/emotet.pcap.out | 2 +- .../cfgs/default/result/epicgames.pcapng.out | 2 +- tests/cfgs/default/result/fastcgi.pcap.out | 2 +- .../default/result/ftp-start-tls.pcap.out | 2 +- tests/cfgs/default/result/ftp.pcap.out | 2 +- tests/cfgs/default/result/ftp_failed.pcap.out | 2 +- .../result/fuzz-2006-06-26-2594.pcap.out | 2 +- .../result/fuzz-2006-09-29-28586.pcap.out | 2 +- .../result/fuzz-2020-02-16-11740.pcap.out | 2 +- .../default/result/fuzz-2021-10-13.pcap.out | 2 +- tests/cfgs/default/result/gnutella.pcap.out | 2 +- tests/cfgs/default/result/google_ssl.pcap.out | 2 +- .../result/gtp_false_positive.pcapng.out | 2 +- tests/cfgs/default/result/h323.pcap.out | 2 +- .../http_guessed_host_and_guessed.pcapng.out | 2 +- tests/cfgs/default/result/http_ipv6.pcap.out | 2 +- .../cfgs/default/result/ieee_c37118.pcap.out | 30 ++++++ .../default/result/imap-starttls.pcap.out | 2 +- tests/cfgs/default/result/imap.pcap.out | 2 +- tests/cfgs/default/result/imo.pcap.out | 2 +- tests/cfgs/default/result/instagram.pcap.out | 2 +- tests/cfgs/default/result/iphone.pcap.out | 2 +- .../cfgs/default/result/ipv6_in_gtp.pcap.out | 2 +- tests/cfgs/default/result/irc.pcap.out | 2 +- .../default/result/iso9506-1-mms.pcap.out | 2 +- tests/cfgs/default/result/jabber.pcap.out | 2 +- tests/cfgs/default/result/kerberos.pcap.out | 2 +- tests/cfgs/default/result/kontiki.pcap.out | 2 +- .../result/linecall_falsepositve.pcap.out | 2 +- .../result/log4j-webapp-exploit.pcap.out | 2 +- .../default/result/lru_ipv6_caches.pcapng.out | 2 +- tests/cfgs/default/result/memcached.cap.out | 2 +- .../result/mongo_false_positive.pcapng.out | 2 +- tests/cfgs/default/result/mssql_tds.pcap.out | 2 +- .../default/result/mullvad_wireguard.pcap.out | 2 +- .../default/result/nest_log_sink.pcap.out | 2 +- tests/cfgs/default/result/netbios.pcap.out | 2 +- tests/cfgs/default/result/nintendo.pcap.out | 2 +- tests/cfgs/default/result/nntp.pcap.out | 2 +- tests/cfgs/default/result/ookla.pcap.out | 2 +- tests/cfgs/default/result/openvpn.pcap.out | 2 +- tests/cfgs/default/result/oracle12.pcapng.out | 2 +- .../ossfuzz_seed_fake_traces_1.pcapng.out | 2 +- .../ossfuzz_seed_fake_traces_2.pcapng.out | 2 +- .../ossfuzz_seed_fake_traces_4.pcapng.out | 2 +- tests/cfgs/default/result/pgsql.pcap.out | 2 +- tests/cfgs/default/result/pop3.pcap.out | 2 +- tests/cfgs/default/result/pop3_stls.pcap.out | 2 +- tests/cfgs/default/result/pps.pcap.out | 2 +- tests/cfgs/default/result/protobuf.pcap.out | 2 +- tests/cfgs/default/result/protonvpn.pcap.out | 2 +- tests/cfgs/default/result/quic.pcap.out | 2 +- tests/cfgs/default/result/quic_0RTT.pcap.out | 2 +- .../result/radius_false_positive.pcapng.out | 2 +- tests/cfgs/default/result/raknet.pcap.out | 2 +- tests/cfgs/default/result/rdp2.pcap.out | 2 +- .../result/reasm_crash_anon.pcapng.out | 2 +- .../default/result/reasm_segv_anon.pcapng.out | 2 +- tests/cfgs/default/result/riot.pcapng.out | 2 +- tests/cfgs/default/result/rsh.pcap.out | 2 +- tests/cfgs/default/result/rtmp.pcap.out | 2 +- tests/cfgs/default/result/rtp.pcapng.out | 2 +- tests/cfgs/default/result/rx.pcap.out | 2 +- .../cfgs/default/result/s7comm-plus.pcap.out | 2 +- tests/cfgs/default/result/s7comm.pcap.out | 2 +- tests/cfgs/default/result/sflow.pcap.out | 2 +- .../cfgs/default/result/shadowsocks.pcap.out | 2 +- tests/cfgs/default/result/sip.pcap.out | 2 +- .../cfgs/default/result/sip_hello.pcapng.out | 2 +- tests/cfgs/default/result/skinny.pcap.out | 2 +- tests/cfgs/default/result/skype.pcap.out | 2 +- .../default/result/skype_no_unknown.pcap.out | 2 +- tests/cfgs/default/result/skype_udp.pcap.out | 2 +- tests/cfgs/default/result/smb_frags.pcap.out | 2 +- tests/cfgs/default/result/smbv1.pcap.out | 2 +- .../default/result/smtp-starttls.pcap.out | 2 +- tests/cfgs/default/result/smtp.pcap.out | 2 +- tests/cfgs/default/result/soap.pcap.out | 2 +- tests/cfgs/default/result/socks.pcap.out | 2 +- tests/cfgs/default/result/softether.pcap.out | 2 +- .../default/result/starcraft_battle.pcap.out | 2 +- tests/cfgs/default/result/synscan.pcap.out | 4 +- tests/cfgs/default/result/teams.pcap.out | 2 +- tests/cfgs/default/result/teamspeak3.pcap.out | 2 +- tests/cfgs/default/result/teamviewer.pcap.out | 2 +- tests/cfgs/default/result/telegram.pcap.out | 2 +- .../result/telegram_videocall.pcapng.out | 2 +- tests/cfgs/default/result/telnet.pcap.out | 2 +- tests/cfgs/default/result/tftp.pcap.out | 2 +- tests/cfgs/default/result/threema.pcap.out | 2 +- tests/cfgs/default/result/tinc.pcap.out | 2 +- .../cfgs/default/result/tls-appdata.pcap.out | 2 +- .../result/tls_certificate_too_long.pcap.out | 2 +- .../result/tls_false_positives.pcapng.out | 2 +- .../default/result/tls_invalid_reads.pcap.out | 2 +- .../result/tls_missing_ch_frag.pcap.out | 2 +- tests/cfgs/default/result/toca-boca.pcap.out | 2 +- tests/cfgs/default/result/viber.pcap.out | 2 +- tests/cfgs/default/result/vnc.pcap.out | 2 +- tests/cfgs/default/result/wa_video.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.pcap.out | 2 +- .../result/whatsapp_login_chat.pcap.out | 2 +- tests/cfgs/default/result/whois.pcapng.out | 2 +- tests/cfgs/default/result/wireguard.pcap.out | 2 +- tests/cfgs/default/result/z3950.pcapng.out | 2 +- tests/cfgs/default/result/zoom.pcap.out | 2 +- tests/cfgs/default/result/zoom2.pcap.out | 2 +- tests/cfgs/default/result/zoom_p2p.pcapng.out | 2 +- .../result/ookla.pcap.out | 2 +- .../result/dns_long_domainname.pcap.out | 2 +- .../result/quic-mvfst-27.pcapng.out | 2 +- .../disable_protocols/result/soap.pcap.out | 2 +- .../result/lru_ipv6_caches.pcapng.out | 2 +- .../enable_payload_stat/result/1kxun.pcap.out | 2 +- windows/nDPI.vcxproj | 1 + windows/nDPI.vcxproj.filters | 1 + 154 files changed, 295 insertions(+), 152 deletions(-) create mode 100644 src/lib/protocols/ieee-c37118.c create mode 100644 tests/cfgs/default/pcap/ieee_c37118.pcap create mode 100644 tests/cfgs/default/result/ieee_c37118.pcap.out diff --git a/doc/protocols.rst b/doc/protocols.rst index b6c8699b2..039b5b6f0 100644 --- a/doc/protocols.rst +++ b/doc/protocols.rst @@ -299,3 +299,12 @@ The international standard MMS (Manufacturing Message Specification) is an OSI a Programmable Logic Controllers (PLC), Numerical Controllers (NC), or Robot Controllers (RC). References: `Paid Specs: `_. + + +.. _Proto 367: + +`NDPI_PROTOCOL_IEEE_C37118` +============================ +IEEE Standard for Synchrophasor Data Transfer for Power Systems + +References: `Paid Specs: `_. diff --git a/src/include/ndpi_protocol_ids.h b/src/include/ndpi_protocol_ids.h index d9d9d397b..496f16b11 100644 --- a/src/include/ndpi_protocol_ids.h +++ b/src/include/ndpi_protocol_ids.h @@ -395,6 +395,7 @@ typedef enum { NDPI_PROTOCOL_UMAS = 364, NDPI_PROTOCOL_BECKHOFF_ADS = 365, NDPI_PROTOCOL_ISO9506_1_MMS = 366, + NDPI_PROTOCOL_IEEE_C37118 = 367, #ifdef CUSTOM_NDPI_PROTOCOLS #include "../../../nDPI-custom/custom_ndpi_protocol_ids.h" diff --git a/src/lib/ndpi_main.c b/src/lib/ndpi_main.c index 0a29295c2..026e6809a 100644 --- a/src/lib/ndpi_main.c +++ b/src/lib/ndpi_main.c @@ -2166,6 +2166,10 @@ static void ndpi_init_protocol_defaults(struct ndpi_detection_module_struct *ndp "ISO9506-1-MMS", NDPI_PROTOCOL_CATEGORY_IOT_SCADA, ndpi_build_default_ports(ports_a, 0, 0, 0, 0, 0) /* TCP */, ndpi_build_default_ports(ports_b, 0, 0, 0, 0, 0) /* UDP */); + ndpi_set_proto_defaults(ndpi_str, 1 /* cleartext */, 0 /* nw proto */, NDPI_PROTOCOL_ACCEPTABLE, NDPI_PROTOCOL_IEEE_C37118, + "IEEE-C37118", NDPI_PROTOCOL_CATEGORY_IOT_SCADA, + ndpi_build_default_ports(ports_a, 4712, 0, 0, 0, 0) /* TCP */, + ndpi_build_default_ports(ports_b, 4713, 0, 0, 0, 0) /* UDP */); #ifdef CUSTOM_NDPI_PROTOCOLS #include "../../../nDPI-custom/custom_ndpi_main.c" @@ -5617,6 +5621,9 @@ static int ndpi_callback_init(struct ndpi_detection_module_struct *ndpi_str) { /* Manufacturing Message Specification */ init_iso9506_1_mms_dissector(ndpi_str, &a); + /* IEEE C37.118 Synchrophasor Protocol */ + init_ieee_c37118_dissector(ndpi_str, &a); + #ifdef CUSTOM_NDPI_PROTOCOLS #include "../../../nDPI-custom/custom_ndpi_main_init.c" #endif diff --git a/src/lib/ndpi_private.h b/src/lib/ndpi_private.h index a9500d13d..589c03870 100644 --- a/src/lib/ndpi_private.h +++ b/src/lib/ndpi_private.h @@ -626,6 +626,7 @@ void init_fins_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int void init_ethersio_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id); void init_beckhoff_ads_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id); void init_iso9506_1_mms_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id); +void init_ieee_c37118_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id); #endif diff --git a/src/lib/protocols/ieee-c37118.c b/src/lib/protocols/ieee-c37118.c new file mode 100644 index 000000000..c4576287f --- /dev/null +++ b/src/lib/protocols/ieee-c37118.c @@ -0,0 +1,93 @@ +/* + * ieee-c37118.c + * + * IEEE C37.118 Synchrophasor Protocol + * + * Copyright (C) 2023 - ntop.org + * Copyright (C) 2023 - V.G + * + * This file is part of nDPI, an open source deep packet inspection + * library based on the OpenDPI and PACE technology by ipoque GmbH + * + * nDPI is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * nDPI is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with nDPI. If not, see . + * + */ + +#include "ndpi_protocol_ids.h" + +#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_IEEE_C37118 + +#include "ndpi_api.h" +#include "ndpi_private.h" + +static u_int16_t crc16(const u_int8_t* data, size_t n_bytes) +{ + u_int16_t crc = 0xFFFF; + + while (n_bytes--) { + crc ^= *data++ << 8; + for (u_int8_t i = 0; i < 8; i++) { + crc = crc & 0x8000 ? (crc << 1) ^ 0x1021 : crc << 1; + } + } + + return crc & 0xFFFF; +} + +static void ndpi_int_ieee_c37118_add_connection(struct ndpi_detection_module_struct *ndpi_struct, + struct ndpi_flow_struct *flow) +{ + NDPI_LOG_INFO(ndpi_struct, "found IEEE C37.118\n"); + ndpi_set_detected_protocol(ndpi_struct, flow, + NDPI_PROTOCOL_IEEE_C37118, NDPI_PROTOCOL_UNKNOWN, + NDPI_CONFIDENCE_DPI); +} + +static void ndpi_search_ieee_c37118(struct ndpi_detection_module_struct *ndpi_struct, + struct ndpi_flow_struct *flow) +{ + struct ndpi_packet_struct const * const packet = &ndpi_struct->packet; + + NDPI_LOG_DBG(ndpi_struct, "search IEEE C37.118\n"); + + /* A little bit of heuristics. Check the minimum length, + * version (0xAA) and frame type (0 to 5) */ + if ((packet->payload_packet_len >= 17) && (packet->payload[0] == 0xAA) && + ((packet->payload[1] >> 4) < 6)) + { + u_int16_t frame_size = ntohs(get_u_int16_t(packet->payload, 2)); + u_int16_t crc = ntohs(get_u_int16_t(packet->payload, packet->payload_packet_len-2)); + + if ((frame_size == packet->payload_packet_len) && + (crc == crc16(packet->payload, packet->payload_packet_len-2))) + { + ndpi_int_ieee_c37118_add_connection(ndpi_struct, flow); + return; + } + } + + NDPI_EXCLUDE_PROTO(ndpi_struct, flow); +} + +void init_ieee_c37118_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id) +{ + ndpi_set_bitmask_protocol_detection("IEEE-C37118", ndpi_struct, *id, + NDPI_PROTOCOL_IEEE_C37118, + ndpi_search_ieee_c37118, + NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_OR_UDP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION, + SAVE_DETECTION_BITMASK_AS_UNKNOWN, + ADD_TO_DETECTION_BITMASK); + + *id += 1; +} diff --git a/tests/cfgs/caches_cfg/result/ookla.pcap.out b/tests/cfgs/caches_cfg/result/ookla.pcap.out index 03c741802..605d2005c 100644 --- a/tests/cfgs/caches_cfg/result/ookla.pcap.out +++ b/tests/cfgs/caches_cfg/result/ookla.pcap.out @@ -3,7 +3,7 @@ Guessed flow protos: 1 DPI Packets (TCP): 40 (6.67 pkts/flow) Confidence Match by port : 1 (flows) Confidence DPI : 5 (flows) -Num dissector calls: 525 (87.50 diss/flow) +Num dissector calls: 528 (88.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/3/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/caches_cfg/result/teams.pcap.out b/tests/cfgs/caches_cfg/result/teams.pcap.out index e709577b9..011823283 100644 --- a/tests/cfgs/caches_cfg/result/teams.pcap.out +++ b/tests/cfgs/caches_cfg/result/teams.pcap.out @@ -6,7 +6,7 @@ DPI Packets (other): 1 (1.00 pkts/flow) Confidence Unknown : 1 (flows) Confidence Match by port : 2 (flows) Confidence DPI : 80 (flows) -Num dissector calls: 516 (6.22 diss/flow) +Num dissector calls: 518 (6.24 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/9/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/pcap/ieee_c37118.pcap b/tests/cfgs/default/pcap/ieee_c37118.pcap new file mode 100644 index 0000000000000000000000000000000000000000..d4fdcb24bb30ca9d301b0d686f9d5fa77069faca GIT binary patch literal 86506 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

LV>X#gQ%JWqiX+B39X^hm%ri+vw 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 literal 0 HcmV?d00001 diff --git a/tests/cfgs/default/result/1kxun.pcap.out b/tests/cfgs/default/result/1kxun.pcap.out index 36b028185..76da4930d 100644 --- a/tests/cfgs/default/result/1kxun.pcap.out +++ b/tests/cfgs/default/result/1kxun.pcap.out @@ -5,7 +5,7 @@ DPI Packets (UDP): 120 (1.21 pkts/flow) Confidence Unknown : 14 (flows) Confidence Match by port : 6 (flows) Confidence DPI : 177 (flows) -Num dissector calls: 4597 (23.34 diss/flow) +Num dissector calls: 4614 (23.42 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/60/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/443-chrome.pcap.out b/tests/cfgs/default/result/443-chrome.pcap.out index fe91d1c57..9e0b39cf4 100644 --- a/tests/cfgs/default/result/443-chrome.pcap.out +++ b/tests/cfgs/default/result/443-chrome.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 1 DPI Packets (TCP): 1 (1.00 pkts/flow) Confidence Match by port : 1 (flows) -Num dissector calls: 128 (128.00 diss/flow) +Num dissector calls: 129 (129.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/3/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/443-opvn.pcap.out b/tests/cfgs/default/result/443-opvn.pcap.out index eb19de377..8a3dca48f 100644 --- a/tests/cfgs/default/result/443-opvn.pcap.out +++ b/tests/cfgs/default/result/443-opvn.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (TCP): 6 (6.00 pkts/flow) Confidence DPI : 1 (flows) -Num dissector calls: 129 (129.00 diss/flow) +Num dissector calls: 130 (130.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/4in4tunnel.pcap.out b/tests/cfgs/default/result/4in4tunnel.pcap.out index a74a89e20..14be00fa3 100644 --- a/tests/cfgs/default/result/4in4tunnel.pcap.out +++ b/tests/cfgs/default/result/4in4tunnel.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 1 DPI Packets (UDP): 5 (5.00 pkts/flow) Confidence Unknown : 1 (flows) -Num dissector calls: 185 (185.00 diss/flow) +Num dissector calls: 186 (186.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/3/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/6in6tunnel.pcap.out b/tests/cfgs/default/result/6in6tunnel.pcap.out index 69c6af561..d4980a0de 100644 --- a/tests/cfgs/default/result/6in6tunnel.pcap.out +++ b/tests/cfgs/default/result/6in6tunnel.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 1 DPI Packets (UDP): 2 (2.00 pkts/flow) Confidence Unknown : 1 (flows) -Num dissector calls: 135 (135.00 diss/flow) +Num dissector calls: 136 (136.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/3/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/EAQ.pcap.out b/tests/cfgs/default/result/EAQ.pcap.out index 74ce1fdd2..26118294d 100644 --- a/tests/cfgs/default/result/EAQ.pcap.out +++ b/tests/cfgs/default/result/EAQ.pcap.out @@ -3,7 +3,7 @@ Guessed flow protos: 0 DPI Packets (TCP): 12 (6.00 pkts/flow) DPI Packets (UDP): 116 (4.00 pkts/flow) Confidence DPI : 31 (flows) -Num dissector calls: 4629 (149.32 diss/flow) +Num dissector calls: 4658 (150.26 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/FAX-Call-t38-CA-TDM-SIP-FB-1.pcap.out b/tests/cfgs/default/result/FAX-Call-t38-CA-TDM-SIP-FB-1.pcap.out index e772a3a28..4e04ee35b 100644 --- a/tests/cfgs/default/result/FAX-Call-t38-CA-TDM-SIP-FB-1.pcap.out +++ b/tests/cfgs/default/result/FAX-Call-t38-CA-TDM-SIP-FB-1.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (UDP): 7 (1.40 pkts/flow) Confidence DPI : 5 (flows) -Num dissector calls: 143 (28.60 diss/flow) +Num dissector calls: 144 (28.80 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/KakaoTalk_chat.pcap.out b/tests/cfgs/default/result/KakaoTalk_chat.pcap.out index 5ba453628..d6b4a52b2 100644 --- a/tests/cfgs/default/result/KakaoTalk_chat.pcap.out +++ b/tests/cfgs/default/result/KakaoTalk_chat.pcap.out @@ -5,7 +5,7 @@ DPI Packets (UDP): 36 (2.00 pkts/flow) DPI Packets (other): 1 (1.00 pkts/flow) Confidence Match by port : 5 (flows) Confidence DPI : 33 (flows) -Num dissector calls: 555 (14.61 diss/flow) +Num dissector calls: 557 (14.66 diss/flow) LRU cache ookla: 0/1/0 (insert/search/found) LRU cache bittorrent: 0/15/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/KakaoTalk_talk.pcap.out b/tests/cfgs/default/result/KakaoTalk_talk.pcap.out index c3c7b65c5..12f1320f5 100644 --- a/tests/cfgs/default/result/KakaoTalk_talk.pcap.out +++ b/tests/cfgs/default/result/KakaoTalk_talk.pcap.out @@ -5,7 +5,7 @@ DPI Packets (UDP): 10 (2.00 pkts/flow) Confidence Match by port : 8 (flows) Confidence DPI : 11 (flows) Confidence Match by IP : 1 (flows) -Num dissector calls: 1132 (56.60 diss/flow) +Num dissector calls: 1138 (56.90 diss/flow) LRU cache ookla: 0/2/0 (insert/search/found) LRU cache bittorrent: 0/27/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/Oscar.pcap.out b/tests/cfgs/default/result/Oscar.pcap.out index 383488442..e616d9648 100644 --- a/tests/cfgs/default/result/Oscar.pcap.out +++ b/tests/cfgs/default/result/Oscar.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 1 DPI Packets (TCP): 21 (21.00 pkts/flow) Confidence Match by port : 1 (flows) -Num dissector calls: 258 (258.00 diss/flow) +Num dissector calls: 259 (259.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/3/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/alexa-app.pcapng.out b/tests/cfgs/default/result/alexa-app.pcapng.out index 0fc1b28ce..a968c49d7 100644 --- a/tests/cfgs/default/result/alexa-app.pcapng.out +++ b/tests/cfgs/default/result/alexa-app.pcapng.out @@ -5,7 +5,7 @@ DPI Packets (UDP): 64 (1.94 pkts/flow) DPI Packets (other): 6 (1.00 pkts/flow) Confidence Match by port : 14 (flows) Confidence DPI : 146 (flows) -Num dissector calls: 504 (3.15 diss/flow) +Num dissector calls: 505 (3.16 diss/flow) LRU cache ookla: 0/5/0 (insert/search/found) LRU cache bittorrent: 0/42/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/amqp.pcap.out b/tests/cfgs/default/result/amqp.pcap.out index 450700c3b..72627540c 100644 --- a/tests/cfgs/default/result/amqp.pcap.out +++ b/tests/cfgs/default/result/amqp.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (TCP): 9 (3.00 pkts/flow) Confidence DPI : 3 (flows) -Num dissector calls: 377 (125.67 diss/flow) +Num dissector calls: 378 (126.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/anyconnect-vpn.pcap.out b/tests/cfgs/default/result/anyconnect-vpn.pcap.out index b5c2d9fa0..d76ecddd9 100644 --- a/tests/cfgs/default/result/anyconnect-vpn.pcap.out +++ b/tests/cfgs/default/result/anyconnect-vpn.pcap.out @@ -6,7 +6,7 @@ DPI Packets (other): 10 (1.00 pkts/flow) Confidence Unknown : 2 (flows) Confidence Match by port : 6 (flows) Confidence DPI : 61 (flows) -Num dissector calls: 854 (12.38 diss/flow) +Num dissector calls: 856 (12.41 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/24/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/bittorrent_tcp_miss.pcapng.out b/tests/cfgs/default/result/bittorrent_tcp_miss.pcapng.out index ae8fa3e25..5031af632 100644 --- a/tests/cfgs/default/result/bittorrent_tcp_miss.pcapng.out +++ b/tests/cfgs/default/result/bittorrent_tcp_miss.pcapng.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (TCP): 10 (10.00 pkts/flow) Confidence DPI : 1 (flows) -Num dissector calls: 233 (233.00 diss/flow) +Num dissector calls: 234 (234.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 5/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/cassandra.pcap.out b/tests/cfgs/default/result/cassandra.pcap.out index 00b1368de..7c9e463fd 100644 --- a/tests/cfgs/default/result/cassandra.pcap.out +++ b/tests/cfgs/default/result/cassandra.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (TCP): 16 (8.00 pkts/flow) Confidence DPI : 2 (flows) -Num dissector calls: 312 (156.00 diss/flow) +Num dissector calls: 314 (157.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/cloudflare-warp.pcap.out b/tests/cfgs/default/result/cloudflare-warp.pcap.out index 523568fa2..06df664e7 100644 --- a/tests/cfgs/default/result/cloudflare-warp.pcap.out +++ b/tests/cfgs/default/result/cloudflare-warp.pcap.out @@ -4,7 +4,7 @@ DPI Packets (TCP): 41 (5.12 pkts/flow) Confidence Match by port : 2 (flows) Confidence DPI : 5 (flows) Confidence Match by IP : 1 (flows) -Num dissector calls: 187 (23.38 diss/flow) +Num dissector calls: 188 (23.50 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/9/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/collectd.pcap.out b/tests/cfgs/default/result/collectd.pcap.out index ed9b1e3a4..9cae342e8 100644 --- a/tests/cfgs/default/result/collectd.pcap.out +++ b/tests/cfgs/default/result/collectd.pcap.out @@ -3,7 +3,7 @@ Guessed flow protos: 3 DPI Packets (UDP): 13 (1.62 pkts/flow) Confidence Match by port : 3 (flows) Confidence DPI : 5 (flows) -Num dissector calls: 432 (54.00 diss/flow) +Num dissector calls: 435 (54.38 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/9/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/custom_rules_ipv6.pcapng.out b/tests/cfgs/default/result/custom_rules_ipv6.pcapng.out index 60ccdf50d..b5dfc39b6 100644 --- a/tests/cfgs/default/result/custom_rules_ipv6.pcapng.out +++ b/tests/cfgs/default/result/custom_rules_ipv6.pcapng.out @@ -29,8 +29,8 @@ CustomProtocolF 1 1287 1 CustomProtocolG 1 318 1 CustomProtocolH 1 318 1 - 1 UDP [247f:855b:5e16:3caf:3f2c:4134:9592:661b]:100 -> [21bc:b273:7f68:88d7:77a8:585:3990:927b]:1991 [proto: 377/CustomProtocolE][IP: 377/CustomProtocolE][ClearText][Confidence: Unknown][DPI packets: 1][1 pkts/1287 bytes -> 0 pkts/0 bytes][Goodput ratio: 95/0][< 1 sec][Risk: ** Unidirectional Traffic **][Risk Score: 10][Risk Info: No client to server traffic][Plen Bins: 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,100,0,0,0,0,0,0,0,0,0] - 2 UDP [247f:855b:5e16:3caf:3f2c:4134:9592:661b]:36098 -> [21bc:b273:7f68:88d7:77a8:585:3990:927b]:50621 [proto: 378/CustomProtocolF][IP: 378/CustomProtocolF][ClearText][Confidence: Unknown][DPI packets: 1][1 pkts/1287 bytes -> 0 pkts/0 bytes][Goodput ratio: 95/0][< 1 sec][Risk: ** Unidirectional Traffic **][Risk Score: 10][Risk Info: No server to client traffic][Plen Bins: 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,100,0,0,0,0,0,0,0,0,0] - 3 UDP [3ffe:507::1:200:86ff:fe05:80da]:21554 <-> [3ffe:501:4819::42]:5333 [proto: 376/CustomProtocolD][IP: 376/CustomProtocolD][ClearText][Confidence: Unknown][DPI packets: 1][1 pkts/90 bytes <-> 1 pkts/510 bytes][Goodput ratio: 31/88][0.07 sec][PLAIN TEXT (itojun)][Plen Bins: 50,0,0,0,0,0,0,0,0,0,0,0,0,0,50,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0] - 4 UDP [fe80::76ac:b9ff:fe6c:c124]:12717 -> [ff02::1]:64315 [proto: 379/CustomProtocolG][IP: 379/CustomProtocolG][ClearText][Confidence: Unknown][DPI packets: 1][1 pkts/318 bytes -> 0 pkts/0 bytes][Goodput ratio: 80/0][< 1 sec][PLAIN TEXT (BZ.qca956)][Plen Bins: 0,0,0,0,0,0,0,0,100,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0] - 5 UDP [fe80::76ac:b9ff:fe6c:c124]:12718 -> [ff02::1]:26993 [proto: 380/CustomProtocolH][IP: 380/CustomProtocolH][ClearText][Confidence: Unknown][DPI packets: 1][1 pkts/318 bytes -> 0 pkts/0 bytes][Goodput ratio: 80/0][< 1 sec][PLAIN TEXT (BZ.qca956)][Plen Bins: 0,0,0,0,0,0,0,0,100,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0] + 1 UDP [247f:855b:5e16:3caf:3f2c:4134:9592:661b]:100 -> [21bc:b273:7f68:88d7:77a8:585:3990:927b]:1991 [proto: 378/CustomProtocolE][IP: 378/CustomProtocolE][ClearText][Confidence: Unknown][DPI packets: 1][1 pkts/1287 bytes -> 0 pkts/0 bytes][Goodput ratio: 95/0][< 1 sec][Risk: ** Unidirectional Traffic **][Risk Score: 10][Risk Info: No client to server traffic][Plen Bins: 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,100,0,0,0,0,0,0,0,0,0] + 2 UDP [247f:855b:5e16:3caf:3f2c:4134:9592:661b]:36098 -> [21bc:b273:7f68:88d7:77a8:585:3990:927b]:50621 [proto: 379/CustomProtocolF][IP: 379/CustomProtocolF][ClearText][Confidence: Unknown][DPI packets: 1][1 pkts/1287 bytes -> 0 pkts/0 bytes][Goodput ratio: 95/0][< 1 sec][Risk: ** Unidirectional Traffic **][Risk Score: 10][Risk Info: No server to client traffic][Plen Bins: 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,100,0,0,0,0,0,0,0,0,0] + 3 UDP [3ffe:507::1:200:86ff:fe05:80da]:21554 <-> [3ffe:501:4819::42]:5333 [proto: 377/CustomProtocolD][IP: 377/CustomProtocolD][ClearText][Confidence: Unknown][DPI packets: 1][1 pkts/90 bytes <-> 1 pkts/510 bytes][Goodput ratio: 31/88][0.07 sec][PLAIN TEXT (itojun)][Plen Bins: 50,0,0,0,0,0,0,0,0,0,0,0,0,0,50,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0] + 4 UDP [fe80::76ac:b9ff:fe6c:c124]:12717 -> [ff02::1]:64315 [proto: 380/CustomProtocolG][IP: 380/CustomProtocolG][ClearText][Confidence: Unknown][DPI packets: 1][1 pkts/318 bytes -> 0 pkts/0 bytes][Goodput ratio: 80/0][< 1 sec][PLAIN TEXT (BZ.qca956)][Plen Bins: 0,0,0,0,0,0,0,0,100,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0] + 5 UDP [fe80::76ac:b9ff:fe6c:c124]:12718 -> [ff02::1]:26993 [proto: 381/CustomProtocolH][IP: 381/CustomProtocolH][ClearText][Confidence: Unknown][DPI packets: 1][1 pkts/318 bytes -> 0 pkts/0 bytes][Goodput ratio: 80/0][< 1 sec][PLAIN TEXT (BZ.qca956)][Plen Bins: 0,0,0,0,0,0,0,0,100,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0] diff --git a/tests/cfgs/default/result/custom_rules_same-ip_multiple_ports.pcapng.out b/tests/cfgs/default/result/custom_rules_same-ip_multiple_ports.pcapng.out index dfc0e8a3f..06e949fff 100644 --- a/tests/cfgs/default/result/custom_rules_same-ip_multiple_ports.pcapng.out +++ b/tests/cfgs/default/result/custom_rules_same-ip_multiple_ports.pcapng.out @@ -27,6 +27,6 @@ CustomProtocolA 3 222 1 CustomProtocolB 2 148 1 Unknown 3 222 1 - 1 TCP 192.168.1.245:56866 -> 3.3.3.3:443 [proto: 91.373/TLS.CustomProtocolA][IP: 373/CustomProtocolA][Encrypted][Confidence: Unknown][DPI packets: 1][cat: Web/5][3 pkts/222 bytes -> 0 pkts/0 bytes][Goodput ratio: 0/0][3.05 sec][Risk: ** Unidirectional Traffic **][Risk Score: 10][Risk Info: No server to client traffic][Plen Bins: 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0] - 2 TCP 192.168.1.245:58288 -> 3.3.3.3:446 [proto: 400/CustomProtocolC][IP: 375/Unknown][Encrypted][Confidence: Unknown][DPI packets: 1][3 pkts/222 bytes -> 0 pkts/0 bytes][Goodput ratio: 0/0][3.04 sec][Risk: ** Unidirectional Traffic **][Risk Score: 10][Risk Info: No server to client traffic][Plen Bins: 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0] - 3 TCP 192.168.1.245:59682 -> 3.3.3.3:444 [proto: 374/CustomProtocolB][IP: 374/CustomProtocolB][ClearText][Confidence: Unknown][DPI packets: 1][2 pkts/148 bytes -> 0 pkts/0 bytes][Goodput ratio: 0/0][1.02 sec][Risk: ** Unidirectional Traffic **][Risk Score: 10][Risk Info: No server to client traffic][Plen Bins: 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0] + 1 TCP 192.168.1.245:56866 -> 3.3.3.3:443 [proto: 91.374/TLS.CustomProtocolA][IP: 374/CustomProtocolA][Encrypted][Confidence: Unknown][DPI packets: 1][cat: Web/5][3 pkts/222 bytes -> 0 pkts/0 bytes][Goodput ratio: 0/0][3.05 sec][Risk: ** Unidirectional Traffic **][Risk Score: 10][Risk Info: No server to client traffic][Plen Bins: 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0] + 2 TCP 192.168.1.245:58288 -> 3.3.3.3:446 [proto: 400/CustomProtocolC][IP: 376/Unknown][Encrypted][Confidence: Unknown][DPI packets: 1][3 pkts/222 bytes -> 0 pkts/0 bytes][Goodput ratio: 0/0][3.04 sec][Risk: ** Unidirectional Traffic **][Risk Score: 10][Risk Info: No server to client traffic][Plen Bins: 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0] + 3 TCP 192.168.1.245:59682 -> 3.3.3.3:444 [proto: 375/CustomProtocolB][IP: 375/CustomProtocolB][ClearText][Confidence: Unknown][DPI packets: 1][2 pkts/148 bytes -> 0 pkts/0 bytes][Goodput ratio: 0/0][1.02 sec][Risk: ** Unidirectional Traffic **][Risk Score: 10][Risk Info: No server to client traffic][Plen Bins: 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0] diff --git a/tests/cfgs/default/result/dhcp-fuzz.pcapng.out b/tests/cfgs/default/result/dhcp-fuzz.pcapng.out index 97310dd7e..d7f5f4394 100644 --- a/tests/cfgs/default/result/dhcp-fuzz.pcapng.out +++ b/tests/cfgs/default/result/dhcp-fuzz.pcapng.out @@ -2,7 +2,7 @@ Guessed flow protos: 1 DPI Packets (UDP): 1 (1.00 pkts/flow) Confidence Match by port : 1 (flows) -Num dissector calls: 120 (120.00 diss/flow) +Num dissector calls: 121 (121.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/3/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/discord.pcap.out b/tests/cfgs/default/result/discord.pcap.out index 17e63b5a8..aaa8844df 100644 --- a/tests/cfgs/default/result/discord.pcap.out +++ b/tests/cfgs/default/result/discord.pcap.out @@ -3,7 +3,7 @@ Guessed flow protos: 0 DPI Packets (TCP): 5 (5.00 pkts/flow) DPI Packets (UDP): 60 (1.82 pkts/flow) Confidence DPI : 34 (flows) -Num dissector calls: 4270 (125.59 diss/flow) +Num dissector calls: 4297 (126.38 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/discord_mid_flow.pcap.out b/tests/cfgs/default/result/discord_mid_flow.pcap.out index 04c594c9c..f23358bb5 100644 --- a/tests/cfgs/default/result/discord_mid_flow.pcap.out +++ b/tests/cfgs/default/result/discord_mid_flow.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (UDP): 3 (3.00 pkts/flow) Confidence DPI : 1 (flows) -Num dissector calls: 155 (155.00 diss/flow) +Num dissector calls: 156 (156.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/dnscrypt-v1-and-resolver-pings.pcap.out b/tests/cfgs/default/result/dnscrypt-v1-and-resolver-pings.pcap.out index 504855fa7..21a480946 100644 --- a/tests/cfgs/default/result/dnscrypt-v1-and-resolver-pings.pcap.out +++ b/tests/cfgs/default/result/dnscrypt-v1-and-resolver-pings.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (UDP): 256 (1.04 pkts/flow) Confidence DPI : 245 (flows) -Num dissector calls: 20445 (83.45 diss/flow) +Num dissector calls: 20456 (83.49 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/513/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/dnscrypt-v2.pcap.out b/tests/cfgs/default/result/dnscrypt-v2.pcap.out index bce4503de..efcba79a2 100644 --- a/tests/cfgs/default/result/dnscrypt-v2.pcap.out +++ b/tests/cfgs/default/result/dnscrypt-v2.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (UDP): 6 (2.00 pkts/flow) Confidence DPI : 3 (flows) -Num dissector calls: 405 (135.00 diss/flow) +Num dissector calls: 408 (136.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/dnscrypt_skype_false_positive.pcapng.out b/tests/cfgs/default/result/dnscrypt_skype_false_positive.pcapng.out index 8e563ec31..4fef78115 100644 --- a/tests/cfgs/default/result/dnscrypt_skype_false_positive.pcapng.out +++ b/tests/cfgs/default/result/dnscrypt_skype_false_positive.pcapng.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (UDP): 2 (2.00 pkts/flow) Confidence DPI : 1 (flows) -Num dissector calls: 136 (136.00 diss/flow) +Num dissector calls: 137 (137.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/3/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/edonkey.pcap.out b/tests/cfgs/default/result/edonkey.pcap.out index 4111bebc9..fa8453036 100644 --- a/tests/cfgs/default/result/edonkey.pcap.out +++ b/tests/cfgs/default/result/edonkey.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (TCP): 5 (5.00 pkts/flow) Confidence DPI : 1 (flows) -Num dissector calls: 131 (131.00 diss/flow) +Num dissector calls: 132 (132.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/emotet.pcap.out b/tests/cfgs/default/result/emotet.pcap.out index cd4520085..b12d0aabd 100644 --- a/tests/cfgs/default/result/emotet.pcap.out +++ b/tests/cfgs/default/result/emotet.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (TCP): 48 (8.00 pkts/flow) Confidence DPI : 6 (flows) -Num dissector calls: 198 (33.00 diss/flow) +Num dissector calls: 199 (33.17 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/epicgames.pcapng.out b/tests/cfgs/default/result/epicgames.pcapng.out index f270eefb0..04654ac51 100644 --- a/tests/cfgs/default/result/epicgames.pcapng.out +++ b/tests/cfgs/default/result/epicgames.pcapng.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (UDP): 12 (3.00 pkts/flow) Confidence DPI : 4 (flows) -Num dissector calls: 630 (157.50 diss/flow) +Num dissector calls: 634 (158.50 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/fastcgi.pcap.out b/tests/cfgs/default/result/fastcgi.pcap.out index cbeb81837..da1ccd119 100644 --- a/tests/cfgs/default/result/fastcgi.pcap.out +++ b/tests/cfgs/default/result/fastcgi.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (TCP): 6 (6.00 pkts/flow) Confidence DPI : 1 (flows) -Num dissector calls: 156 (156.00 diss/flow) +Num dissector calls: 157 (157.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/ftp-start-tls.pcap.out b/tests/cfgs/default/result/ftp-start-tls.pcap.out index b959b7ea5..5b851458a 100644 --- a/tests/cfgs/default/result/ftp-start-tls.pcap.out +++ b/tests/cfgs/default/result/ftp-start-tls.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (TCP): 17 (17.00 pkts/flow) Confidence DPI : 1 (flows) -Num dissector calls: 157 (157.00 diss/flow) +Num dissector calls: 158 (158.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/ftp.pcap.out b/tests/cfgs/default/result/ftp.pcap.out index 4d6166a9a..d4ebb60b5 100644 --- a/tests/cfgs/default/result/ftp.pcap.out +++ b/tests/cfgs/default/result/ftp.pcap.out @@ -3,7 +3,7 @@ Guessed flow protos: 1 DPI Packets (TCP): 39 (13.00 pkts/flow) Confidence Unknown : 1 (flows) Confidence DPI : 2 (flows) -Num dissector calls: 529 (176.33 diss/flow) +Num dissector calls: 531 (177.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/3/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/ftp_failed.pcap.out b/tests/cfgs/default/result/ftp_failed.pcap.out index 9a8a728a2..fe3f44b99 100644 --- a/tests/cfgs/default/result/ftp_failed.pcap.out +++ b/tests/cfgs/default/result/ftp_failed.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (TCP): 8 (8.00 pkts/flow) Confidence DPI : 1 (flows) -Num dissector calls: 157 (157.00 diss/flow) +Num dissector calls: 158 (158.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) 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 569c803e0..784355426 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 @@ -6,7 +6,7 @@ DPI Packets (other): 5 (1.00 pkts/flow) Confidence Unknown : 34 (flows) Confidence Match by port : 27 (flows) Confidence DPI : 190 (flows) -Num dissector calls: 6562 (26.14 diss/flow) +Num dissector calls: 6612 (26.34 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/189/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) 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 e86df3490..01fb9d13c 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 @@ -5,7 +5,7 @@ DPI Packets (other): 1 (1.00 pkts/flow) Confidence Unknown : 3 (flows) Confidence Match by port : 26 (flows) Confidence DPI : 11 (flows) -Num dissector calls: 1006 (25.15 diss/flow) +Num dissector calls: 1012 (25.30 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/87/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) 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 e24664d52..9eeebc07a 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 @@ -5,7 +5,7 @@ DPI Packets (other): 7 (1.00 pkts/flow) Confidence Unknown : 19 (flows) Confidence Match by port : 3 (flows) Confidence DPI : 55 (flows) -Num dissector calls: 1981 (25.73 diss/flow) +Num dissector calls: 1997 (25.94 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/66/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) 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 638f6dfe1..0e643f65e 100644 --- a/tests/cfgs/default/result/fuzz-2021-10-13.pcap.out +++ b/tests/cfgs/default/result/fuzz-2021-10-13.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 1 DPI Packets (TCP): 1 (1.00 pkts/flow) Confidence Unknown : 1 (flows) -Num dissector calls: 127 (127.00 diss/flow) +Num dissector calls: 128 (128.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/3/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/gnutella.pcap.out b/tests/cfgs/default/result/gnutella.pcap.out index dd0469b91..6fad9c56e 100644 --- a/tests/cfgs/default/result/gnutella.pcap.out +++ b/tests/cfgs/default/result/gnutella.pcap.out @@ -6,7 +6,7 @@ DPI Packets (other): 10 (1.00 pkts/flow) Confidence Unknown : 389 (flows) Confidence Match by port : 1 (flows) Confidence DPI : 370 (flows) -Num dissector calls: 45306 (59.61 diss/flow) +Num dissector calls: 45615 (60.02 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/1170/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/google_ssl.pcap.out b/tests/cfgs/default/result/google_ssl.pcap.out index 3e6502af3..567dd0b03 100644 --- a/tests/cfgs/default/result/google_ssl.pcap.out +++ b/tests/cfgs/default/result/google_ssl.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 1 DPI Packets (TCP): 24 (24.00 pkts/flow) Confidence Match by port : 1 (flows) -Num dissector calls: 197 (197.00 diss/flow) +Num dissector calls: 198 (198.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/3/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/gtp_false_positive.pcapng.out b/tests/cfgs/default/result/gtp_false_positive.pcapng.out index 4bde0b92c..4db024b18 100644 --- a/tests/cfgs/default/result/gtp_false_positive.pcapng.out +++ b/tests/cfgs/default/result/gtp_false_positive.pcapng.out @@ -3,7 +3,7 @@ Guessed flow protos: 3 DPI Packets (UDP): 7 (2.33 pkts/flow) Confidence Unknown : 1 (flows) Confidence Match by port : 2 (flows) -Num dissector calls: 429 (143.00 diss/flow) +Num dissector calls: 432 (144.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/9/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/h323.pcap.out b/tests/cfgs/default/result/h323.pcap.out index 5cf11e50c..2f5e7e44f 100644 --- a/tests/cfgs/default/result/h323.pcap.out +++ b/tests/cfgs/default/result/h323.pcap.out @@ -3,7 +3,7 @@ Guessed flow protos: 0 DPI Packets (TCP): 1 (1.00 pkts/flow) DPI Packets (UDP): 2 (2.00 pkts/flow) Confidence DPI : 2 (flows) -Num dissector calls: 122 (61.00 diss/flow) +Num dissector calls: 123 (61.50 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/http_guessed_host_and_guessed.pcapng.out b/tests/cfgs/default/result/http_guessed_host_and_guessed.pcapng.out index 527190d65..ec3e1dfaf 100644 --- a/tests/cfgs/default/result/http_guessed_host_and_guessed.pcapng.out +++ b/tests/cfgs/default/result/http_guessed_host_and_guessed.pcapng.out @@ -2,7 +2,7 @@ Guessed flow protos: 1 DPI Packets (TCP): 1 (1.00 pkts/flow) Confidence Match by port : 1 (flows) -Num dissector calls: 128 (128.00 diss/flow) +Num dissector calls: 129 (129.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/3/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/http_ipv6.pcap.out b/tests/cfgs/default/result/http_ipv6.pcap.out index 9b2f69a3e..7b4e4755c 100644 --- a/tests/cfgs/default/result/http_ipv6.pcap.out +++ b/tests/cfgs/default/result/http_ipv6.pcap.out @@ -4,7 +4,7 @@ DPI Packets (TCP): 77 (5.92 pkts/flow) DPI Packets (UDP): 4 (2.00 pkts/flow) Confidence Match by port : 7 (flows) Confidence DPI : 8 (flows) -Num dissector calls: 158 (10.53 diss/flow) +Num dissector calls: 159 (10.60 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/21/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/ieee_c37118.pcap.out b/tests/cfgs/default/result/ieee_c37118.pcap.out new file mode 100644 index 000000000..15bbde262 --- /dev/null +++ b/tests/cfgs/default/result/ieee_c37118.pcap.out @@ -0,0 +1,30 @@ +Guessed flow protos: 0 + +DPI Packets (TCP): 4 (4.00 pkts/flow) +DPI Packets (UDP): 1 (1.00 pkts/flow) +Confidence DPI : 2 (flows) +Num dissector calls: 2 (1.00 diss/flow) +LRU cache ookla: 0/0/0 (insert/search/found) +LRU cache bittorrent: 0/0/0 (insert/search/found) +LRU cache zoom: 0/0/0 (insert/search/found) +LRU cache stun: 0/0/0 (insert/search/found) +LRU cache tls_cert: 0/0/0 (insert/search/found) +LRU cache mining: 0/0/0 (insert/search/found) +LRU cache msteams: 0/0/0 (insert/search/found) +LRU cache stun_zoom: 0/0/0 (insert/search/found) +Automa host: 0/0 (search/found) +Automa domain: 0/0 (search/found) +Automa tls cert: 0/0 (search/found) +Automa risk mask: 0/0 (search/found) +Automa common alpns: 0/0 (search/found) +Patricia risk mask: 2/0 (search/found) +Patricia risk mask IPv6: 0/0 (search/found) +Patricia risk: 0/0 (search/found) +Patricia risk IPv6: 0/0 (search/found) +Patricia protocols: 4/0 (search/found) +Patricia protocols IPv6: 0/0 (search/found) + +IEEE-C37118 778 74034 2 + + 1 TCP 192.168.0.20:36835 <-> 192.168.0.241:4712 [proto: 367/IEEE-C37118][IP: 0/Unknown][ClearText][Confidence: DPI][DPI packets: 4][cat: IoT-Scada/31][159 pkts/10556 bytes <-> 258 pkts/30782 bytes][Goodput ratio: 1/45][5.04 sec][bytes ratio: -0.489 (Download)][IAT c2s/s2c min/avg/max/stddev: 0/0 30/19 56/52 18/4][Pkt Len c2s/s2c min/avg/max/stddev: 66/66 66/119 84/200 3/9][PLAIN TEXT (Blue PMU )][Plen Bins: 1,98,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0] + 2 UDP 192.168.0.10:4712 <-> 192.168.0.60:4713 [proto: 367/IEEE-C37118][IP: 0/Unknown][ClearText][Confidence: DPI][DPI packets: 1][cat: IoT-Scada/31][4 pkts/240 bytes <-> 357 pkts/32456 bytes][Goodput ratio: 30/54][7.49 sec][bytes ratio: -0.985 (Download)][IAT c2s/s2c min/avg/max/stddev: 54/19 185/20 316/59 131/2][Pkt Len c2s/s2c min/avg/max/stddev: 60/90 60/91 60/416 0/17][PLAIN TEXT (1 )][Plen Bins: 1,98,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0] diff --git a/tests/cfgs/default/result/imap-starttls.pcap.out b/tests/cfgs/default/result/imap-starttls.pcap.out index cf758da30..162daaeb2 100644 --- a/tests/cfgs/default/result/imap-starttls.pcap.out +++ b/tests/cfgs/default/result/imap-starttls.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (TCP): 19 (19.00 pkts/flow) Confidence DPI : 1 (flows) -Num dissector calls: 207 (207.00 diss/flow) +Num dissector calls: 208 (208.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/imap.pcap.out b/tests/cfgs/default/result/imap.pcap.out index 291aea7b0..de64fc73c 100644 --- a/tests/cfgs/default/result/imap.pcap.out +++ b/tests/cfgs/default/result/imap.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (TCP): 11 (11.00 pkts/flow) Confidence DPI : 1 (flows) -Num dissector calls: 207 (207.00 diss/flow) +Num dissector calls: 208 (208.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/imo.pcap.out b/tests/cfgs/default/result/imo.pcap.out index 28f5f3b5a..ee92f0050 100644 --- a/tests/cfgs/default/result/imo.pcap.out +++ b/tests/cfgs/default/result/imo.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (UDP): 7 (3.50 pkts/flow) Confidence DPI : 2 (flows) -Num dissector calls: 309 (154.50 diss/flow) +Num dissector calls: 311 (155.50 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/instagram.pcap.out b/tests/cfgs/default/result/instagram.pcap.out index 02b3f2d19..b0aaa29ce 100644 --- a/tests/cfgs/default/result/instagram.pcap.out +++ b/tests/cfgs/default/result/instagram.pcap.out @@ -6,7 +6,7 @@ DPI Packets (other): 1 (1.00 pkts/flow) Confidence Unknown : 1 (flows) Confidence Match by port : 7 (flows) Confidence DPI : 30 (flows) -Num dissector calls: 1372 (36.11 diss/flow) +Num dissector calls: 1377 (36.24 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/24/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/iphone.pcap.out b/tests/cfgs/default/result/iphone.pcap.out index 7c4f48840..44462c6a5 100644 --- a/tests/cfgs/default/result/iphone.pcap.out +++ b/tests/cfgs/default/result/iphone.pcap.out @@ -5,7 +5,7 @@ DPI Packets (UDP): 55 (1.77 pkts/flow) DPI Packets (other): 5 (1.00 pkts/flow) Confidence Match by port : 1 (flows) Confidence DPI : 50 (flows) -Num dissector calls: 349 (6.84 diss/flow) +Num dissector calls: 350 (6.86 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/3/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/ipv6_in_gtp.pcap.out b/tests/cfgs/default/result/ipv6_in_gtp.pcap.out index 79c17bd06..912dc9a10 100644 --- a/tests/cfgs/default/result/ipv6_in_gtp.pcap.out +++ b/tests/cfgs/default/result/ipv6_in_gtp.pcap.out @@ -4,7 +4,7 @@ DPI Packets (UDP): 1 (1.00 pkts/flow) DPI Packets (other): 1 (1.00 pkts/flow) Confidence Unknown : 1 (flows) Confidence DPI : 1 (flows) -Num dissector calls: 117 (58.50 diss/flow) +Num dissector calls: 118 (59.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/3/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/irc.pcap.out b/tests/cfgs/default/result/irc.pcap.out index 47935eb51..ae3f301db 100644 --- a/tests/cfgs/default/result/irc.pcap.out +++ b/tests/cfgs/default/result/irc.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (TCP): 7 (7.00 pkts/flow) Confidence DPI : 1 (flows) -Num dissector calls: 163 (163.00 diss/flow) +Num dissector calls: 164 (164.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/iso9506-1-mms.pcap.out b/tests/cfgs/default/result/iso9506-1-mms.pcap.out index 1534ee156..9d6248f49 100644 --- a/tests/cfgs/default/result/iso9506-1-mms.pcap.out +++ b/tests/cfgs/default/result/iso9506-1-mms.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (TCP): 7 (7.00 pkts/flow) Confidence DPI : 1 (flows) -Num dissector calls: 181 (181.00 diss/flow) +Num dissector calls: 182 (182.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/jabber.pcap.out b/tests/cfgs/default/result/jabber.pcap.out index 8f653892a..acba95d8a 100644 --- a/tests/cfgs/default/result/jabber.pcap.out +++ b/tests/cfgs/default/result/jabber.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (TCP): 74 (6.17 pkts/flow) Confidence DPI : 12 (flows) -Num dissector calls: 1463 (121.92 diss/flow) +Num dissector calls: 1472 (122.67 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/kerberos.pcap.out b/tests/cfgs/default/result/kerberos.pcap.out index 5cf18dcc3..479a6797b 100644 --- a/tests/cfgs/default/result/kerberos.pcap.out +++ b/tests/cfgs/default/result/kerberos.pcap.out @@ -4,7 +4,7 @@ DPI Packets (TCP): 77 (2.14 pkts/flow) Confidence Unknown : 2 (flows) Confidence Match by port : 23 (flows) Confidence DPI : 11 (flows) -Num dissector calls: 4036 (112.11 diss/flow) +Num dissector calls: 4061 (112.81 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/75/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/kontiki.pcap.out b/tests/cfgs/default/result/kontiki.pcap.out index 7caea155c..b30c6169d 100644 --- a/tests/cfgs/default/result/kontiki.pcap.out +++ b/tests/cfgs/default/result/kontiki.pcap.out @@ -4,7 +4,7 @@ DPI Packets (UDP): 6 (1.50 pkts/flow) DPI Packets (other): 4 (1.00 pkts/flow) Confidence Unknown : 2 (flows) Confidence DPI : 6 (flows) -Num dissector calls: 339 (42.38 diss/flow) +Num dissector calls: 341 (42.62 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/6/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/linecall_falsepositve.pcap.out b/tests/cfgs/default/result/linecall_falsepositve.pcap.out index 9c4090810..ea2c4bf6d 100644 --- a/tests/cfgs/default/result/linecall_falsepositve.pcap.out +++ b/tests/cfgs/default/result/linecall_falsepositve.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 1 DPI Packets (UDP): 13 (13.00 pkts/flow) Confidence Unknown : 1 (flows) -Num dissector calls: 211 (211.00 diss/flow) +Num dissector calls: 212 (212.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/3/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/log4j-webapp-exploit.pcap.out b/tests/cfgs/default/result/log4j-webapp-exploit.pcap.out index f3734e76f..74031eb8a 100644 --- a/tests/cfgs/default/result/log4j-webapp-exploit.pcap.out +++ b/tests/cfgs/default/result/log4j-webapp-exploit.pcap.out @@ -3,7 +3,7 @@ Guessed flow protos: 2 DPI Packets (TCP): 56 (8.00 pkts/flow) Confidence Unknown : 2 (flows) Confidence DPI : 5 (flows) -Num dissector calls: 357 (51.00 diss/flow) +Num dissector calls: 358 (51.14 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/6/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/lru_ipv6_caches.pcapng.out b/tests/cfgs/default/result/lru_ipv6_caches.pcapng.out index 19e22069d..d4ad15787 100644 --- a/tests/cfgs/default/result/lru_ipv6_caches.pcapng.out +++ b/tests/cfgs/default/result/lru_ipv6_caches.pcapng.out @@ -4,7 +4,7 @@ DPI Packets (TCP): 9 (3.00 pkts/flow) DPI Packets (UDP): 36 (4.00 pkts/flow) Confidence DPI (cache) : 6 (flows) Confidence DPI : 6 (flows) -Num dissector calls: 776 (64.67 diss/flow) +Num dissector calls: 779 (64.92 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 25/12/4 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/memcached.cap.out b/tests/cfgs/default/result/memcached.cap.out index 98c3c5632..e65985403 100644 --- a/tests/cfgs/default/result/memcached.cap.out +++ b/tests/cfgs/default/result/memcached.cap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (TCP): 6 (6.00 pkts/flow) Confidence DPI : 1 (flows) -Num dissector calls: 129 (129.00 diss/flow) +Num dissector calls: 130 (130.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/mongo_false_positive.pcapng.out b/tests/cfgs/default/result/mongo_false_positive.pcapng.out index 08488f40e..c2418ae8b 100644 --- a/tests/cfgs/default/result/mongo_false_positive.pcapng.out +++ b/tests/cfgs/default/result/mongo_false_positive.pcapng.out @@ -2,7 +2,7 @@ Guessed flow protos: 1 DPI Packets (TCP): 14 (14.00 pkts/flow) Confidence Match by port : 1 (flows) -Num dissector calls: 271 (271.00 diss/flow) +Num dissector calls: 272 (272.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/3/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/mssql_tds.pcap.out b/tests/cfgs/default/result/mssql_tds.pcap.out index 14f673d1b..638299a8b 100644 --- a/tests/cfgs/default/result/mssql_tds.pcap.out +++ b/tests/cfgs/default/result/mssql_tds.pcap.out @@ -3,7 +3,7 @@ Guessed flow protos: 1 DPI Packets (TCP): 18 (1.50 pkts/flow) Confidence Match by port : 1 (flows) Confidence DPI : 11 (flows) -Num dissector calls: 272 (22.67 diss/flow) +Num dissector calls: 273 (22.75 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/3/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/mullvad_wireguard.pcap.out b/tests/cfgs/default/result/mullvad_wireguard.pcap.out index eea120ec1..d4478f409 100644 --- a/tests/cfgs/default/result/mullvad_wireguard.pcap.out +++ b/tests/cfgs/default/result/mullvad_wireguard.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (UDP): 3 (3.00 pkts/flow) Confidence DPI : 1 (flows) -Num dissector calls: 140 (140.00 diss/flow) +Num dissector calls: 141 (141.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/nest_log_sink.pcap.out b/tests/cfgs/default/result/nest_log_sink.pcap.out index e489a55e0..7b66167e0 100644 --- a/tests/cfgs/default/result/nest_log_sink.pcap.out +++ b/tests/cfgs/default/result/nest_log_sink.pcap.out @@ -4,7 +4,7 @@ DPI Packets (TCP): 130 (10.00 pkts/flow) DPI Packets (UDP): 2 (2.00 pkts/flow) Confidence Match by port : 1 (flows) Confidence DPI : 13 (flows) -Num dissector calls: 1909 (136.36 diss/flow) +Num dissector calls: 1921 (137.21 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/3/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/netbios.pcap.out b/tests/cfgs/default/result/netbios.pcap.out index bdb19ce68..4bd0c98e5 100644 --- a/tests/cfgs/default/result/netbios.pcap.out +++ b/tests/cfgs/default/result/netbios.pcap.out @@ -4,7 +4,7 @@ DPI Packets (TCP): 2 (2.00 pkts/flow) DPI Packets (UDP): 14 (1.00 pkts/flow) Confidence Match by port : 1 (flows) Confidence DPI : 14 (flows) -Num dissector calls: 142 (9.47 diss/flow) +Num dissector calls: 143 (9.53 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/3/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/nintendo.pcap.out b/tests/cfgs/default/result/nintendo.pcap.out index c28332043..f3e9bf534 100644 --- a/tests/cfgs/default/result/nintendo.pcap.out +++ b/tests/cfgs/default/result/nintendo.pcap.out @@ -6,7 +6,7 @@ DPI Packets (other): 2 (1.00 pkts/flow) Confidence Match by port : 1 (flows) Confidence DPI : 15 (flows) Confidence Match by IP : 5 (flows) -Num dissector calls: 1291 (61.48 diss/flow) +Num dissector calls: 1296 (61.71 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/18/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/nntp.pcap.out b/tests/cfgs/default/result/nntp.pcap.out index ccebbd457..f5dffa283 100644 --- a/tests/cfgs/default/result/nntp.pcap.out +++ b/tests/cfgs/default/result/nntp.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (TCP): 6 (6.00 pkts/flow) Confidence DPI : 1 (flows) -Num dissector calls: 135 (135.00 diss/flow) +Num dissector calls: 136 (136.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/ookla.pcap.out b/tests/cfgs/default/result/ookla.pcap.out index 283bd6691..aff3897cc 100644 --- a/tests/cfgs/default/result/ookla.pcap.out +++ b/tests/cfgs/default/result/ookla.pcap.out @@ -4,7 +4,7 @@ DPI Packets (TCP): 40 (6.67 pkts/flow) Confidence DPI (partial cache): 1 (flows) Confidence DPI : 4 (flows) Confidence DPI (aggressive) : 1 (flows) -Num dissector calls: 525 (87.50 diss/flow) +Num dissector calls: 528 (88.00 diss/flow) LRU cache ookla: 4/2/2 (insert/search/found) LRU cache bittorrent: 0/3/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/openvpn.pcap.out b/tests/cfgs/default/result/openvpn.pcap.out index ab0fcf496..66c4a6834 100644 --- a/tests/cfgs/default/result/openvpn.pcap.out +++ b/tests/cfgs/default/result/openvpn.pcap.out @@ -3,7 +3,7 @@ Guessed flow protos: 0 DPI Packets (TCP): 6 (6.00 pkts/flow) DPI Packets (UDP): 5 (2.50 pkts/flow) Confidence DPI : 3 (flows) -Num dissector calls: 423 (141.00 diss/flow) +Num dissector calls: 426 (142.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/oracle12.pcapng.out b/tests/cfgs/default/result/oracle12.pcapng.out index a76bf2622..81bd7ab43 100644 --- a/tests/cfgs/default/result/oracle12.pcapng.out +++ b/tests/cfgs/default/result/oracle12.pcapng.out @@ -2,7 +2,7 @@ Guessed flow protos: 1 DPI Packets (TCP): 20 (20.00 pkts/flow) Confidence Match by port : 1 (flows) -Num dissector calls: 263 (263.00 diss/flow) +Num dissector calls: 264 (264.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/3/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/ossfuzz_seed_fake_traces_1.pcapng.out b/tests/cfgs/default/result/ossfuzz_seed_fake_traces_1.pcapng.out index 3d4da871d..aed46bf2c 100644 --- a/tests/cfgs/default/result/ossfuzz_seed_fake_traces_1.pcapng.out +++ b/tests/cfgs/default/result/ossfuzz_seed_fake_traces_1.pcapng.out @@ -3,7 +3,7 @@ Guessed flow protos: 0 DPI Packets (TCP): 8 (1.33 pkts/flow) DPI Packets (UDP): 9 (2.25 pkts/flow) Confidence DPI : 10 (flows) -Num dissector calls: 718 (71.80 diss/flow) +Num dissector calls: 723 (72.30 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/6/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/ossfuzz_seed_fake_traces_2.pcapng.out b/tests/cfgs/default/result/ossfuzz_seed_fake_traces_2.pcapng.out index 424d0a54d..cb340f3e4 100644 --- a/tests/cfgs/default/result/ossfuzz_seed_fake_traces_2.pcapng.out +++ b/tests/cfgs/default/result/ossfuzz_seed_fake_traces_2.pcapng.out @@ -4,7 +4,7 @@ DPI Packets (TCP): 18 (6.00 pkts/flow) DPI Packets (UDP): 4 (2.00 pkts/flow) Confidence Match by port : 1 (flows) Confidence DPI : 4 (flows) -Num dissector calls: 659 (131.80 diss/flow) +Num dissector calls: 664 (132.80 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/3/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) 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 496c8e080..0860aa9c6 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 @@ -2,7 +2,7 @@ Guessed flow protos: 1 DPI Packets (UDP): 2 (2.00 pkts/flow) Confidence Unknown : 1 (flows) -Num dissector calls: 137 (137.00 diss/flow) +Num dissector calls: 138 (138.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/3/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/pgsql.pcap.out b/tests/cfgs/default/result/pgsql.pcap.out index 0ae865d00..3cb7d6669 100644 --- a/tests/cfgs/default/result/pgsql.pcap.out +++ b/tests/cfgs/default/result/pgsql.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (TCP): 36 (6.00 pkts/flow) Confidence DPI : 6 (flows) -Num dissector calls: 774 (129.00 diss/flow) +Num dissector calls: 780 (130.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/pop3.pcap.out b/tests/cfgs/default/result/pop3.pcap.out index f000b17c2..8cd3c905c 100644 --- a/tests/cfgs/default/result/pop3.pcap.out +++ b/tests/cfgs/default/result/pop3.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 2 DPI Packets (TCP): 83 (13.83 pkts/flow) Confidence DPI : 6 (flows) -Num dissector calls: 1177 (196.17 diss/flow) +Num dissector calls: 1183 (197.17 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/pop3_stls.pcap.out b/tests/cfgs/default/result/pop3_stls.pcap.out index 4e90b5e86..1b1910bf3 100644 --- a/tests/cfgs/default/result/pop3_stls.pcap.out +++ b/tests/cfgs/default/result/pop3_stls.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (TCP): 18 (18.00 pkts/flow) Confidence DPI : 1 (flows) -Num dissector calls: 198 (198.00 diss/flow) +Num dissector calls: 199 (199.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/pps.pcap.out b/tests/cfgs/default/result/pps.pcap.out index 2ae380f6e..f56bb0f85 100644 --- a/tests/cfgs/default/result/pps.pcap.out +++ b/tests/cfgs/default/result/pps.pcap.out @@ -5,7 +5,7 @@ DPI Packets (UDP): 136 (3.09 pkts/flow) Confidence Unknown : 29 (flows) Confidence Match by port : 2 (flows) Confidence DPI : 76 (flows) -Num dissector calls: 5678 (53.07 diss/flow) +Num dissector calls: 5707 (53.34 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/93/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/protobuf.pcap.out b/tests/cfgs/default/result/protobuf.pcap.out index f7564dc98..993a1a91f 100644 --- a/tests/cfgs/default/result/protobuf.pcap.out +++ b/tests/cfgs/default/result/protobuf.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (TCP): 26 (5.20 pkts/flow) Confidence DPI : 5 (flows) -Num dissector calls: 700 (140.00 diss/flow) +Num dissector calls: 701 (140.20 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/protonvpn.pcap.out b/tests/cfgs/default/result/protonvpn.pcap.out index 00c48ed60..9748bff98 100644 --- a/tests/cfgs/default/result/protonvpn.pcap.out +++ b/tests/cfgs/default/result/protonvpn.pcap.out @@ -4,7 +4,7 @@ DPI Packets (TCP): 12 (6.00 pkts/flow) DPI Packets (UDP): 2 (2.00 pkts/flow) Confidence Match by port : 1 (flows) Confidence DPI : 2 (flows) -Num dissector calls: 136 (45.33 diss/flow) +Num dissector calls: 137 (45.67 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/6/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/quic.pcap.out b/tests/cfgs/default/result/quic.pcap.out index 991a92528..108b5f86b 100644 --- a/tests/cfgs/default/result/quic.pcap.out +++ b/tests/cfgs/default/result/quic.pcap.out @@ -3,7 +3,7 @@ Guessed flow protos: 1 DPI Packets (UDP): 12 (1.20 pkts/flow) Confidence Match by port : 1 (flows) Confidence DPI : 9 (flows) -Num dissector calls: 222 (22.20 diss/flow) +Num dissector calls: 223 (22.30 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/3/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/quic_0RTT.pcap.out b/tests/cfgs/default/result/quic_0RTT.pcap.out index 641555d83..8a1d22815 100644 --- a/tests/cfgs/default/result/quic_0RTT.pcap.out +++ b/tests/cfgs/default/result/quic_0RTT.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (UDP): 4 (2.00 pkts/flow) Confidence DPI : 2 (flows) -Num dissector calls: 197 (98.50 diss/flow) +Num dissector calls: 198 (99.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/3/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/radius_false_positive.pcapng.out b/tests/cfgs/default/result/radius_false_positive.pcapng.out index c790ff866..b0f29cdc0 100644 --- a/tests/cfgs/default/result/radius_false_positive.pcapng.out +++ b/tests/cfgs/default/result/radius_false_positive.pcapng.out @@ -2,7 +2,7 @@ Guessed flow protos: 1 DPI Packets (UDP): 10 (10.00 pkts/flow) Confidence Match by port : 1 (flows) -Num dissector calls: 203 (203.00 diss/flow) +Num dissector calls: 204 (204.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/3/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/raknet.pcap.out b/tests/cfgs/default/result/raknet.pcap.out index c422cfe06..bdb6401ef 100644 --- a/tests/cfgs/default/result/raknet.pcap.out +++ b/tests/cfgs/default/result/raknet.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (UDP): 24 (2.00 pkts/flow) Confidence DPI : 12 (flows) -Num dissector calls: 1467 (122.25 diss/flow) +Num dissector calls: 1473 (122.75 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/rdp2.pcap.out b/tests/cfgs/default/result/rdp2.pcap.out index 4785648ab..29fa780d0 100644 --- a/tests/cfgs/default/result/rdp2.pcap.out +++ b/tests/cfgs/default/result/rdp2.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (UDP): 8 (2.67 pkts/flow) Confidence DPI : 3 (flows) -Num dissector calls: 400 (133.33 diss/flow) +Num dissector calls: 403 (134.33 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/reasm_crash_anon.pcapng.out b/tests/cfgs/default/result/reasm_crash_anon.pcapng.out index fd0d8b24a..aa5b8ffe9 100644 --- a/tests/cfgs/default/result/reasm_crash_anon.pcapng.out +++ b/tests/cfgs/default/result/reasm_crash_anon.pcapng.out @@ -2,7 +2,7 @@ Guessed flow protos: 1 DPI Packets (TCP): 23 (23.00 pkts/flow) Confidence Unknown : 1 (flows) -Num dissector calls: 253 (253.00 diss/flow) +Num dissector calls: 254 (254.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/3/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/reasm_segv_anon.pcapng.out b/tests/cfgs/default/result/reasm_segv_anon.pcapng.out index e572e667e..c207fd236 100644 --- a/tests/cfgs/default/result/reasm_segv_anon.pcapng.out +++ b/tests/cfgs/default/result/reasm_segv_anon.pcapng.out @@ -2,7 +2,7 @@ Guessed flow protos: 1 DPI Packets (TCP): 21 (21.00 pkts/flow) Confidence Match by port : 1 (flows) -Num dissector calls: 198 (198.00 diss/flow) +Num dissector calls: 199 (199.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/3/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/riot.pcapng.out b/tests/cfgs/default/result/riot.pcapng.out index 7236de8c8..a5ef1172e 100644 --- a/tests/cfgs/default/result/riot.pcapng.out +++ b/tests/cfgs/default/result/riot.pcapng.out @@ -3,7 +3,7 @@ Guessed flow protos: 1 DPI Packets (TCP): 7 (3.50 pkts/flow) Confidence Match by port : 1 (flows) Confidence DPI : 1 (flows) -Num dissector calls: 188 (94.00 diss/flow) +Num dissector calls: 189 (94.50 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/3/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/rsh.pcap.out b/tests/cfgs/default/result/rsh.pcap.out index 4315e621f..420940fcc 100644 --- a/tests/cfgs/default/result/rsh.pcap.out +++ b/tests/cfgs/default/result/rsh.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (TCP): 12 (6.00 pkts/flow) Confidence DPI : 2 (flows) -Num dissector calls: 306 (153.00 diss/flow) +Num dissector calls: 308 (154.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/rtmp.pcap.out b/tests/cfgs/default/result/rtmp.pcap.out index a458277b3..422c477bd 100644 --- a/tests/cfgs/default/result/rtmp.pcap.out +++ b/tests/cfgs/default/result/rtmp.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (TCP): 8 (8.00 pkts/flow) Confidence DPI : 1 (flows) -Num dissector calls: 159 (159.00 diss/flow) +Num dissector calls: 160 (160.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/rtp.pcapng.out b/tests/cfgs/default/result/rtp.pcapng.out index 9db0e1ef9..3582cb1a8 100644 --- a/tests/cfgs/default/result/rtp.pcapng.out +++ b/tests/cfgs/default/result/rtp.pcapng.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (UDP): 9 (3.00 pkts/flow) Confidence DPI : 3 (flows) -Num dissector calls: 435 (145.00 diss/flow) +Num dissector calls: 438 (146.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/rx.pcap.out b/tests/cfgs/default/result/rx.pcap.out index 899bd2d09..da5c3966e 100644 --- a/tests/cfgs/default/result/rx.pcap.out +++ b/tests/cfgs/default/result/rx.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (UDP): 10 (2.00 pkts/flow) Confidence DPI : 5 (flows) -Num dissector calls: 672 (134.40 diss/flow) +Num dissector calls: 677 (135.40 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/s7comm-plus.pcap.out b/tests/cfgs/default/result/s7comm-plus.pcap.out index abc41a7ff..3fea69bca 100644 --- a/tests/cfgs/default/result/s7comm-plus.pcap.out +++ b/tests/cfgs/default/result/s7comm-plus.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (TCP): 9 (9.00 pkts/flow) Confidence DPI : 1 (flows) -Num dissector calls: 175 (175.00 diss/flow) +Num dissector calls: 176 (176.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/s7comm.pcap.out b/tests/cfgs/default/result/s7comm.pcap.out index 80f27cb71..68ce84f17 100644 --- a/tests/cfgs/default/result/s7comm.pcap.out +++ b/tests/cfgs/default/result/s7comm.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (TCP): 3 (3.00 pkts/flow) Confidence DPI : 1 (flows) -Num dissector calls: 177 (177.00 diss/flow) +Num dissector calls: 178 (178.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/sflow.pcap.out b/tests/cfgs/default/result/sflow.pcap.out index d6d66edb7..35f5238b1 100644 --- a/tests/cfgs/default/result/sflow.pcap.out +++ b/tests/cfgs/default/result/sflow.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (UDP): 2 (2.00 pkts/flow) Confidence DPI : 1 (flows) -Num dissector calls: 121 (121.00 diss/flow) +Num dissector calls: 122 (122.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/shadowsocks.pcap.out b/tests/cfgs/default/result/shadowsocks.pcap.out index 9af415351..4331b38e7 100644 --- a/tests/cfgs/default/result/shadowsocks.pcap.out +++ b/tests/cfgs/default/result/shadowsocks.pcap.out @@ -3,7 +3,7 @@ Guessed flow protos: 1 DPI Packets (TCP): 21 (10.50 pkts/flow) Confidence Unknown : 1 (flows) Confidence DPI : 1 (flows) -Num dissector calls: 340 (170.00 diss/flow) +Num dissector calls: 342 (171.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/3/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/sip.pcap.out b/tests/cfgs/default/result/sip.pcap.out index 6533a6590..6980e4498 100644 --- a/tests/cfgs/default/result/sip.pcap.out +++ b/tests/cfgs/default/result/sip.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (UDP): 6 (1.50 pkts/flow) Confidence DPI : 4 (flows) -Num dissector calls: 196 (49.00 diss/flow) +Num dissector calls: 197 (49.25 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/sip_hello.pcapng.out b/tests/cfgs/default/result/sip_hello.pcapng.out index 63355f9d4..b4415d12a 100644 --- a/tests/cfgs/default/result/sip_hello.pcapng.out +++ b/tests/cfgs/default/result/sip_hello.pcapng.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (UDP): 9 (9.00 pkts/flow) Confidence DPI : 1 (flows) -Num dissector calls: 201 (201.00 diss/flow) +Num dissector calls: 202 (202.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/3/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/skinny.pcap.out b/tests/cfgs/default/result/skinny.pcap.out index bf4eb2a04..66c98ec9c 100644 --- a/tests/cfgs/default/result/skinny.pcap.out +++ b/tests/cfgs/default/result/skinny.pcap.out @@ -4,7 +4,7 @@ DPI Packets (TCP): 3 (1.00 pkts/flow) DPI Packets (UDP): 15 (3.00 pkts/flow) DPI Packets (other): 1 (1.00 pkts/flow) Confidence DPI : 9 (flows) -Num dissector calls: 699 (77.67 diss/flow) +Num dissector calls: 704 (78.22 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/skype.pcap.out b/tests/cfgs/default/result/skype.pcap.out index 8a2f6528d..7d22ec258 100644 --- a/tests/cfgs/default/result/skype.pcap.out +++ b/tests/cfgs/default/result/skype.pcap.out @@ -6,7 +6,7 @@ DPI Packets (other): 5 (1.00 pkts/flow) Confidence Unknown : 59 (flows) Confidence Match by port : 28 (flows) Confidence DPI : 206 (flows) -Num dissector calls: 27312 (93.22 diss/flow) +Num dissector calls: 27398 (93.51 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/261/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/skype_no_unknown.pcap.out b/tests/cfgs/default/result/skype_no_unknown.pcap.out index ba92cd493..3630d8be8 100644 --- a/tests/cfgs/default/result/skype_no_unknown.pcap.out +++ b/tests/cfgs/default/result/skype_no_unknown.pcap.out @@ -6,7 +6,7 @@ DPI Packets (other): 5 (1.00 pkts/flow) Confidence Unknown : 44 (flows) Confidence Match by port : 22 (flows) Confidence DPI : 201 (flows) -Num dissector calls: 22713 (85.07 diss/flow) +Num dissector calls: 22777 (85.31 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/198/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/skype_udp.pcap.out b/tests/cfgs/default/result/skype_udp.pcap.out index 558d0fd75..8a73af0c5 100644 --- a/tests/cfgs/default/result/skype_udp.pcap.out +++ b/tests/cfgs/default/result/skype_udp.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (UDP): 4 (4.00 pkts/flow) Confidence DPI : 1 (flows) -Num dissector calls: 174 (174.00 diss/flow) +Num dissector calls: 175 (175.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/smb_frags.pcap.out b/tests/cfgs/default/result/smb_frags.pcap.out index 96f65ce33..498b003a5 100644 --- a/tests/cfgs/default/result/smb_frags.pcap.out +++ b/tests/cfgs/default/result/smb_frags.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (TCP): 5 (5.00 pkts/flow) Confidence DPI : 1 (flows) -Num dissector calls: 158 (158.00 diss/flow) +Num dissector calls: 159 (159.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/smbv1.pcap.out b/tests/cfgs/default/result/smbv1.pcap.out index 46b21b284..3879e3960 100644 --- a/tests/cfgs/default/result/smbv1.pcap.out +++ b/tests/cfgs/default/result/smbv1.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (TCP): 3 (3.00 pkts/flow) Confidence DPI : 1 (flows) -Num dissector calls: 160 (160.00 diss/flow) +Num dissector calls: 161 (161.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/smtp-starttls.pcap.out b/tests/cfgs/default/result/smtp-starttls.pcap.out index 64981e34d..db5f76cc7 100644 --- a/tests/cfgs/default/result/smtp-starttls.pcap.out +++ b/tests/cfgs/default/result/smtp-starttls.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (TCP): 26 (13.00 pkts/flow) Confidence DPI : 2 (flows) -Num dissector calls: 156 (78.00 diss/flow) +Num dissector calls: 157 (78.50 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/smtp.pcap.out b/tests/cfgs/default/result/smtp.pcap.out index f60e3b52a..f0c48f5bb 100644 --- a/tests/cfgs/default/result/smtp.pcap.out +++ b/tests/cfgs/default/result/smtp.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (TCP): 11 (11.00 pkts/flow) Confidence DPI : 1 (flows) -Num dissector calls: 201 (201.00 diss/flow) +Num dissector calls: 202 (202.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/soap.pcap.out b/tests/cfgs/default/result/soap.pcap.out index 8f6f1baa2..89289626a 100644 --- a/tests/cfgs/default/result/soap.pcap.out +++ b/tests/cfgs/default/result/soap.pcap.out @@ -3,7 +3,7 @@ Guessed flow protos: 2 DPI Packets (TCP): 20 (6.67 pkts/flow) Confidence Match by port : 1 (flows) Confidence DPI : 2 (flows) -Num dissector calls: 384 (128.00 diss/flow) +Num dissector calls: 386 (128.67 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/3/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/socks.pcap.out b/tests/cfgs/default/result/socks.pcap.out index 38f207711..0efbba67d 100644 --- a/tests/cfgs/default/result/socks.pcap.out +++ b/tests/cfgs/default/result/socks.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (TCP): 23 (5.75 pkts/flow) Confidence DPI : 4 (flows) -Num dissector calls: 518 (129.50 diss/flow) +Num dissector calls: 522 (130.50 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/softether.pcap.out b/tests/cfgs/default/result/softether.pcap.out index a87ee9f1e..955faea74 100644 --- a/tests/cfgs/default/result/softether.pcap.out +++ b/tests/cfgs/default/result/softether.pcap.out @@ -3,7 +3,7 @@ Guessed flow protos: 1 DPI Packets (TCP): 4 (4.00 pkts/flow) DPI Packets (UDP): 31 (10.33 pkts/flow) Confidence DPI : 4 (flows) -Num dissector calls: 388 (97.00 diss/flow) +Num dissector calls: 390 (97.50 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/starcraft_battle.pcap.out b/tests/cfgs/default/result/starcraft_battle.pcap.out index 62abb21f5..32e652bfa 100644 --- a/tests/cfgs/default/result/starcraft_battle.pcap.out +++ b/tests/cfgs/default/result/starcraft_battle.pcap.out @@ -6,7 +6,7 @@ DPI Packets (other): 1 (1.00 pkts/flow) Confidence Match by port : 12 (flows) Confidence DPI : 39 (flows) Confidence Match by IP : 1 (flows) -Num dissector calls: 1529 (29.40 diss/flow) +Num dissector calls: 1537 (29.56 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/39/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/synscan.pcap.out b/tests/cfgs/default/result/synscan.pcap.out index 3170dfc2a..38c2e0ea4 100644 --- a/tests/cfgs/default/result/synscan.pcap.out +++ b/tests/cfgs/default/result/synscan.pcap.out @@ -129,7 +129,7 @@ iSCSI 2 116 2 45 TCP 172.16.0.8:36050 -> 64.13.134.52:2605 [proto: 13/BGP][IP: 0/Unknown][ClearText][Confidence: Match by port][DPI packets: 1][cat: Network/14][1 pkts/58 bytes -> 0 pkts/0 bytes][Goodput ratio: 0/0][< 1 sec][Risk: ** Unidirectional Traffic **][Risk Score: 10][Risk Info: No server to client traffic][Plen Bins: 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0] 46 TCP 172.16.0.8:36050 -> 64.13.134.52:3000 [proto: 26/ntop][IP: 0/Unknown][ClearText][Confidence: Match by port][DPI packets: 1][cat: Network/14][1 pkts/58 bytes -> 0 pkts/0 bytes][Goodput ratio: 0/0][< 1 sec][Risk: ** Unidirectional Traffic **][Risk Score: 10][Risk Info: No server to client traffic][Plen Bins: 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0] 47 TCP 172.16.0.8:36050 -> 64.13.134.52:3128 [proto: 131/HTTP_Proxy][IP: 0/Unknown][ClearText][Confidence: Match by port][DPI packets: 1][cat: Web/5][1 pkts/58 bytes -> 0 pkts/0 bytes][Goodput ratio: 0/0][< 1 sec][Risk: ** Unidirectional Traffic **][Risk Score: 10][Risk Info: No server to client traffic][Plen Bins: 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0] - 48 TCP 172.16.0.8:36050 -> 64.13.134.52:3260 [proto: 367/iSCSI][IP: 0/Unknown][ClearText][Confidence: Match by port][DPI packets: 1][1 pkts/58 bytes -> 0 pkts/0 bytes][Goodput ratio: 0/0][< 1 sec][Risk: ** Unidirectional Traffic **][Risk Score: 10][Risk Info: No server to client traffic][Plen Bins: 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0] + 48 TCP 172.16.0.8:36050 -> 64.13.134.52:3260 [proto: 368/iSCSI][IP: 0/Unknown][ClearText][Confidence: Match by port][DPI packets: 1][1 pkts/58 bytes -> 0 pkts/0 bytes][Goodput ratio: 0/0][< 1 sec][Risk: ** Unidirectional Traffic **][Risk Score: 10][Risk Info: No server to client traffic][Plen Bins: 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0] 49 TCP 172.16.0.8:36050 -> 64.13.134.52:3306 [proto: 20/MySQL][IP: 0/Unknown][ClearText][Confidence: Match by port][DPI packets: 1][cat: Database/11][1 pkts/58 bytes -> 0 pkts/0 bytes][Goodput ratio: 0/0][< 1 sec][Risk: ** Unidirectional Traffic **][Risk Score: 10][Risk Info: No server to client traffic][Plen Bins: 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0] 50 TCP 172.16.0.8:36050 -> 64.13.134.52:3389 [proto: 88/RDP][IP: 0/Unknown][ClearText][Confidence: Match by port][DPI packets: 1][cat: RemoteAccess/12][1 pkts/58 bytes -> 0 pkts/0 bytes][Goodput ratio: 0/0][< 1 sec][Risk: ** Desktop/File Sharing **** Unidirectional Traffic **][Risk Score: 20][Risk Info: No server to client traffic / Found RDP][Plen Bins: 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0] 51 TCP 172.16.0.8:36050 -> 64.13.134.52:4343 [proto: 170/Whois-DAS][IP: 0/Unknown][ClearText][Confidence: Match by port][DPI packets: 1][cat: Network/14][1 pkts/58 bytes -> 0 pkts/0 bytes][Goodput ratio: 0/0][< 1 sec][Risk: ** Unidirectional Traffic **][Risk Score: 10][Risk Info: No server to client traffic][Plen Bins: 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0] @@ -194,7 +194,7 @@ iSCSI 2 116 2 110 TCP 172.16.0.8:36051 -> 64.13.134.52:2605 [proto: 13/BGP][IP: 0/Unknown][ClearText][Confidence: Match by port][DPI packets: 1][cat: Network/14][1 pkts/58 bytes -> 0 pkts/0 bytes][Goodput ratio: 0/0][< 1 sec][Risk: ** Unidirectional Traffic **][Risk Score: 10][Risk Info: No server to client traffic][Plen Bins: 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0] 111 TCP 172.16.0.8:36051 -> 64.13.134.52:3000 [proto: 26/ntop][IP: 0/Unknown][ClearText][Confidence: Match by port][DPI packets: 1][cat: Network/14][1 pkts/58 bytes -> 0 pkts/0 bytes][Goodput ratio: 0/0][< 1 sec][Risk: ** Unidirectional Traffic **][Risk Score: 10][Risk Info: No server to client traffic][Plen Bins: 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0] 112 TCP 172.16.0.8:36051 -> 64.13.134.52:3128 [proto: 131/HTTP_Proxy][IP: 0/Unknown][ClearText][Confidence: Match by port][DPI packets: 1][cat: Web/5][1 pkts/58 bytes -> 0 pkts/0 bytes][Goodput ratio: 0/0][< 1 sec][Risk: ** Unidirectional Traffic **][Risk Score: 10][Risk Info: No server to client traffic][Plen Bins: 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0] - 113 TCP 172.16.0.8:36051 -> 64.13.134.52:3260 [proto: 367/iSCSI][IP: 0/Unknown][ClearText][Confidence: Match by port][DPI packets: 1][1 pkts/58 bytes -> 0 pkts/0 bytes][Goodput ratio: 0/0][< 1 sec][Risk: ** Unidirectional Traffic **][Risk Score: 10][Risk Info: No server to client traffic][Plen Bins: 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0] + 113 TCP 172.16.0.8:36051 -> 64.13.134.52:3260 [proto: 368/iSCSI][IP: 0/Unknown][ClearText][Confidence: Match by port][DPI packets: 1][1 pkts/58 bytes -> 0 pkts/0 bytes][Goodput ratio: 0/0][< 1 sec][Risk: ** Unidirectional Traffic **][Risk Score: 10][Risk Info: No server to client traffic][Plen Bins: 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0] 114 TCP 172.16.0.8:36051 -> 64.13.134.52:3306 [proto: 20/MySQL][IP: 0/Unknown][ClearText][Confidence: Match by port][DPI packets: 1][cat: Database/11][1 pkts/58 bytes -> 0 pkts/0 bytes][Goodput ratio: 0/0][< 1 sec][Risk: ** Unidirectional Traffic **][Risk Score: 10][Risk Info: No server to client traffic][Plen Bins: 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0] 115 TCP 172.16.0.8:36051 -> 64.13.134.52:3389 [proto: 88/RDP][IP: 0/Unknown][ClearText][Confidence: Match by port][DPI packets: 1][cat: RemoteAccess/12][1 pkts/58 bytes -> 0 pkts/0 bytes][Goodput ratio: 0/0][< 1 sec][Risk: ** Desktop/File Sharing **** Unidirectional Traffic **][Risk Score: 20][Risk Info: No server to client traffic / Found RDP][Plen Bins: 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0] 116 TCP 172.16.0.8:36051 -> 64.13.134.52:4343 [proto: 170/Whois-DAS][IP: 0/Unknown][ClearText][Confidence: Match by port][DPI packets: 1][cat: Network/14][1 pkts/58 bytes -> 0 pkts/0 bytes][Goodput ratio: 0/0][< 1 sec][Risk: ** Unidirectional Traffic **][Risk Score: 10][Risk Info: No server to client traffic][Plen Bins: 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0] diff --git a/tests/cfgs/default/result/teams.pcap.out b/tests/cfgs/default/result/teams.pcap.out index 1395f3caf..5f012e83c 100644 --- a/tests/cfgs/default/result/teams.pcap.out +++ b/tests/cfgs/default/result/teams.pcap.out @@ -7,7 +7,7 @@ Confidence Unknown : 1 (flows) Confidence Match by port : 2 (flows) Confidence DPI (partial) : 4 (flows) Confidence DPI : 76 (flows) -Num dissector calls: 516 (6.22 diss/flow) +Num dissector calls: 518 (6.24 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/9/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/teamspeak3.pcap.out b/tests/cfgs/default/result/teamspeak3.pcap.out index fbcb91884..577067663 100644 --- a/tests/cfgs/default/result/teamspeak3.pcap.out +++ b/tests/cfgs/default/result/teamspeak3.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (UDP): 4 (2.00 pkts/flow) Confidence DPI : 2 (flows) -Num dissector calls: 207 (103.50 diss/flow) +Num dissector calls: 208 (104.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/teamviewer.pcap.out b/tests/cfgs/default/result/teamviewer.pcap.out index fd4dc2c5c..4e0d47c87 100644 --- a/tests/cfgs/default/result/teamviewer.pcap.out +++ b/tests/cfgs/default/result/teamviewer.pcap.out @@ -3,7 +3,7 @@ Guessed flow protos: 0 DPI Packets (TCP): 4 (4.00 pkts/flow) DPI Packets (UDP): 4 (4.00 pkts/flow) Confidence DPI : 2 (flows) -Num dissector calls: 164 (82.00 diss/flow) +Num dissector calls: 165 (82.50 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/telegram.pcap.out b/tests/cfgs/default/result/telegram.pcap.out index 0ec1c9fca..b49812301 100644 --- a/tests/cfgs/default/result/telegram.pcap.out +++ b/tests/cfgs/default/result/telegram.pcap.out @@ -3,7 +3,7 @@ Guessed flow protos: 5 DPI Packets (UDP): 81 (1.69 pkts/flow) Confidence Unknown : 2 (flows) Confidence DPI : 46 (flows) -Num dissector calls: 1467 (30.56 diss/flow) +Num dissector calls: 1469 (30.60 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/6/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/telegram_videocall.pcapng.out b/tests/cfgs/default/result/telegram_videocall.pcapng.out index 3e85a234d..2c91bd9d2 100644 --- a/tests/cfgs/default/result/telegram_videocall.pcapng.out +++ b/tests/cfgs/default/result/telegram_videocall.pcapng.out @@ -7,7 +7,7 @@ Confidence Match by port : 8 (flows) Confidence DPI (cache) : 10 (flows) Confidence DPI : 15 (flows) Confidence Match by IP : 1 (flows) -Num dissector calls: 1927 (56.68 diss/flow) +Num dissector calls: 1935 (56.91 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/27/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/telnet.pcap.out b/tests/cfgs/default/result/telnet.pcap.out index ef7c0a800..63854e6d5 100644 --- a/tests/cfgs/default/result/telnet.pcap.out +++ b/tests/cfgs/default/result/telnet.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (TCP): 33 (33.00 pkts/flow) Confidence DPI : 1 (flows) -Num dissector calls: 157 (157.00 diss/flow) +Num dissector calls: 158 (158.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/tftp.pcap.out b/tests/cfgs/default/result/tftp.pcap.out index 86ab14ac4..8817d8709 100644 --- a/tests/cfgs/default/result/tftp.pcap.out +++ b/tests/cfgs/default/result/tftp.pcap.out @@ -3,7 +3,7 @@ Guessed flow protos: 2 DPI Packets (UDP): 15 (1.67 pkts/flow) Confidence Match by port : 2 (flows) Confidence DPI : 7 (flows) -Num dissector calls: 612 (68.00 diss/flow) +Num dissector calls: 616 (68.44 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/6/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/threema.pcap.out b/tests/cfgs/default/result/threema.pcap.out index d986214d9..cb85005bc 100644 --- a/tests/cfgs/default/result/threema.pcap.out +++ b/tests/cfgs/default/result/threema.pcap.out @@ -3,7 +3,7 @@ Guessed flow protos: 2 DPI Packets (TCP): 66 (11.00 pkts/flow) Confidence DPI : 4 (flows) Confidence Match by IP : 2 (flows) -Num dissector calls: 1272 (212.00 diss/flow) +Num dissector calls: 1278 (213.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/6/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/tinc.pcap.out b/tests/cfgs/default/result/tinc.pcap.out index 87d520532..1f6110b63 100644 --- a/tests/cfgs/default/result/tinc.pcap.out +++ b/tests/cfgs/default/result/tinc.pcap.out @@ -4,7 +4,7 @@ DPI Packets (TCP): 19 (9.50 pkts/flow) DPI Packets (UDP): 2 (1.00 pkts/flow) Confidence DPI (cache) : 2 (flows) Confidence DPI : 2 (flows) -Num dissector calls: 516 (129.00 diss/flow) +Num dissector calls: 518 (129.50 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/tls-appdata.pcap.out b/tests/cfgs/default/result/tls-appdata.pcap.out index 7b1636091..41c30ee27 100644 --- a/tests/cfgs/default/result/tls-appdata.pcap.out +++ b/tests/cfgs/default/result/tls-appdata.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 1 DPI Packets (TCP): 17 (8.50 pkts/flow) Confidence DPI : 2 (flows) -Num dissector calls: 130 (65.00 diss/flow) +Num dissector calls: 131 (65.50 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) 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 f76558fa8..0708231a6 100644 --- a/tests/cfgs/default/result/tls_certificate_too_long.pcap.out +++ b/tests/cfgs/default/result/tls_certificate_too_long.pcap.out @@ -6,7 +6,7 @@ DPI Packets (other): 2 (1.00 pkts/flow) Confidence Unknown : 1 (flows) Confidence Match by port : 1 (flows) Confidence DPI : 33 (flows) -Num dissector calls: 595 (17.00 diss/flow) +Num dissector calls: 598 (17.09 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/6/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/tls_false_positives.pcapng.out b/tests/cfgs/default/result/tls_false_positives.pcapng.out index cd45f658b..057c7aa60 100644 --- a/tests/cfgs/default/result/tls_false_positives.pcapng.out +++ b/tests/cfgs/default/result/tls_false_positives.pcapng.out @@ -2,7 +2,7 @@ Guessed flow protos: 1 DPI Packets (TCP): 13 (13.00 pkts/flow) Confidence Unknown : 1 (flows) -Num dissector calls: 258 (258.00 diss/flow) +Num dissector calls: 259 (259.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/3/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/tls_invalid_reads.pcap.out b/tests/cfgs/default/result/tls_invalid_reads.pcap.out index 6878b795f..f7cb33036 100644 --- a/tests/cfgs/default/result/tls_invalid_reads.pcap.out +++ b/tests/cfgs/default/result/tls_invalid_reads.pcap.out @@ -3,7 +3,7 @@ Guessed flow protos: 2 DPI Packets (TCP): 10 (3.33 pkts/flow) Confidence Match by port : 1 (flows) Confidence DPI : 2 (flows) -Num dissector calls: 130 (43.33 diss/flow) +Num dissector calls: 131 (43.67 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/3/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/tls_missing_ch_frag.pcap.out b/tests/cfgs/default/result/tls_missing_ch_frag.pcap.out index 2cee7a2e7..f2a0e2421 100644 --- a/tests/cfgs/default/result/tls_missing_ch_frag.pcap.out +++ b/tests/cfgs/default/result/tls_missing_ch_frag.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (TCP): 3 (3.00 pkts/flow) Confidence DPI : 1 (flows) -Num dissector calls: 129 (129.00 diss/flow) +Num dissector calls: 130 (130.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/toca-boca.pcap.out b/tests/cfgs/default/result/toca-boca.pcap.out index a25acbcca..ce90976f0 100644 --- a/tests/cfgs/default/result/toca-boca.pcap.out +++ b/tests/cfgs/default/result/toca-boca.pcap.out @@ -3,7 +3,7 @@ Guessed flow protos: 4 DPI Packets (UDP): 21 (1.00 pkts/flow) Confidence Match by port : 4 (flows) Confidence DPI : 17 (flows) -Num dissector calls: 497 (23.67 diss/flow) +Num dissector calls: 501 (23.86 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/12/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/viber.pcap.out b/tests/cfgs/default/result/viber.pcap.out index a0de2b55f..4df062dc9 100644 --- a/tests/cfgs/default/result/viber.pcap.out +++ b/tests/cfgs/default/result/viber.pcap.out @@ -5,7 +5,7 @@ DPI Packets (UDP): 27 (1.93 pkts/flow) DPI Packets (other): 2 (1.00 pkts/flow) Confidence Match by port : 4 (flows) Confidence DPI : 25 (flows) -Num dissector calls: 457 (15.76 diss/flow) +Num dissector calls: 459 (15.83 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/12/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/vnc.pcap.out b/tests/cfgs/default/result/vnc.pcap.out index 24ed4a3e3..1982febe7 100644 --- a/tests/cfgs/default/result/vnc.pcap.out +++ b/tests/cfgs/default/result/vnc.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (TCP): 10 (5.00 pkts/flow) Confidence DPI : 2 (flows) -Num dissector calls: 268 (134.00 diss/flow) +Num dissector calls: 270 (135.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/wa_video.pcap.out b/tests/cfgs/default/result/wa_video.pcap.out index faf5ec6b7..8aecc24ee 100644 --- a/tests/cfgs/default/result/wa_video.pcap.out +++ b/tests/cfgs/default/result/wa_video.pcap.out @@ -5,7 +5,7 @@ DPI Packets (UDP): 13 (1.00 pkts/flow) Confidence DPI (cache) : 2 (flows) Confidence DPI : 11 (flows) Confidence Match by IP : 1 (flows) -Num dissector calls: 397 (28.36 diss/flow) +Num dissector calls: 398 (28.43 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/3/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/waze.pcap.out b/tests/cfgs/default/result/waze.pcap.out index cea40705a..6f1cb73c7 100644 --- a/tests/cfgs/default/result/waze.pcap.out +++ b/tests/cfgs/default/result/waze.pcap.out @@ -5,7 +5,7 @@ DPI Packets (UDP): 1 (1.00 pkts/flow) Confidence Unknown : 1 (flows) Confidence Match by port : 9 (flows) Confidence DPI : 23 (flows) -Num dissector calls: 357 (10.82 diss/flow) +Num dissector calls: 358 (10.85 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/30/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/webex.pcap.out b/tests/cfgs/default/result/webex.pcap.out index b1e2df420..7703c5c47 100644 --- a/tests/cfgs/default/result/webex.pcap.out +++ b/tests/cfgs/default/result/webex.pcap.out @@ -5,7 +5,7 @@ DPI Packets (UDP): 14 (7.00 pkts/flow) Confidence Match by port : 3 (flows) Confidence DPI : 53 (flows) Confidence Match by IP : 1 (flows) -Num dissector calls: 282 (4.95 diss/flow) +Num dissector calls: 283 (4.96 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/12/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/wechat.pcap.out b/tests/cfgs/default/result/wechat.pcap.out index cb659a0e8..f950f1dc4 100644 --- a/tests/cfgs/default/result/wechat.pcap.out +++ b/tests/cfgs/default/result/wechat.pcap.out @@ -6,7 +6,7 @@ DPI Packets (other): 7 (1.00 pkts/flow) Confidence Match by port : 24 (flows) Confidence DPI : 78 (flows) Confidence Match by IP : 1 (flows) -Num dissector calls: 311 (3.02 diss/flow) +Num dissector calls: 312 (3.03 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/75/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/weibo.pcap.out b/tests/cfgs/default/result/weibo.pcap.out index 634b348a1..678d946ff 100644 --- a/tests/cfgs/default/result/weibo.pcap.out +++ b/tests/cfgs/default/result/weibo.pcap.out @@ -4,7 +4,7 @@ DPI Packets (TCP): 100 (3.33 pkts/flow) DPI Packets (UDP): 43 (3.07 pkts/flow) Confidence Match by port : 21 (flows) Confidence DPI : 23 (flows) -Num dissector calls: 546 (12.41 diss/flow) +Num dissector calls: 548 (12.45 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/63/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/whatsapp.pcap.out b/tests/cfgs/default/result/whatsapp.pcap.out index 480ae5f84..8daa37a1c 100644 --- a/tests/cfgs/default/result/whatsapp.pcap.out +++ b/tests/cfgs/default/result/whatsapp.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (TCP): 344 (4.00 pkts/flow) Confidence DPI : 86 (flows) -Num dissector calls: 12728 (148.00 diss/flow) +Num dissector calls: 12814 (149.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/whatsapp_login_chat.pcap.out b/tests/cfgs/default/result/whatsapp_login_chat.pcap.out index c6b93fda0..dcdc299a0 100644 --- a/tests/cfgs/default/result/whatsapp_login_chat.pcap.out +++ b/tests/cfgs/default/result/whatsapp_login_chat.pcap.out @@ -3,7 +3,7 @@ Guessed flow protos: 2 DPI Packets (TCP): 17 (5.67 pkts/flow) DPI Packets (UDP): 7 (1.17 pkts/flow) Confidence DPI : 9 (flows) -Num dissector calls: 284 (31.56 diss/flow) +Num dissector calls: 285 (31.67 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/whois.pcapng.out b/tests/cfgs/default/result/whois.pcapng.out index 6525e52c5..699e2ec22 100644 --- a/tests/cfgs/default/result/whois.pcapng.out +++ b/tests/cfgs/default/result/whois.pcapng.out @@ -3,7 +3,7 @@ Guessed flow protos: 1 DPI Packets (TCP): 16 (5.33 pkts/flow) Confidence Match by port : 1 (flows) Confidence DPI : 2 (flows) -Num dissector calls: 189 (63.00 diss/flow) +Num dissector calls: 190 (63.33 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/3/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/wireguard.pcap.out b/tests/cfgs/default/result/wireguard.pcap.out index f0839b418..0b42fd60e 100644 --- a/tests/cfgs/default/result/wireguard.pcap.out +++ b/tests/cfgs/default/result/wireguard.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (UDP): 6 (3.00 pkts/flow) Confidence DPI : 2 (flows) -Num dissector calls: 279 (139.50 diss/flow) +Num dissector calls: 281 (140.50 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/z3950.pcapng.out b/tests/cfgs/default/result/z3950.pcapng.out index be6270ade..b2745d20f 100644 --- a/tests/cfgs/default/result/z3950.pcapng.out +++ b/tests/cfgs/default/result/z3950.pcapng.out @@ -3,7 +3,7 @@ Guessed flow protos: 1 DPI Packets (TCP): 26 (13.00 pkts/flow) Confidence Match by port : 1 (flows) Confidence DPI : 1 (flows) -Num dissector calls: 461 (230.50 diss/flow) +Num dissector calls: 463 (231.50 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/3/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/zoom.pcap.out b/tests/cfgs/default/result/zoom.pcap.out index 282e73123..87bfccdd8 100644 --- a/tests/cfgs/default/result/zoom.pcap.out +++ b/tests/cfgs/default/result/zoom.pcap.out @@ -5,7 +5,7 @@ DPI Packets (UDP): 23 (1.35 pkts/flow) DPI Packets (other): 2 (1.00 pkts/flow) Confidence Match by port : 2 (flows) Confidence DPI : 31 (flows) -Num dissector calls: 666 (20.18 diss/flow) +Num dissector calls: 668 (20.24 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/6/0 (insert/search/found) LRU cache zoom: 7/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/zoom2.pcap.out b/tests/cfgs/default/result/zoom2.pcap.out index e6ba177e1..bfd39a841 100644 --- a/tests/cfgs/default/result/zoom2.pcap.out +++ b/tests/cfgs/default/result/zoom2.pcap.out @@ -4,7 +4,7 @@ DPI Packets (TCP): 8 (8.00 pkts/flow) DPI Packets (UDP): 15 (5.00 pkts/flow) DPI Packets (other): 1 (1.00 pkts/flow) Confidence DPI : 5 (flows) -Num dissector calls: 518 (103.60 diss/flow) +Num dissector calls: 521 (104.20 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 1/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/zoom_p2p.pcapng.out b/tests/cfgs/default/result/zoom_p2p.pcapng.out index 9e1b9f016..8e9eaf4c5 100644 --- a/tests/cfgs/default/result/zoom_p2p.pcapng.out +++ b/tests/cfgs/default/result/zoom_p2p.pcapng.out @@ -4,7 +4,7 @@ DPI Packets (UDP): 52 (5.20 pkts/flow) DPI Packets (other): 2 (1.00 pkts/flow) Confidence DPI (partial cache): 4 (flows) Confidence DPI : 8 (flows) -Num dissector calls: 836 (69.67 diss/flow) +Num dissector calls: 840 (70.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/12/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/disable_aggressiveness/result/ookla.pcap.out b/tests/cfgs/disable_aggressiveness/result/ookla.pcap.out index ea88d244f..749ce6a93 100644 --- a/tests/cfgs/disable_aggressiveness/result/ookla.pcap.out +++ b/tests/cfgs/disable_aggressiveness/result/ookla.pcap.out @@ -3,7 +3,7 @@ Guessed flow protos: 1 DPI Packets (TCP): 40 (6.67 pkts/flow) Confidence DPI (partial cache): 1 (flows) Confidence DPI : 5 (flows) -Num dissector calls: 525 (87.50 diss/flow) +Num dissector calls: 528 (88.00 diss/flow) LRU cache ookla: 4/1/1 (insert/search/found) LRU cache bittorrent: 0/3/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/disable_protocols/result/dns_long_domainname.pcap.out b/tests/cfgs/disable_protocols/result/dns_long_domainname.pcap.out index a72245fe3..5809462ed 100644 --- a/tests/cfgs/disable_protocols/result/dns_long_domainname.pcap.out +++ b/tests/cfgs/disable_protocols/result/dns_long_domainname.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 1 DPI Packets (UDP): 2 (2.00 pkts/flow) Confidence Match by IP : 1 (flows) -Num dissector calls: 135 (135.00 diss/flow) +Num dissector calls: 136 (136.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/3/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/disable_protocols/result/quic-mvfst-27.pcapng.out b/tests/cfgs/disable_protocols/result/quic-mvfst-27.pcapng.out index 3bf11e898..377b4d08c 100644 --- a/tests/cfgs/disable_protocols/result/quic-mvfst-27.pcapng.out +++ b/tests/cfgs/disable_protocols/result/quic-mvfst-27.pcapng.out @@ -2,7 +2,7 @@ Guessed flow protos: 1 DPI Packets (UDP): 13 (13.00 pkts/flow) Confidence Match by IP : 1 (flows) -Num dissector calls: 197 (197.00 diss/flow) +Num dissector calls: 198 (198.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/3/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/disable_protocols/result/soap.pcap.out b/tests/cfgs/disable_protocols/result/soap.pcap.out index 883518151..5bbbc57bd 100644 --- a/tests/cfgs/disable_protocols/result/soap.pcap.out +++ b/tests/cfgs/disable_protocols/result/soap.pcap.out @@ -3,7 +3,7 @@ Guessed flow protos: 3 DPI Packets (TCP): 20 (6.67 pkts/flow) Confidence Match by port : 2 (flows) Confidence DPI : 1 (flows) -Num dissector calls: 375 (125.00 diss/flow) +Num dissector calls: 377 (125.67 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/6/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) 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 19e22069d..d4ad15787 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 @@ -4,7 +4,7 @@ DPI Packets (TCP): 9 (3.00 pkts/flow) DPI Packets (UDP): 36 (4.00 pkts/flow) Confidence DPI (cache) : 6 (flows) Confidence DPI : 6 (flows) -Num dissector calls: 776 (64.67 diss/flow) +Num dissector calls: 779 (64.92 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 25/12/4 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/enable_payload_stat/result/1kxun.pcap.out b/tests/cfgs/enable_payload_stat/result/1kxun.pcap.out index 70536e38c..a84097162 100644 --- a/tests/cfgs/enable_payload_stat/result/1kxun.pcap.out +++ b/tests/cfgs/enable_payload_stat/result/1kxun.pcap.out @@ -5,7 +5,7 @@ DPI Packets (UDP): 120 (1.21 pkts/flow) Confidence Unknown : 14 (flows) Confidence Match by port : 6 (flows) Confidence DPI : 177 (flows) -Num dissector calls: 4597 (23.34 diss/flow) +Num dissector calls: 4614 (23.42 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/60/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/windows/nDPI.vcxproj b/windows/nDPI.vcxproj index 4da9089af..7c4a7cc60 100644 --- a/windows/nDPI.vcxproj +++ b/windows/nDPI.vcxproj @@ -339,6 +339,7 @@ + diff --git a/windows/nDPI.vcxproj.filters b/windows/nDPI.vcxproj.filters index 51a220595..1bc7d1833 100644 --- a/windows/nDPI.vcxproj.filters +++ b/windows/nDPI.vcxproj.filters @@ -121,6 +121,7 @@ +