From 4b06aafee75e85a71fe03dd4bbb06e906c579b2b Mon Sep 17 00:00:00 2001 From: Toni Uhlig Date: Thu, 8 Jun 2023 19:08:51 +0200 Subject: [PATCH] Add Apache Thrift protocol dissector. Signed-off-by: Toni Uhlig --- src/include/ndpi_protocol_ids.h | 1 + src/include/ndpi_protocols.h | 1 + src/include/ndpi_typedefs.h | 5 + src/lib/ndpi_main.c | 8 + src/lib/protocols/coap.c | 2 + src/lib/protocols/thrift.c | 264 ++++++++++++++++++ tests/cfgs/caches_cfg/result/ookla.pcap.out | 2 +- tests/cfgs/caches_cfg/result/teams.pcap.out | 2 +- tests/cfgs/default/pcap/thrift.pcap | Bin 0 -> 107121 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/6in4tunnel.pcap.out | 2 +- tests/cfgs/default/result/6in6tunnel.pcap.out | 2 +- tests/cfgs/default/result/EAQ.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/WebattackRCE.pcap.out | 2 +- .../default/result/WebattackSQLinj.pcap.out | 2 +- .../cfgs/default/result/WebattackXSS.pcap.out | 2 +- .../default/result/adult_content.pcap.out | 2 +- .../cfgs/default/result/alexa-app.pcapng.out | 2 +- tests/cfgs/default/result/amqp.pcap.out | 2 +- tests/cfgs/default/result/android.pcap.out | 2 +- .../default/result/anyconnect-vpn.pcap.out | 2 +- .../result/bittorrent_tcp_miss.pcapng.out | 2 +- tests/cfgs/default/result/bot.pcap.out | 2 +- tests/cfgs/default/result/bt-http.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/crawler_false_positive.pcapng.out | 2 +- ...om_rules_same-ip_multiple_ports.pcapng.out | 4 +- .../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/emotet.pcap.out | 2 +- .../cfgs/default/result/epicgames.pcapng.out | 2 +- .../cfgs/default/result/exe_download.pcap.out | 2 +- .../result/exe_download_as_png.pcap.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 +- .../cfgs/default/result/geforcenow.pcapng.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 +- .../result/heuristic_tcp_ack_payload.pcap.out | 2 +- .../http-crash-content-disposition.pcap.out | 2 +- .../default/result/http-lines-split.pcap.out | 2 +- .../default/result/http-manipulated.pcap.out | 2 +- .../default/result/http_asymmetric.pcapng.out | 2 +- tests/cfgs/default/result/http_auth.pcap.out | 2 +- .../http_guessed_host_and_guessed.pcapng.out | 2 +- tests/cfgs/default/result/http_ipv6.pcap.out | 2 +- .../default/result/http_on_sip_port.pcap.out | 2 +- .../http_origin_different_than_host.pcap.out | 2 +- .../http_starting_with_reply.pcapng.out | 2 +- .../http_ua_splitted_in_two_pkts.pcapng.out | 2 +- .../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 +- tests/cfgs/default/result/ipp.pcap.out | 2 +- tests/cfgs/default/result/irc.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/malware.pcap.out | 2 +- tests/cfgs/default/result/memcached.cap.out | 2 +- .../result/mongo_false_positive.pcapng.out | 2 +- tests/cfgs/default/result/mpeg-dash.pcap.out | 2 +- tests/cfgs/default/result/mpeg.pcap.out | 2 +- tests/cfgs/default/result/mssql_tds.pcap.out | 2 +- ...match_string_subprotocol__error.pcapng.out | 2 +- .../default/result/nest_log_sink.pcap.out | 2 +- tests/cfgs/default/result/netbios.pcap.out | 2 +- tests/cfgs/default/result/netflix.pcap.out | 2 +- tests/cfgs/default/result/nintendo.pcap.out | 2 +- tests/cfgs/default/result/nntp.pcap.out | 2 +- tests/cfgs/default/result/ocs.pcap.out | 2 +- tests/cfgs/default/result/ocsp.pcapng.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_3.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/protonvpn.pcap.out | 2 +- .../cfgs/default/result/punycode-idn.pcap.out | 2 +- tests/cfgs/default/result/quic.pcap.out | 2 +- tests/cfgs/default/result/quic_0RTT.pcap.out | 2 +- tests/cfgs/default/result/quickplay.pcap.out | 2 +- .../result/radius_false_positive.pcapng.out | 2 +- tests/cfgs/default/result/raknet.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/rx.pcap.out | 2 +- tests/cfgs/default/result/sflow.pcap.out | 2 +- .../cfgs/default/result/sip_hello.pcapng.out | 2 +- tests/cfgs/default/result/sites.pcapng.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 +- .../result/socks-http-example.pcap.out | 2 +- tests/cfgs/default/result/softether.pcap.out | 2 +- .../default/result/sql_injection.pcap.out | 2 +- .../default/result/starcraft_battle.pcap.out | 2 +- tests/cfgs/default/result/stun.pcap.out | 2 +- .../default/result/stun_signal.pcapng.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 +- 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/thrift.pcap.out | 27 ++ 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/trickbot.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 +- .../result/windowsupdate_over_http.pcap.out | 2 +- tests/cfgs/default/result/wireguard.pcap.out | 2 +- tests/cfgs/default/result/wow.pcap.out | 2 +- tests/cfgs/default/result/xiaomi.pcap.out | 2 +- tests/cfgs/default/result/xss.pcap.out | 2 +- tests/cfgs/default/result/z3950.pcapng.out | 2 +- tests/cfgs/default/result/zattoo.pcap.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 + 182 files changed, 484 insertions(+), 175 deletions(-) create mode 100644 src/lib/protocols/thrift.c create mode 100644 tests/cfgs/default/pcap/thrift.pcap create mode 100644 tests/cfgs/default/result/thrift.pcap.out diff --git a/src/include/ndpi_protocol_ids.h b/src/include/ndpi_protocol_ids.h index 70f281c3685..7f9bb7c50b9 100644 --- a/src/include/ndpi_protocol_ids.h +++ b/src/include/ndpi_protocol_ids.h @@ -373,6 +373,7 @@ typedef enum { NDPI_PROTOCOL_NVIDIA = 342, NDPI_PROTOCOL_BITCOIN = 343, NDPI_PROTOCOL_PROTONVPN = 344, + NDPI_PROTOCOL_APACHE_THRIFT = 345, #ifdef CUSTOM_NDPI_PROTOCOLS #include "../../../nDPI-custom/custom_ndpi_protocol_ids.h" diff --git a/src/include/ndpi_protocols.h b/src/include/ndpi_protocols.h index 9bcb5ada958..8bc6873493c 100644 --- a/src/include/ndpi_protocols.h +++ b/src/include/ndpi_protocols.h @@ -243,6 +243,7 @@ void init_bacnet_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_i void init_oicq_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id); void init_epicgames_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id); void init_bitcoin_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id); +void init_apache_thrift_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id); /* ndpi_main.c */ extern u_int32_t ndpi_ip_port_hash_funct(u_int32_t ip, u_int16_t port); diff --git a/src/include/ndpi_typedefs.h b/src/include/ndpi_typedefs.h index 80dd05c9aa8..540761c67b5 100644 --- a/src/include/ndpi_typedefs.h +++ b/src/include/ndpi_typedefs.h @@ -1596,6 +1596,11 @@ struct ndpi_flow_struct { u_int16_t external_port; ndpi_ip_addr_t external_address; } natpmp; + + struct { + u_int8_t message_type; + char method[64]; + } thrift; } protos; /*** ALL protocol specific 64 bit variables here ***/ diff --git a/src/lib/ndpi_main.c b/src/lib/ndpi_main.c index 80b9f6d428f..7f88d8b1c03 100644 --- a/src/lib/ndpi_main.c +++ b/src/lib/ndpi_main.c @@ -1108,6 +1108,7 @@ static void ndpi_init_protocol_defaults(struct ndpi_detection_module_struct *ndp NDPI_PROTOCOL_IPP, NDPI_PROTOCOL_MPEGDASH, NDPI_PROTOCOL_RTSP, + NDPI_PROTOCOL_APACHE_THRIFT, NDPI_PROTOCOL_MATCHED_BY_CONTENT, NDPI_PROTOCOL_NO_MORE_SUBPROTOCOLS); /* NDPI_PROTOCOL_HTTP can have (content-matched) subprotocols */ ndpi_set_proto_defaults(ndpi_str, 1 /* cleartext */, 0 /* nw proto */, NDPI_PROTOCOL_ACCEPTABLE, NDPI_PROTOCOL_MDNS, @@ -2097,6 +2098,10 @@ static void ndpi_init_protocol_defaults(struct ndpi_detection_module_struct *ndp "ProtonVPN", NDPI_PROTOCOL_CATEGORY_VPN, 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_APACHE_THRIFT, + "Thrift", NDPI_PROTOCOL_CATEGORY_RPC, + ndpi_build_default_ports(ports_a, 0, 0, 0, 0, 0) /* TCP */, + ndpi_build_default_ports(ports_b, 0, 0, 0, 0, 0) /* UDP */); #ifdef CUSTOM_NDPI_PROTOCOLS @@ -4976,6 +4981,9 @@ static int ndpi_callback_init(struct ndpi_detection_module_struct *ndpi_str) { /*BITCOIN*/ init_bitcoin_dissector(ndpi_str, &a); + /* Apache Thrift */ + init_apache_thrift_dissector(ndpi_str, &a); + #ifdef CUSTOM_NDPI_PROTOCOLS #include "../../../nDPI-custom/custom_ndpi_main_init.c" #endif diff --git a/src/lib/protocols/coap.c b/src/lib/protocols/coap.c index 6d0f68d4691..8935aa22a8c 100644 --- a/src/lib/protocols/coap.c +++ b/src/lib/protocols/coap.c @@ -39,6 +39,8 @@ struct ndpi_coap_hdr u_int8_t version:2, type:2, tkl:4; #elif defined(__LITTLE_ENDIAN__) u_int8_t tkl:4, type:2, version:2; +#else +#error "Missing endian macro definitions." #endif u_int8_t code; u_int16_t message_id; //if needed, remember to convert in host number diff --git a/src/lib/protocols/thrift.c b/src/lib/protocols/thrift.c new file mode 100644 index 00000000000..fa283a39378 --- /dev/null +++ b/src/lib/protocols/thrift.c @@ -0,0 +1,264 @@ +/* + * thrift.c + * + * Copyright (C) 2023 - ntop.org + * + * 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_APACHE_THRIFT + +#include "ndpi_api.h" + +#include + +// References: https://thrift.apache.org AND https://github.com/apache/thrift +// Not Implemented (sub)protocols: TJSONProtocol, TSimpleJSONProtocol and TDebugProtocol + +// TBinaryProtocol +PACK_ON +struct thrift_strict_hdr { + uint8_t protocol_id; + uint8_t version; + uint8_t unused_byte_pad; + uint8_t message_type; + uint32_t method_length; + char method[0]; +} PACK_OFF; + +// TCompactProtocol +PACK_ON +struct thrift_compact_hdr { + uint8_t protocol_id; +#if defined(__BIG_ENDIAN__) + uint8_t message_type : 3; + uint8_t version : 5; +#elif defined(__LITTLE_ENDIAN__) + uint8_t version : 5; + uint8_t message_type : 3; +#else +#error "Missing endian macro definitions." +#endif + uint8_t sequence_id[3]; + uint8_t method_length; + char method[0]; +} PACK_OFF; + +enum thrift_message_type { + TMT_INVALID_TMESSAGE_TYPE = 0, + TMT_CALL = 1, + TMT_REPLY = 2, + TMT_EXCEPTION = 3, + TMT_ONEWAY = 4, + TMT_TYPE_MAX +}; + +static void ndpi_int_thrift_add_connection(struct ndpi_detection_module_struct *ndpi_struct, + struct ndpi_flow_struct *flow, + uint16_t master_protocol) +{ + switch (master_protocol) + { + case NDPI_PROTOCOL_UNKNOWN: + NDPI_LOG_DBG(ndpi_struct, "found Apache Thrift TCP/UDP\n"); + break; + case NDPI_PROTOCOL_HTTP: + NDPI_LOG_DBG(ndpi_struct, "found Apache Thrift HTTP\n"); + break; + default: + NDPI_LOG_DBG(ndpi_struct, "found Apache Thrift\n"); + break; + } + + ndpi_set_detected_protocol(ndpi_struct, flow, + NDPI_PROTOCOL_APACHE_THRIFT, master_protocol, + NDPI_CONFIDENCE_DPI); +} + +static int thrift_validate_method(char const * const method, size_t method_length) +{ + return ndpi_is_printable_buffer((uint8_t const *)method, method_length); +} + +static int thrift_validate_version(uint8_t version) +{ + return version <= 0x01; +} + +static int thrift_validate_type(uint8_t message_type) +{ + return message_type < TMT_TYPE_MAX; +} + +static void thrift_set_method(struct ndpi_detection_module_struct *ndpi_struct, + struct ndpi_flow_struct *flow, + char const * const method, size_t method_length) +{ + if (thrift_validate_method(method, method_length) == 0) { + ndpi_set_risk(ndpi_struct, flow, NDPI_INVALID_CHARACTERS, "Invalid method name"); + flow->protos.thrift.method[0] = '\0'; + } else { + strncpy(flow->protos.thrift.method, method, method_length); + } +} + +static void thrift_set_type(struct ndpi_detection_module_struct *ndpi_struct, + struct ndpi_flow_struct *flow, + uint8_t message_type) +{ + if (message_type == TMT_INVALID_TMESSAGE_TYPE) { + ndpi_set_risk(ndpi_struct, flow, NDPI_MALFORMED_PACKET, "Invalid message type"); + } + flow->protos.thrift.message_type = message_type; + + if (message_type == TMT_EXCEPTION) { + ndpi_set_risk(ndpi_struct, flow, NDPI_ERROR_CODE_DETECTED, "Apache Thrift Exception"); + } +} + +static void ndpi_dissect_strict_hdr(struct ndpi_detection_module_struct *ndpi_struct, + struct ndpi_flow_struct *flow, + struct thrift_strict_hdr const * const strict_hdr) +{ + struct ndpi_packet_struct const * const packet = &ndpi_struct->packet; + const size_t method_length = ntohl(strict_hdr->method_length); + + if (packet->tcp == NULL) { + NDPI_EXCLUDE_PROTO(ndpi_struct, flow); + return; + } + + if (packet->payload_packet_len < sizeof(*strict_hdr) + method_length) { + NDPI_EXCLUDE_PROTO(ndpi_struct, flow); + return; + } + + if (thrift_validate_version(strict_hdr->version) == 0) { + NDPI_EXCLUDE_PROTO(ndpi_struct, flow); + return; + } + + if (thrift_validate_type(strict_hdr->message_type) == 0) { + NDPI_EXCLUDE_PROTO(ndpi_struct, flow); + return; + } + + ndpi_int_thrift_add_connection(ndpi_struct, flow, NDPI_PROTOCOL_UNKNOWN); + + thrift_set_method(ndpi_struct, flow, strict_hdr->method, method_length); + thrift_set_type(ndpi_struct, flow, strict_hdr->message_type); +} + +static void ndpi_dissect_compact_hdr(struct ndpi_detection_module_struct *ndpi_struct, + struct ndpi_flow_struct *flow, + struct thrift_compact_hdr const * const compact_hdr) +{ + struct ndpi_packet_struct const * const packet = &ndpi_struct->packet; + + if (packet->udp == NULL) { + NDPI_EXCLUDE_PROTO(ndpi_struct, flow); + return; + } + + if (packet->payload_packet_len < sizeof(*compact_hdr) + compact_hdr->method_length) { + NDPI_EXCLUDE_PROTO(ndpi_struct, flow); + return; + } + + if (thrift_validate_version(compact_hdr->version) == 0) { + NDPI_EXCLUDE_PROTO(ndpi_struct, flow); + return; + } + + if (thrift_validate_type(compact_hdr->message_type) == 0) { + NDPI_EXCLUDE_PROTO(ndpi_struct, flow); + return; + } + + ndpi_int_thrift_add_connection(ndpi_struct, flow, NDPI_PROTOCOL_UNKNOWN); + + thrift_set_method(ndpi_struct, flow, compact_hdr->method, compact_hdr->method_length); + thrift_set_type(ndpi_struct, flow, compact_hdr->message_type); +} + +static void ndpi_search_thrift_tcp_udp(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 Apache Thrift\n"); + + if (flow->detected_protocol_stack[0] == NDPI_PROTOCOL_HTTP || + flow->detected_protocol_stack[1] == NDPI_PROTOCOL_HTTP) + { + /* Check Thrift over HTTP */ + if (packet->content_line.ptr != NULL) + { + if ((LINE_ENDS(packet->content_line, "application/vnd.apache.thrift.binary") != 0) || + (LINE_ENDS(packet->content_line, "application/vnd.apache.thrift.compact") != 0) || + (LINE_ENDS(packet->content_line, "application/vnd.apache.thrift.json") != 0)) + { + NDPI_LOG_INFO(ndpi_struct, "found Apache Thrift over HTTP\n"); + ndpi_int_thrift_add_connection(ndpi_struct, flow, NDPI_PROTOCOL_HTTP); + return; + } + } + } else if (packet->payload_packet_len >= sizeof(struct thrift_compact_hdr)) { + const union { + uint8_t const * const raw_ptr; + struct thrift_strict_hdr const * const strict_hdr; + struct thrift_compact_hdr const * const compact_hdr; + } thrift_data = { .raw_ptr = &packet->payload[0] }; + + if (thrift_data.raw_ptr[0] == 0x80) + { + /* Strict Binary Protocol */ + if (packet->payload_packet_len < sizeof(*thrift_data.strict_hdr)) + { + NDPI_EXCLUDE_PROTO(ndpi_struct, flow); + return; + } + + ndpi_dissect_strict_hdr(ndpi_struct, flow, thrift_data.strict_hdr); + return; + } else if (thrift_data.raw_ptr[0] == 0x82) { + /* Compact Protocol */ + ndpi_dissect_compact_hdr(ndpi_struct, flow, thrift_data.compact_hdr); + return; + } else { + /* Probably not Apache Thrift. */ + NDPI_EXCLUDE_PROTO(ndpi_struct, flow); + return; + } + } + + NDPI_EXCLUDE_PROTO(ndpi_struct, flow); +} + +void init_apache_thrift_dissector(struct ndpi_detection_module_struct *ndpi_struct, uint32_t *id) +{ + ndpi_set_bitmask_protocol_detection("Thrift", ndpi_struct, *id, + NDPI_PROTOCOL_APACHE_THRIFT, + ndpi_search_thrift_tcp_udp, + 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 77be635654d..f4299192c0b 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: 489 (81.50 diss/flow) +Num dissector calls: 493 (82.17 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 c48336234a9..ba45cb9d31a 100644 --- a/tests/cfgs/caches_cfg/result/teams.pcap.out +++ b/tests/cfgs/caches_cfg/result/teams.pcap.out @@ -7,7 +7,7 @@ Confidence Unknown : 1 (flows) Confidence Match by port : 1 (flows) Confidence DPI (partial) : 1 (flows) Confidence DPI : 80 (flows) -Num dissector calls: 495 (5.96 diss/flow) +Num dissector calls: 497 (5.99 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/thrift.pcap b/tests/cfgs/default/pcap/thrift.pcap new file mode 100644 index 0000000000000000000000000000000000000000..0404d787db6fb2e1a9177efad94560c3cdd015d8 GIT binary patch literal 107121 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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 1c535399ef5..6edb30589ea 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: 4431 (22.49 diss/flow) +Num dissector calls: 4534 (23.02 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 47316328796..45f16252f4e 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: 117 (117.00 diss/flow) +Num dissector calls: 118 (118.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 2d61614475f..c42392f1bd3 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: 118 (118.00 diss/flow) +Num dissector calls: 119 (119.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 1d25b8ce7df..356a3bc18d2 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: 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/3/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/6in4tunnel.pcap.out b/tests/cfgs/default/result/6in4tunnel.pcap.out index 0197d898562..bfee0fa0c9b 100644 --- a/tests/cfgs/default/result/6in4tunnel.pcap.out +++ b/tests/cfgs/default/result/6in4tunnel.pcap.out @@ -4,7 +4,7 @@ DPI Packets (TCP): 29 (5.80 pkts/flow) DPI Packets (UDP): 4 (2.00 pkts/flow) DPI Packets (other): 3 (1.00 pkts/flow) Confidence DPI : 10 (flows) -Num dissector calls: 25 (2.50 diss/flow) +Num dissector calls: 26 (2.60 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/6in6tunnel.pcap.out b/tests/cfgs/default/result/6in6tunnel.pcap.out index c733233be5f..91d4953c18c 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: 125 (125.00 diss/flow) +Num dissector calls: 126 (126.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 14a9e461685..db1a13aa92c 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: 4358 (140.58 diss/flow) +Num dissector calls: 4389 (141.58 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 3b9f6140724..f3e1b7f34a0 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: 524 (13.79 diss/flow) +Num dissector calls: 528 (13.89 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 d07c145d723..0128a8ac87c 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): 6 (1.20 pkts/flow) Confidence Match by port : 8 (flows) Confidence DPI : 11 (flows) Confidence Match by IP : 1 (flows) -Num dissector calls: 811 (40.55 diss/flow) +Num dissector calls: 815 (40.75 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 4a7150308fa..731eb43ef32 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: 244 (244.00 diss/flow) +Num dissector calls: 245 (245.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/WebattackRCE.pcap.out b/tests/cfgs/default/result/WebattackRCE.pcap.out index 8ee87652134..e5fd8bb5a36 100644 --- a/tests/cfgs/default/result/WebattackRCE.pcap.out +++ b/tests/cfgs/default/result/WebattackRCE.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 797 DPI Packets (TCP): 797 (1.00 pkts/flow) Confidence DPI : 797 (flows) -Num dissector calls: 9564 (12.00 diss/flow) +Num dissector calls: 10361 (13.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/WebattackSQLinj.pcap.out b/tests/cfgs/default/result/WebattackSQLinj.pcap.out index 7ae673ce237..5197d33793b 100644 --- a/tests/cfgs/default/result/WebattackSQLinj.pcap.out +++ b/tests/cfgs/default/result/WebattackSQLinj.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (TCP): 54 (6.00 pkts/flow) Confidence DPI : 9 (flows) -Num dissector calls: 108 (12.00 diss/flow) +Num dissector calls: 117 (13.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/WebattackXSS.pcap.out b/tests/cfgs/default/result/WebattackXSS.pcap.out index 9579702c3ce..2c918e1970b 100644 --- a/tests/cfgs/default/result/WebattackXSS.pcap.out +++ b/tests/cfgs/default/result/WebattackXSS.pcap.out @@ -3,7 +3,7 @@ Guessed flow protos: 639 DPI Packets (TCP): 3972 (6.01 pkts/flow) Confidence Match by port : 639 (flows) Confidence DPI : 22 (flows) -Num dissector calls: 264 (0.40 diss/flow) +Num dissector calls: 286 (0.43 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/1917/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/adult_content.pcap.out b/tests/cfgs/default/result/adult_content.pcap.out index d56adf2d867..fdb4813b73e 100644 --- a/tests/cfgs/default/result/adult_content.pcap.out +++ b/tests/cfgs/default/result/adult_content.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: 145 (145.00 diss/flow) +Num dissector calls: 146 (146.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 3c2e54255e7..fc9d722148f 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: 474 (2.96 diss/flow) +Num dissector calls: 494 (3.09 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 d0a5546b648..7562e4b9a64 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: 369 (123.00 diss/flow) +Num dissector calls: 370 (123.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/android.pcap.out b/tests/cfgs/default/result/android.pcap.out index 485d18522d4..1b3e46ad1ae 100644 --- a/tests/cfgs/default/result/android.pcap.out +++ b/tests/cfgs/default/result/android.pcap.out @@ -6,7 +6,7 @@ DPI Packets (other): 4 (1.00 pkts/flow) Confidence Match by port : 2 (flows) Confidence DPI : 60 (flows) Confidence Match by IP : 1 (flows) -Num dissector calls: 257 (4.08 diss/flow) +Num dissector calls: 260 (4.13 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/anyconnect-vpn.pcap.out b/tests/cfgs/default/result/anyconnect-vpn.pcap.out index 1eaad88033b..53402b501d5 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: 853 (12.36 diss/flow) +Num dissector calls: 859 (12.45 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 211fd38b4fc..881cc2fdbdd 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: 219 (219.00 diss/flow) +Num dissector calls: 220 (220.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/bot.pcap.out b/tests/cfgs/default/result/bot.pcap.out index 7631073504f..ed79c5c5dbb 100644 --- a/tests/cfgs/default/result/bot.pcap.out +++ b/tests/cfgs/default/result/bot.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: 12 (12.00 diss/flow) +Num dissector calls: 13 (13.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/bt-http.pcapng.out b/tests/cfgs/default/result/bt-http.pcapng.out index 76e43e62c42..ac274b0c55d 100644 --- a/tests/cfgs/default/result/bt-http.pcapng.out +++ b/tests/cfgs/default/result/bt-http.pcapng.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (TCP): 7 (7.00 pkts/flow) Confidence DPI : 1 (flows) -Num dissector calls: 15 (15.00 diss/flow) +Num dissector calls: 16 (16.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 fdf3d6d5018..91959b19c19 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): 18 (9.00 pkts/flow) Confidence DPI : 2 (flows) -Num dissector calls: 330 (165.00 diss/flow) +Num dissector calls: 332 (166.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 25ad7a59db2..60c5482dd1e 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: 174 (21.75 diss/flow) +Num dissector calls: 175 (21.88 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 474cfddaa40..62729dc5375 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: 402 (50.25 diss/flow) +Num dissector calls: 405 (50.62 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/crawler_false_positive.pcapng.out b/tests/cfgs/default/result/crawler_false_positive.pcapng.out index 4c838cbdaef..2565be9b14d 100644 --- a/tests/cfgs/default/result/crawler_false_positive.pcapng.out +++ b/tests/cfgs/default/result/crawler_false_positive.pcapng.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (TCP): 8 (8.00 pkts/flow) Confidence DPI : 1 (flows) -Num dissector calls: 12 (12.00 diss/flow) +Num dissector calls: 13 (13.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/custom_rules_same-ip_multiple_ports.pcapng.out b/tests/cfgs/default/result/custom_rules_same-ip_multiple_ports.pcapng.out index 12b5de02115..aa3e7a6ad81 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 @@ -23,5 +23,5 @@ Patricia protocols: 2/2 (search/found) CustomProtocolA 3 222 1 CustomProtocolB 2 148 1 - 1 TCP 192.168.1.245:56866 -> 3.3.3.3:443 [proto: 91.351/TLS.CustomProtocolA][IP: 351/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:59682 -> 3.3.3.3:444 [proto: 352/CustomProtocolB][IP: 352/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.352/TLS.CustomProtocolA][IP: 352/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:59682 -> 3.3.3.3:444 [proto: 353/CustomProtocolB][IP: 353/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 23af6fa9851..5a2d89744a3 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: 111 (111.00 diss/flow) +Num dissector calls: 112 (112.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 8bcd2b66866..138b5b1c2f3 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: 4039 (118.79 diss/flow) +Num dissector calls: 4066 (119.59 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 a7953a3b710..8e0e210932a 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: 146 (146.00 diss/flow) +Num dissector calls: 147 (147.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 17089cbe83b..34a78329e80 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: 20814 (84.96 diss/flow) +Num dissector calls: 20825 (85.00 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 df9656e7c72..7492875466c 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: 378 (126.00 diss/flow) +Num dissector calls: 381 (127.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 e9347fc51eb..1c824a7902e 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: 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/emotet.pcap.out b/tests/cfgs/default/result/emotet.pcap.out index 49cffb1742e..893205a84fb 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: 183 (30.50 diss/flow) +Num dissector calls: 187 (31.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 1a2081119a3..b175beb7e11 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: 592 (148.00 diss/flow) +Num dissector calls: 596 (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/exe_download.pcap.out b/tests/cfgs/default/result/exe_download.pcap.out index 23cc52f0f97..9d6bcc435a5 100644 --- a/tests/cfgs/default/result/exe_download.pcap.out +++ b/tests/cfgs/default/result/exe_download.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: 12 (12.00 diss/flow) +Num dissector calls: 13 (13.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/exe_download_as_png.pcap.out b/tests/cfgs/default/result/exe_download_as_png.pcap.out index 92f3d0bbedb..c4bd3407d9e 100644 --- a/tests/cfgs/default/result/exe_download_as_png.pcap.out +++ b/tests/cfgs/default/result/exe_download_as_png.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: 12 (12.00 diss/flow) +Num dissector calls: 13 (13.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/fastcgi.pcap.out b/tests/cfgs/default/result/fastcgi.pcap.out index caabb22ff15..09c48e4f564 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: 146 (146.00 diss/flow) +Num dissector calls: 147 (147.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 0aed30f1e6b..c31a2c9d08f 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: 145 (145.00 diss/flow) +Num dissector calls: 146 (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/ftp.pcap.out b/tests/cfgs/default/result/ftp.pcap.out index 4287f9a8cda..e8c9004cf27 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: 506 (168.67 diss/flow) +Num dissector calls: 508 (169.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/ftp_failed.pcap.out b/tests/cfgs/default/result/ftp_failed.pcap.out index abd2f1869e3..d6c55d9df4d 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: 145 (145.00 diss/flow) +Num dissector calls: 146 (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/fuzz-2006-06-26-2594.pcap.out b/tests/cfgs/default/result/fuzz-2006-06-26-2594.pcap.out index 80d29470b45..39454a106c8 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 : 30 (flows) Confidence Match by port : 28 (flows) Confidence DPI : 193 (flows) -Num dissector calls: 5523 (22.00 diss/flow) +Num dissector calls: 5569 (22.19 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/180/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 61eb9768ae1..efee1231c74 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: 929 (23.23 diss/flow) +Num dissector calls: 946 (23.65 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 bf35ecf36e6..abd2bb06d53 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: 1837 (23.86 diss/flow) +Num dissector calls: 1853 (24.06 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 848ffeaf6ba..eb8e3f625d2 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: 116 (116.00 diss/flow) +Num dissector calls: 117 (117.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/geforcenow.pcapng.out b/tests/cfgs/default/result/geforcenow.pcapng.out index e6c30b9b06d..1e7cc99081a 100644 --- a/tests/cfgs/default/result/geforcenow.pcapng.out +++ b/tests/cfgs/default/result/geforcenow.pcapng.out @@ -3,7 +3,7 @@ Guessed flow protos: 0 DPI Packets (TCP): 7 (7.00 pkts/flow) DPI Packets (UDP): 7 (7.00 pkts/flow) Confidence DPI : 2 (flows) -Num dissector calls: 133 (66.50 diss/flow) +Num dissector calls: 134 (67.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/gnutella.pcap.out b/tests/cfgs/default/result/gnutella.pcap.out index 67edd14ddbc..d69ef2ad566 100644 --- a/tests/cfgs/default/result/gnutella.pcap.out +++ b/tests/cfgs/default/result/gnutella.pcap.out @@ -7,7 +7,7 @@ Confidence Unknown : 387 (flows) Confidence Match by port : 1 (flows) Confidence DPI : 370 (flows) Confidence Match by IP : 2 (flows) -Num dissector calls: 42467 (55.88 diss/flow) +Num dissector calls: 42779 (56.29 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 e3291d261e5..c2f68db125b 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: 182 (182.00 diss/flow) +Num dissector calls: 183 (183.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 afeebce2672..7d74e941bc7 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: 401 (133.67 diss/flow) +Num dissector calls: 404 (134.67 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 edbbf699ddd..bc189ee5df3 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): 2 (2.00 pkts/flow) DPI Packets (UDP): 2 (2.00 pkts/flow) Confidence DPI : 2 (flows) -Num dissector calls: 230 (115.00 diss/flow) +Num dissector calls: 232 (116.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/heuristic_tcp_ack_payload.pcap.out b/tests/cfgs/default/result/heuristic_tcp_ack_payload.pcap.out index b8572daed8a..c3cb212fc45 100644 --- a/tests/cfgs/default/result/heuristic_tcp_ack_payload.pcap.out +++ b/tests/cfgs/default/result/heuristic_tcp_ack_payload.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (TCP): 67 (11.17 pkts/flow) Confidence DPI : 6 (flows) -Num dissector calls: 17 (2.83 diss/flow) +Num dissector calls: 18 (3.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/http-crash-content-disposition.pcap.out b/tests/cfgs/default/result/http-crash-content-disposition.pcap.out index f029dc15085..125b464b600 100644 --- a/tests/cfgs/default/result/http-crash-content-disposition.pcap.out +++ b/tests/cfgs/default/result/http-crash-content-disposition.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: 12 (12.00 diss/flow) +Num dissector calls: 13 (13.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/http-lines-split.pcap.out b/tests/cfgs/default/result/http-lines-split.pcap.out index e01ec7ed322..1a284ecdaae 100644 --- a/tests/cfgs/default/result/http-lines-split.pcap.out +++ b/tests/cfgs/default/result/http-lines-split.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: 12 (12.00 diss/flow) +Num dissector calls: 13 (13.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/http-manipulated.pcap.out b/tests/cfgs/default/result/http-manipulated.pcap.out index 0f45d1e4f16..c5e095b79c5 100644 --- a/tests/cfgs/default/result/http-manipulated.pcap.out +++ b/tests/cfgs/default/result/http-manipulated.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: 24 (12.00 diss/flow) +Num dissector calls: 26 (13.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/http_asymmetric.pcapng.out b/tests/cfgs/default/result/http_asymmetric.pcapng.out index 45ac377f120..a8c94533278 100644 --- a/tests/cfgs/default/result/http_asymmetric.pcapng.out +++ b/tests/cfgs/default/result/http_asymmetric.pcapng.out @@ -2,7 +2,7 @@ Guessed flow protos: 1 DPI Packets (TCP): 21 (10.50 pkts/flow) Confidence DPI : 2 (flows) -Num dissector calls: 24 (12.00 diss/flow) +Num dissector calls: 26 (13.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/http_auth.pcap.out b/tests/cfgs/default/result/http_auth.pcap.out index ef2cdb2201b..26ed5ce0435 100644 --- a/tests/cfgs/default/result/http_auth.pcap.out +++ b/tests/cfgs/default/result/http_auth.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: 12 (12.00 diss/flow) +Num dissector calls: 13 (13.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/http_guessed_host_and_guessed.pcapng.out b/tests/cfgs/default/result/http_guessed_host_and_guessed.pcapng.out index 2f6305f2096..94da64ca1d4 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: 117 (117.00 diss/flow) +Num dissector calls: 118 (118.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 7539a2e13ba..dd04b1384d9 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: 148 (9.87 diss/flow) +Num dissector calls: 149 (9.93 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/http_on_sip_port.pcap.out b/tests/cfgs/default/result/http_on_sip_port.pcap.out index d39422f9260..ddc07db82cc 100644 --- a/tests/cfgs/default/result/http_on_sip_port.pcap.out +++ b/tests/cfgs/default/result/http_on_sip_port.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (TCP): 4 (4.00 pkts/flow) Confidence DPI : 1 (flows) -Num dissector calls: 13 (13.00 diss/flow) +Num dissector calls: 14 (14.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/http_origin_different_than_host.pcap.out b/tests/cfgs/default/result/http_origin_different_than_host.pcap.out index d6e61074c2a..6437bcc931f 100644 --- a/tests/cfgs/default/result/http_origin_different_than_host.pcap.out +++ b/tests/cfgs/default/result/http_origin_different_than_host.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (TCP): 4 (4.00 pkts/flow) Confidence DPI : 1 (flows) -Num dissector calls: 12 (12.00 diss/flow) +Num dissector calls: 13 (13.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/http_starting_with_reply.pcapng.out b/tests/cfgs/default/result/http_starting_with_reply.pcapng.out index 4e791bc0739..59e9ce63664 100644 --- a/tests/cfgs/default/result/http_starting_with_reply.pcapng.out +++ b/tests/cfgs/default/result/http_starting_with_reply.pcapng.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (TCP): 7 (7.00 pkts/flow) Confidence DPI : 1 (flows) -Num dissector calls: 12 (12.00 diss/flow) +Num dissector calls: 13 (13.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/http_ua_splitted_in_two_pkts.pcapng.out b/tests/cfgs/default/result/http_ua_splitted_in_two_pkts.pcapng.out index 27b1a8006e0..f9ada9b66c9 100644 --- a/tests/cfgs/default/result/http_ua_splitted_in_two_pkts.pcapng.out +++ b/tests/cfgs/default/result/http_ua_splitted_in_two_pkts.pcapng.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (TCP): 5 (5.00 pkts/flow) Confidence DPI : 1 (flows) -Num dissector calls: 12 (12.00 diss/flow) +Num dissector calls: 13 (13.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-starttls.pcap.out b/tests/cfgs/default/result/imap-starttls.pcap.out index 7c27ec7d055..bb6d268daca 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: 193 (193.00 diss/flow) +Num dissector calls: 194 (194.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 68ab4634006..be5944b7138 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: 193 (193.00 diss/flow) +Num dissector calls: 194 (194.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 cd83c6d46df..d369d92477d 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: 291 (145.50 diss/flow) +Num dissector calls: 293 (146.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 bd05ce886c0..bb3c96e504f 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: 1316 (34.63 diss/flow) +Num dissector calls: 1328 (34.95 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 31f2e068f08..9d882b47f96 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: 350 (6.86 diss/flow) +Num dissector calls: 352 (6.90 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/ipp.pcap.out b/tests/cfgs/default/result/ipp.pcap.out index 37a37ea2ef0..b301de5c105 100644 --- a/tests/cfgs/default/result/ipp.pcap.out +++ b/tests/cfgs/default/result/ipp.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (TCP): 21 (7.00 pkts/flow) Confidence DPI : 3 (flows) -Num dissector calls: 48 (16.00 diss/flow) +Num dissector calls: 51 (17.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/irc.pcap.out b/tests/cfgs/default/result/irc.pcap.out index c36aa04e0ba..a9720356078 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: 151 (151.00 diss/flow) +Num dissector calls: 152 (152.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 706d71d333a..1a54d5dbe61 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: 1355 (112.92 diss/flow) +Num dissector calls: 1364 (113.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 4ca4475eb01..99573ebaec3 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: 3735 (103.75 diss/flow) +Num dissector calls: 3760 (104.44 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 7603abb5826..9a1953b2671 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: 324 (40.50 diss/flow) +Num dissector calls: 326 (40.75 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 460498c7b3f..90a6eae5b98 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: 200 (200.00 diss/flow) +Num dissector calls: 201 (201.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 98c8c104e87..0769618af80 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: 345 (49.29 diss/flow) +Num dissector calls: 349 (49.86 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 7c94b6ade4e..2eb1ede2323 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): 37 (4.11 pkts/flow) Confidence DPI (cache) : 6 (flows) Confidence DPI : 6 (flows) -Num dissector calls: 761 (63.42 diss/flow) +Num dissector calls: 764 (63.67 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/malware.pcap.out b/tests/cfgs/default/result/malware.pcap.out index 881fe5cd3de..743ef2c0740 100644 --- a/tests/cfgs/default/result/malware.pcap.out +++ b/tests/cfgs/default/result/malware.pcap.out @@ -5,7 +5,7 @@ DPI Packets (UDP): 2 (2.00 pkts/flow) DPI Packets (other): 1 (1.00 pkts/flow) Confidence Match by port : 1 (flows) Confidence DPI : 4 (flows) -Num dissector calls: 15 (3.00 diss/flow) +Num dissector calls: 16 (3.20 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/memcached.cap.out b/tests/cfgs/default/result/memcached.cap.out index 77d12b91496..283fb215a1b 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: 118 (118.00 diss/flow) +Num dissector calls: 119 (119.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 553556dc9e8..581cc0266f6 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: 257 (257.00 diss/flow) +Num dissector calls: 258 (258.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/mpeg-dash.pcap.out b/tests/cfgs/default/result/mpeg-dash.pcap.out index 40423a57fb9..3ee963e8e17 100644 --- a/tests/cfgs/default/result/mpeg-dash.pcap.out +++ b/tests/cfgs/default/result/mpeg-dash.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 3 DPI Packets (TCP): 13 (3.25 pkts/flow) Confidence DPI : 4 (flows) -Num dissector calls: 64 (16.00 diss/flow) +Num dissector calls: 68 (17.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/mpeg.pcap.out b/tests/cfgs/default/result/mpeg.pcap.out index d6738347726..b60f7ce1353 100644 --- a/tests/cfgs/default/result/mpeg.pcap.out +++ b/tests/cfgs/default/result/mpeg.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: 12 (12.00 diss/flow) +Num dissector calls: 13 (13.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/mssql_tds.pcap.out b/tests/cfgs/default/result/mssql_tds.pcap.out index f51149d5965..419c9a8482e 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: 263 (21.92 diss/flow) +Num dissector calls: 264 (22.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/ndpi_match_string_subprotocol__error.pcapng.out b/tests/cfgs/default/result/ndpi_match_string_subprotocol__error.pcapng.out index d840553d73b..76fcddb214c 100644 --- a/tests/cfgs/default/result/ndpi_match_string_subprotocol__error.pcapng.out +++ b/tests/cfgs/default/result/ndpi_match_string_subprotocol__error.pcapng.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (TCP): 3 (3.00 pkts/flow) Confidence DPI : 1 (flows) -Num dissector calls: 15 (15.00 diss/flow) +Num dissector calls: 16 (16.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 6bc4ea71f58..f8ed342e144 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: 1765 (126.07 diss/flow) +Num dissector calls: 1777 (126.93 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 c24c805e329..36cc2824c1a 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: 131 (8.73 diss/flow) +Num dissector calls: 132 (8.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/netflix.pcap.out b/tests/cfgs/default/result/netflix.pcap.out index bae04c7cb43..83976dba195 100644 --- a/tests/cfgs/default/result/netflix.pcap.out +++ b/tests/cfgs/default/result/netflix.pcap.out @@ -5,7 +5,7 @@ DPI Packets (UDP): 27 (2.08 pkts/flow) DPI Packets (other): 1 (1.00 pkts/flow) Confidence Match by port : 1 (flows) Confidence DPI : 60 (flows) -Num dissector calls: 375 (6.15 diss/flow) +Num dissector calls: 401 (6.57 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 3fa9f89323b..c7e8832ff0a 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: 1258 (59.90 diss/flow) +Num dissector calls: 1263 (60.14 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 944518d575a..ce0bef2699b 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: 124 (124.00 diss/flow) +Num dissector calls: 125 (125.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/ocs.pcap.out b/tests/cfgs/default/result/ocs.pcap.out index 5208708e01f..f1edf493a3a 100644 --- a/tests/cfgs/default/result/ocs.pcap.out +++ b/tests/cfgs/default/result/ocs.pcap.out @@ -4,7 +4,7 @@ DPI Packets (TCP): 92 (7.67 pkts/flow) DPI Packets (UDP): 8 (1.00 pkts/flow) Confidence DPI : 18 (flows) Confidence Match by IP : 2 (flows) -Num dissector calls: 73 (3.65 diss/flow) +Num dissector calls: 78 (3.90 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/ocsp.pcapng.out b/tests/cfgs/default/result/ocsp.pcapng.out index 65be6c6bf50..688bcb5d056 100644 --- a/tests/cfgs/default/result/ocsp.pcapng.out +++ b/tests/cfgs/default/result/ocsp.pcapng.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (TCP): 60 (6.00 pkts/flow) Confidence DPI : 10 (flows) -Num dissector calls: 120 (12.00 diss/flow) +Num dissector calls: 130 (13.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 04e4ed6e17e..13c64094cc6 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: 489 (81.50 diss/flow) +Num dissector calls: 493 (82.17 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 2dc85fc95b2..7f96ea8f0be 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: 394 (131.33 diss/flow) +Num dissector calls: 397 (132.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/oracle12.pcapng.out b/tests/cfgs/default/result/oracle12.pcapng.out index 40a8ac1062d..ea9016117a3 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: 252 (252.00 diss/flow) +Num dissector calls: 253 (253.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 6c8b29fa611..43034f91b44 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): 13 (3.25 pkts/flow) Confidence DPI : 10 (flows) -Num dissector calls: 696 (69.60 diss/flow) +Num dissector calls: 701 (70.10 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/ossfuzz_seed_fake_traces_2.pcapng.out b/tests/cfgs/default/result/ossfuzz_seed_fake_traces_2.pcapng.out index b1ef5f91ce0..d14ff4e4220 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): 12 (6.00 pkts/flow) DPI Packets (UDP): 4 (2.00 pkts/flow) Confidence Match by port : 1 (flows) Confidence DPI : 3 (flows) -Num dissector calls: 490 (122.50 diss/flow) +Num dissector calls: 494 (123.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/ossfuzz_seed_fake_traces_3.pcapng.out b/tests/cfgs/default/result/ossfuzz_seed_fake_traces_3.pcapng.out index 9e4d38816f8..9bb2125ac66 100644 --- a/tests/cfgs/default/result/ossfuzz_seed_fake_traces_3.pcapng.out +++ b/tests/cfgs/default/result/ossfuzz_seed_fake_traces_3.pcapng.out @@ -2,7 +2,7 @@ Guessed flow protos: 1 DPI Packets (TCP): 4 (4.00 pkts/flow) Confidence DPI : 1 (flows) -Num dissector calls: 12 (12.00 diss/flow) +Num dissector calls: 13 (13.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/ossfuzz_seed_fake_traces_4.pcapng.out b/tests/cfgs/default/result/ossfuzz_seed_fake_traces_4.pcapng.out index bddc0ff70d2..53532034f39 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: 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/pgsql.pcap.out b/tests/cfgs/default/result/pgsql.pcap.out index d3ee97f15bd..d3698230380 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: 708 (118.00 diss/flow) +Num dissector calls: 714 (119.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 ca65cd68c4f..5d62d47fe8b 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: 1104 (184.00 diss/flow) +Num dissector calls: 1110 (185.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_stls.pcap.out b/tests/cfgs/default/result/pop3_stls.pcap.out index 8513a1e3732..346fe49a2a1 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: 186 (186.00 diss/flow) +Num dissector calls: 187 (187.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 f5ca6ed3456..a6cbab6f5aa 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: 5370 (50.19 diss/flow) +Num dissector calls: 5460 (51.03 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/protonvpn.pcap.out b/tests/cfgs/default/result/protonvpn.pcap.out index a7dc08ba0c7..9b31ae186fb 100644 --- a/tests/cfgs/default/result/protonvpn.pcap.out +++ b/tests/cfgs/default/result/protonvpn.pcap.out @@ -3,7 +3,7 @@ Guessed flow protos: 0 DPI Packets (TCP): 11 (11.00 pkts/flow) DPI Packets (UDP): 2 (2.00 pkts/flow) Confidence DPI : 2 (flows) -Num dissector calls: 127 (63.50 diss/flow) +Num dissector calls: 128 (64.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/punycode-idn.pcap.out b/tests/cfgs/default/result/punycode-idn.pcap.out index 55a7b6338fc..2842485eaa8 100644 --- a/tests/cfgs/default/result/punycode-idn.pcap.out +++ b/tests/cfgs/default/result/punycode-idn.pcap.out @@ -3,7 +3,7 @@ Guessed flow protos: 1 DPI Packets (TCP): 8 (8.00 pkts/flow) DPI Packets (UDP): 4 (2.00 pkts/flow) Confidence DPI : 3 (flows) -Num dissector calls: 14 (4.67 diss/flow) +Num dissector calls: 15 (5.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/quic.pcap.out b/tests/cfgs/default/result/quic.pcap.out index 2c7cd9d0e22..80804cc536c 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: 213 (21.30 diss/flow) +Num dissector calls: 214 (21.40 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 0361810194e..514b4000272 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: 189 (94.50 diss/flow) +Num dissector calls: 190 (95.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/quickplay.pcap.out b/tests/cfgs/default/result/quickplay.pcap.out index d741d809261..50494643255 100644 --- a/tests/cfgs/default/result/quickplay.pcap.out +++ b/tests/cfgs/default/result/quickplay.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 8 DPI Packets (TCP): 78 (3.71 pkts/flow) Confidence DPI : 21 (flows) -Num dissector calls: 197 (9.38 diss/flow) +Num dissector calls: 213 (10.14 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/radius_false_positive.pcapng.out b/tests/cfgs/default/result/radius_false_positive.pcapng.out index 97932531136..1c46545b87f 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: 193 (193.00 diss/flow) +Num dissector calls: 194 (194.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 492e85f2dac..83bfa352374 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: 1422 (118.50 diss/flow) +Num dissector calls: 1428 (119.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/reasm_crash_anon.pcapng.out b/tests/cfgs/default/result/reasm_crash_anon.pcapng.out index c0201e123b5..1d53b3fff32 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: 238 (238.00 diss/flow) +Num dissector calls: 239 (239.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 b81b864ec77..05a227679f2 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: 187 (187.00 diss/flow) +Num dissector calls: 188 (188.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 53b02dbe083..e432c5cfa8a 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: 175 (87.50 diss/flow) +Num dissector calls: 176 (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/default/result/rsh.pcap.out b/tests/cfgs/default/result/rsh.pcap.out index 7e6cd598c75..338e680a320 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: 286 (143.00 diss/flow) +Num dissector calls: 288 (144.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 04f89234156..421e428271d 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: 146 (146.00 diss/flow) +Num dissector calls: 147 (147.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 1356a2f550e..a864d08d9be 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: 627 (125.40 diss/flow) +Num dissector calls: 632 (126.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/sflow.pcap.out b/tests/cfgs/default/result/sflow.pcap.out index 9ccd3156c15..2f8e855e027 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: 112 (112.00 diss/flow) +Num dissector calls: 113 (113.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/sip_hello.pcapng.out b/tests/cfgs/default/result/sip_hello.pcapng.out index e74988c41d2..23aa472491c 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: 190 (190.00 diss/flow) +Num dissector calls: 191 (191.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/sites.pcapng.out b/tests/cfgs/default/result/sites.pcapng.out index 038c471e537..7033b3bb5b3 100644 --- a/tests/cfgs/default/result/sites.pcapng.out +++ b/tests/cfgs/default/result/sites.pcapng.out @@ -4,7 +4,7 @@ DPI Packets (TCP): 229 (5.20 pkts/flow) DPI Packets (UDP): 3 (1.00 pkts/flow) Confidence Match by port : 4 (flows) Confidence DPI : 43 (flows) -Num dissector calls: 54 (1.15 diss/flow) +Num dissector calls: 55 (1.17 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/skype.pcap.out b/tests/cfgs/default/result/skype.pcap.out index 4864c1117c6..4ad32d496f4 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: 26505 (90.46 diss/flow) +Num dissector calls: 26591 (90.75 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 ae956bdf04d..f43fac86108 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: 22200 (83.15 diss/flow) +Num dissector calls: 22264 (83.39 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 32599b6f1bf..a3137b6e572 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: 164 (164.00 diss/flow) +Num dissector calls: 165 (165.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 76f1ce889e0..ea99e1d5176 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: 146 (146.00 diss/flow) +Num dissector calls: 147 (147.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 c58a15f0c23..822448485cf 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: 148 (148.00 diss/flow) +Num dissector calls: 149 (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/smtp-starttls.pcap.out b/tests/cfgs/default/result/smtp-starttls.pcap.out index a2b89dbcd89..582286ff05d 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: 144 (72.00 diss/flow) +Num dissector calls: 145 (72.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 7384d7b1554..28090368ff6 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: 187 (187.00 diss/flow) +Num dissector calls: 188 (188.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 7c39ae82f45..ea6a336eaed 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: 359 (119.67 diss/flow) +Num dissector calls: 362 (120.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-http-example.pcap.out b/tests/cfgs/default/result/socks-http-example.pcap.out index 39a1af42a26..cf65bf77653 100644 --- a/tests/cfgs/default/result/socks-http-example.pcap.out +++ b/tests/cfgs/default/result/socks-http-example.pcap.out @@ -3,7 +3,7 @@ Guessed flow protos: 1 DPI Packets (TCP): 29 (9.67 pkts/flow) Confidence Match by port : 1 (flows) Confidence DPI : 2 (flows) -Num dissector calls: 445 (148.33 diss/flow) +Num dissector calls: 448 (149.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/softether.pcap.out b/tests/cfgs/default/result/softether.pcap.out index e684e17a515..6f9520e1d91 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: 371 (92.75 diss/flow) +Num dissector calls: 374 (93.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/sql_injection.pcap.out b/tests/cfgs/default/result/sql_injection.pcap.out index c17e3016673..9fd15931189 100644 --- a/tests/cfgs/default/result/sql_injection.pcap.out +++ b/tests/cfgs/default/result/sql_injection.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: 12 (12.00 diss/flow) +Num dissector calls: 13 (13.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/starcraft_battle.pcap.out b/tests/cfgs/default/result/starcraft_battle.pcap.out index 392c5f7c35e..f50cf5bf716 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: 1431 (27.52 diss/flow) +Num dissector calls: 1459 (28.06 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/stun.pcap.out b/tests/cfgs/default/result/stun.pcap.out index 4dc337934fd..545350e94f4 100644 --- a/tests/cfgs/default/result/stun.pcap.out +++ b/tests/cfgs/default/result/stun.pcap.out @@ -3,7 +3,7 @@ Guessed flow protos: 0 DPI Packets (TCP): 7 (3.50 pkts/flow) DPI Packets (UDP): 17 (5.67 pkts/flow) Confidence DPI : 5 (flows) -Num dissector calls: 588 (117.60 diss/flow) +Num dissector calls: 592 (118.40 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/stun_signal.pcapng.out b/tests/cfgs/default/result/stun_signal.pcapng.out index cf975fc4d3f..b62c5fbaf0b 100644 --- a/tests/cfgs/default/result/stun_signal.pcapng.out +++ b/tests/cfgs/default/result/stun_signal.pcapng.out @@ -4,7 +4,7 @@ DPI Packets (UDP): 92 (4.38 pkts/flow) DPI Packets (other): 2 (1.00 pkts/flow) Confidence DPI (partial) : 1 (flows) Confidence DPI : 22 (flows) -Num dissector calls: 2313 (100.57 diss/flow) +Num dissector calls: 2328 (101.22 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/synscan.pcap.out b/tests/cfgs/default/result/synscan.pcap.out index 180b871263e..509e0fe7d9e 100644 --- a/tests/cfgs/default/result/synscan.pcap.out +++ b/tests/cfgs/default/result/synscan.pcap.out @@ -124,7 +124,7 @@ iSCSI 2 116 2 44 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] 45 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] 46 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] - 47 TCP 172.16.0.8:36050 -> 64.13.134.52:3260 [proto: 345/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] + 47 TCP 172.16.0.8:36050 -> 64.13.134.52:3260 [proto: 346/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: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] 49 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] 50 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] @@ -188,7 +188,7 @@ iSCSI 2 116 2 108 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] 109 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] 110 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] - 111 TCP 172.16.0.8:36051 -> 64.13.134.52:3260 [proto: 345/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] + 111 TCP 172.16.0.8:36051 -> 64.13.134.52:3260 [proto: 346/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] 112 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] 113 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] 114 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 6de67855176..36454247585 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 : 1 (flows) Confidence DPI (partial) : 5 (flows) Confidence DPI : 76 (flows) -Num dissector calls: 495 (5.96 diss/flow) +Num dissector calls: 497 (5.99 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 7ed97acae4c..c3082455cb2 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: 199 (99.50 diss/flow) +Num dissector calls: 200 (100.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 84a211f7cc9..8b8ac7925a6 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: 153 (76.50 diss/flow) +Num dissector calls: 154 (77.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/telegram.pcap.out b/tests/cfgs/default/result/telegram.pcap.out index 4e7d20706e0..865cfbf7121 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: 1486 (30.96 diss/flow) +Num dissector calls: 1488 (31.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/telnet.pcap.out b/tests/cfgs/default/result/telnet.pcap.out index 6cee5052ad8..bfe228a1247 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: 145 (145.00 diss/flow) +Num dissector calls: 146 (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/tftp.pcap.out b/tests/cfgs/default/result/tftp.pcap.out index 976b9b3216a..10a4de98044 100644 --- a/tests/cfgs/default/result/tftp.pcap.out +++ b/tests/cfgs/default/result/tftp.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (UDP): 13 (1.86 pkts/flow) Confidence DPI : 7 (flows) -Num dissector calls: 313 (44.71 diss/flow) +Num dissector calls: 315 (45.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/threema.pcap.out b/tests/cfgs/default/result/threema.pcap.out index 41dedeffb6a..db65aecf23b 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: 1188 (198.00 diss/flow) +Num dissector calls: 1194 (199.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/thrift.pcap.out b/tests/cfgs/default/result/thrift.pcap.out new file mode 100644 index 00000000000..fb94fe34379 --- /dev/null +++ b/tests/cfgs/default/result/thrift.pcap.out @@ -0,0 +1,27 @@ +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: 230 (115.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: 4/0 (search/found) +Patricia risk: 2/0 (search/found) +Patricia protocols: 4/0 (search/found) + +Thrift 172 104345 2 + + 1 TCP 169.254.59.247:53387 <-> 169.254.46.4:11010 [proto: 345/Thrift][IP: 0/Unknown][ClearText][Confidence: DPI][DPI packets: 4][cat: RPC/16][66 pkts/18026 bytes <-> 104 pkts/77061 bytes][Goodput ratio: 80/93][0.01 sec][bytes ratio: -0.621 (Download)][IAT c2s/s2c min/avg/max/stddev: 0/0 0/0 0/0 0/0][Pkt Len c2s/s2c min/avg/max/stddev: 54/60 273/741 6929/1514 1017/585][PLAIN TEXT (devicedriver)][Plen Bins: 0,18,3,2,0,0,1,0,1,0,0,0,0,0,0,0,0,2,31,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,34,0,3] + 2 UDP 127.0.0.1:49164 -> 127.0.0.1:6831 [proto: 345/Thrift][IP: 0/Unknown][ClearText][Confidence: DPI][DPI packets: 1][cat: RPC/16][2 pkts/9258 bytes -> 0 pkts/0 bytes][Goodput ratio: 99/0][11.73 sec][Risk: ** Unidirectional Traffic **][Risk Score: 10][Risk Info: No server to client traffic][PLAIN TEXT (emitBatch)][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,100] diff --git a/tests/cfgs/default/result/tinc.pcap.out b/tests/cfgs/default/result/tinc.pcap.out index b200570bbd0..ba9ecef98e9 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: 498 (124.50 diss/flow) +Num dissector calls: 500 (125.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/tls-appdata.pcap.out b/tests/cfgs/default/result/tls-appdata.pcap.out index d4bbe35588b..f0e65a62a53 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: 119 (59.50 diss/flow) +Num dissector calls: 120 (60.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/tls_certificate_too_long.pcap.out b/tests/cfgs/default/result/tls_certificate_too_long.pcap.out index b0705cffd90..07f5ba21d3d 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: 560 (16.00 diss/flow) +Num dissector calls: 565 (16.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/tls_false_positives.pcapng.out b/tests/cfgs/default/result/tls_false_positives.pcapng.out index 60540a27fa0..a37a7334b2f 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: 246 (246.00 diss/flow) +Num dissector calls: 247 (247.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 a83b7c8d07b..6125ac9b208 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: 119 (39.67 diss/flow) +Num dissector calls: 120 (40.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_missing_ch_frag.pcap.out b/tests/cfgs/default/result/tls_missing_ch_frag.pcap.out index d23adfc6cf2..b572519d462 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: 118 (118.00 diss/flow) +Num dissector calls: 119 (119.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 ffd050c98ab..5e3400c2c81 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: 461 (21.95 diss/flow) +Num dissector calls: 465 (22.14 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/trickbot.pcap.out b/tests/cfgs/default/result/trickbot.pcap.out index 65da35a33aa..b74a474a82a 100644 --- a/tests/cfgs/default/result/trickbot.pcap.out +++ b/tests/cfgs/default/result/trickbot.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: 12 (12.00 diss/flow) +Num dissector calls: 13 (13.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/viber.pcap.out b/tests/cfgs/default/result/viber.pcap.out index 434f5443f30..2546d71fd41 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: 437 (15.07 diss/flow) +Num dissector calls: 439 (15.14 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 d1c93ea4c63..3d42b42b2ac 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: 246 (123.00 diss/flow) +Num dissector calls: 248 (124.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 b2b82e78dc5..6fd1bb0066e 100644 --- a/tests/cfgs/default/result/wa_video.pcap.out +++ b/tests/cfgs/default/result/wa_video.pcap.out @@ -4,7 +4,7 @@ DPI Packets (TCP): 22 (22.00 pkts/flow) DPI Packets (UDP): 13 (1.00 pkts/flow) Confidence DPI : 13 (flows) Confidence Match by IP : 1 (flows) -Num dissector calls: 392 (28.00 diss/flow) +Num dissector calls: 393 (28.07 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 2f43a1e93c0..fb9c3114a69 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: 338 (10.24 diss/flow) +Num dissector calls: 347 (10.52 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 76bf024c789..3a8ab4268fb 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: 269 (4.72 diss/flow) +Num dissector calls: 272 (4.77 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 28340d3dde1..3343fddf6df 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: 310 (3.01 diss/flow) +Num dissector calls: 311 (3.02 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 918d7630f65..afc0d42499a 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: 518 (11.77 diss/flow) +Num dissector calls: 530 (12.05 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 d0bbabdfa35..3a30073da77 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: 11868 (138.00 diss/flow) +Num dissector calls: 11954 (139.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 8e77693162b..1818c030f18 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: 278 (30.89 diss/flow) +Num dissector calls: 279 (31.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/whois.pcapng.out b/tests/cfgs/default/result/whois.pcapng.out index 62ff105ff72..5f69e1a2af4 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: 176 (58.67 diss/flow) +Num dissector calls: 177 (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/windowsupdate_over_http.pcap.out b/tests/cfgs/default/result/windowsupdate_over_http.pcap.out index ebfff06bce8..382db4ed02e 100644 --- a/tests/cfgs/default/result/windowsupdate_over_http.pcap.out +++ b/tests/cfgs/default/result/windowsupdate_over_http.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: 12 (12.00 diss/flow) +Num dissector calls: 13 (13.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/wireguard.pcap.out b/tests/cfgs/default/result/wireguard.pcap.out index b47f850717c..acf6a3e2816 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: 261 (130.50 diss/flow) +Num dissector calls: 263 (131.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/wow.pcap.out b/tests/cfgs/default/result/wow.pcap.out index 7af2c7abe53..6a7c337505d 100644 --- a/tests/cfgs/default/result/wow.pcap.out +++ b/tests/cfgs/default/result/wow.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (TCP): 36 (7.20 pkts/flow) Confidence DPI : 5 (flows) -Num dissector calls: 109 (21.80 diss/flow) +Num dissector calls: 111 (22.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/xiaomi.pcap.out b/tests/cfgs/default/result/xiaomi.pcap.out index b39dd240fa0..2e228b9c0cb 100644 --- a/tests/cfgs/default/result/xiaomi.pcap.out +++ b/tests/cfgs/default/result/xiaomi.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 1 DPI Packets (TCP): 19 (2.71 pkts/flow) Confidence DPI : 7 (flows) -Num dissector calls: 636 (90.86 diss/flow) +Num dissector calls: 637 (91.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/xss.pcap.out b/tests/cfgs/default/result/xss.pcap.out index 5d72c2a040e..d6e61ab85a6 100644 --- a/tests/cfgs/default/result/xss.pcap.out +++ b/tests/cfgs/default/result/xss.pcap.out @@ -3,7 +3,7 @@ Guessed flow protos: 1 DPI Packets (TCP): 9 (4.50 pkts/flow) Confidence Match by port : 1 (flows) Confidence DPI : 1 (flows) -Num dissector calls: 12 (6.00 diss/flow) +Num dissector calls: 13 (6.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/z3950.pcapng.out b/tests/cfgs/default/result/z3950.pcapng.out index 892a1972ca1..971dce323fa 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: 434 (217.00 diss/flow) +Num dissector calls: 436 (218.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/zattoo.pcap.out b/tests/cfgs/default/result/zattoo.pcap.out index 7cb65dc5ba4..a002a4966c5 100644 --- a/tests/cfgs/default/result/zattoo.pcap.out +++ b/tests/cfgs/default/result/zattoo.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: 12 (6.00 diss/flow) +Num dissector calls: 13 (6.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/zoom.pcap.out b/tests/cfgs/default/result/zoom.pcap.out index 62788fab5ce..1fb8373d836 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: 652 (19.76 diss/flow) +Num dissector calls: 654 (19.82 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 1a464752270..b8f891598ca 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: 488 (97.60 diss/flow) +Num dissector calls: 491 (98.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 664406a81c8..4091c3f96b6 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: 796 (66.33 diss/flow) +Num dissector calls: 800 (66.67 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 a5b94d062bb..a4480d1d4a4 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: 489 (81.50 diss/flow) +Num dissector calls: 493 (82.17 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 2854544befc..0f629188520 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: 126 (126.00 diss/flow) +Num dissector calls: 127 (127.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 a1a4c658b03..afe65c5c34c 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: 186 (186.00 diss/flow) +Num dissector calls: 187 (187.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 77efd2c0c00..63728513925 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: 348 (116.00 diss/flow) +Num dissector calls: 351 (117.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/disable_stun_monitoring/result/lru_ipv6_caches.pcapng.out b/tests/cfgs/disable_stun_monitoring/result/lru_ipv6_caches.pcapng.out index 73a5fccb849..065604b6997 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): 35 (3.89 pkts/flow) Confidence DPI (cache) : 6 (flows) Confidence DPI : 6 (flows) -Num dissector calls: 761 (63.42 diss/flow) +Num dissector calls: 764 (63.67 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 18ef085dce8..35950fe0004 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: 4431 (22.49 diss/flow) +Num dissector calls: 4534 (23.02 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 ab1a88bd1ef..9206146c2a4 100644 --- a/windows/nDPI.vcxproj +++ b/windows/nDPI.vcxproj @@ -303,6 +303,7 @@ +