From bbbd117fe5c15edf9ca2b60202abca2803a32e1d Mon Sep 17 00:00:00 2001
From: Ivan Nardi <12729895+IvanNardi@users.noreply.github.com>
Date: Tue, 14 Apr 2026 13:02:21 +0000
Subject: [PATCH] icecast: remove dissector; detection only over HTTP (#3155)

It seems nowadays icecast uses only TLS or HTTP.
Example of a pcap with the old protocol:
https://thecodeartist.blogspot.com/2013/02/shoutcast-internet-radio-protocol.html

See also: https://cast.readme.io/docs/icecast
---
 src/include/ndpi_private.h                    |   1 -
 src/include/ndpi_typedefs.h                   |   3 -
 src/lib/ndpi_main.c                           |   5 +-
 src/lib/protocols/http.c                      |   7 ++
 src/lib/protocols/icecast.c                   |  97 ------------------
 tests/cfgs/caches_cfg/result/ookla.pcap.out   |   2 +-
 tests/cfgs/caches_cfg/result/teams.pcap.out   |   2 +-
 .../caches_global/result/bittorrent.pcap.out  |   2 +-
 .../cfgs/caches_global/result/ookla.pcap.out  |   2 +-
 .../cfgs/caches_global/result/teams.pcap.out  |   2 +-
 .../result/bittorrent.pcap.out                |   2 +-
 .../result/bittorrent_tcp_miss.pcapng.out     |   2 +-
 .../classification_only/result/ookla.pcap.out |   2 +-
 .../classification_only/result/teams.pcap.out |   2 +-
 .../classification_only/result/waze.pcap.out  |   2 +-
 tests/cfgs/default/pcap/icecast.pcapng        | Bin 0 -> 31392 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 +-
 .../default/result/KakaoTalk_chat.pcap.out    |   2 +-
 .../default/result/KakaoTalk_talk.pcap.out    |   2 +-
 tests/cfgs/default/result/Oscar.pcap.out      |   2 +-
 .../cfgs/default/result/alexa-app.pcapng.out  |   2 +-
 tests/cfgs/default/result/alicloud.pcap.out   |   2 +-
 tests/cfgs/default/result/amqp.pcap.out       |   2 +-
 .../default/result/anyconnect-vpn.pcap.out    |   2 +-
 tests/cfgs/default/result/apple_push.pcap.out |   2 +-
 tests/cfgs/default/result/atg.pcap.out        |   2 +-
 tests/cfgs/default/result/avast.pcap.out      |   2 +-
 tests/cfgs/default/result/bfcp.pcapng.out     |   2 +-
 tests/cfgs/default/result/bittorrent.pcap.out |   2 +-
 .../result/bittorrent_tcp_miss.pcapng.out     |   2 +-
 tests/cfgs/default/result/blizzard.pcap.out   |   2 +-
 tests/cfgs/default/result/cassandra.pcap.out  |   2 +-
 .../default/result/cloudflare-warp.pcap.out   |   2 +-
 tests/cfgs/default/result/coap_mqtt.pcap.out  |   2 +-
 tests/cfgs/default/result/codm.pcap.out       |   2 +-
 tests/cfgs/default/result/corba.pcap.out      |   2 +-
 .../cfgs/default/result/crossfire.pcapng.out  |   2 +-
 .../result/custom_categories.pcapng.out       |   2 +-
 tests/cfgs/default/result/dingtalk.pcap.out   |   2 +-
 tests/cfgs/default/result/dlms.pcap.out       |   2 +-
 tests/cfgs/default/result/dofus.pcap.out      |   2 +-
 tests/cfgs/default/result/drda_db2.pcap.out   |   2 +-
 .../default/result/elasticsearch.pcap.out     |   2 +-
 tests/cfgs/default/result/elf.pcap.out        |   2 +-
 tests/cfgs/default/result/emotet.pcap.out     |   2 +-
 .../default/result/false_positives.pcapng.out |   2 +-
 .../result/false_positives2.pcapng.out        |   2 +-
 tests/cfgs/default/result/fastcgi.pcap.out    |   2 +-
 tests/cfgs/default/result/fix.pcap.out        |   2 +-
 tests/cfgs/default/result/fix2.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 +-
 .../default/result/fuzz-2021-10-13.pcap.out   |   2 +-
 .../result/gaijin_mobile_mixed.pcap.out       |   2 +-
 .../default/result/genshin-impact.pcap.out    |   2 +-
 tests/cfgs/default/result/google_ssl.pcap.out |   2 +-
 tests/cfgs/default/result/h323.pcap.out       |   2 +-
 tests/cfgs/default/result/haproxy.pcap.out    |   2 +-
 tests/cfgs/default/result/hl7.pcap.out        |   2 +-
 tests/cfgs/default/result/hpvirtgrp.pcap.out  |   2 +-
 tests/cfgs/default/result/http2.pcapng.out    |   2 +-
 .../http_guessed_host_and_guessed.pcapng.out  |   2 +-
 tests/cfgs/default/result/icecast.pcapng.out  |  38 +++++++
 .../default/result/imap-starttls.pcap.out     |   2 +-
 tests/cfgs/default/result/imap.pcap.out       |   2 +-
 tests/cfgs/default/result/instagram.pcap.out  |   2 +-
 tests/cfgs/default/result/irc.pcap.out        |   2 +-
 .../default/result/iso9506-1-mms.pcap.out     |   2 +-
 tests/cfgs/default/result/ja4.pcapng.out      |   2 +-
 tests/cfgs/default/result/jabber.pcap.out     |   2 +-
 tests/cfgs/default/result/json.pcapng.out     |   2 +-
 tests/cfgs/default/result/jsonrpc.pcap.out    |   2 +-
 tests/cfgs/default/result/kafka.pcapng.out    |   2 +-
 tests/cfgs/default/result/kerberos.pcap.out   |   2 +-
 tests/cfgs/default/result/kismet.pcap.out     |   2 +-
 .../default/result/lisp_registration.pcap.out |   2 +-
 .../result/log4j-webapp-exploit.pcap.out      |   2 +-
 tests/cfgs/default/result/lustre.pcapng.out   |   2 +-
 tests/cfgs/default/result/melsec.pcapng.out   |   2 +-
 tests/cfgs/default/result/memcached.cap.out   |   2 +-
 tests/cfgs/default/result/monero.pcap.out     |   2 +-
 .../result/mongo_false_positive.pcapng.out    |   2 +-
 tests/cfgs/default/result/mongodb.pcap.out    |   2 +-
 tests/cfgs/default/result/msgpack.pcap.out    |   2 +-
 tests/cfgs/default/result/mssql_tds.pcap.out  |   2 +-
 tests/cfgs/default/result/naver.pcap.out      |   2 +-
 .../default/result/nest_log_sink.pcap.out     |   2 +-
 tests/cfgs/default/result/netbios.pcap.out    |   2 +-
 tests/cfgs/default/result/nexon.pcapng.out    |   2 +-
 tests/cfgs/default/result/nntp.pcap.out       |   2 +-
 tests/cfgs/default/result/nordvpn.pcap.out    |   2 +-
 tests/cfgs/default/result/ookla.pcap.out      |   2 +-
 tests/cfgs/default/result/openvpn.pcap.out    |   2 +-
 .../result/openvpn_nohmac_tcp.pcapng.out      |   2 +-
 .../result/openvpn_obfuscated.pcapng.out      |   2 +-
 .../ossfuzz_seed_fake_traces_1.pcapng.out     |   2 +-
 .../ossfuzz_seed_fake_traces_2.pcapng.out     |   2 +-
 tests/cfgs/default/result/paltalk.pcapng.out  |   2 +-
 .../default/result/path_of_exile.pcapng.out   |   2 +-
 tests/cfgs/default/result/pgsql.pcap.out      |   2 +-
 tests/cfgs/default/result/pgsql2.pcapng.out   |   2 +-
 tests/cfgs/default/result/plugin.pcapng.out   |   2 +-
 tests/cfgs/default/result/pop3.pcap.out       |   2 +-
 tests/cfgs/default/result/pop3_stls.pcap.out  |   2 +-
 .../result/portable_executable.pcap.out       |   2 +-
 tests/cfgs/default/result/pptp.pcap.out       |   2 +-
 tests/cfgs/default/result/protobuf.pcap.out   |   2 +-
 tests/cfgs/default/result/radmin3.pcapng.out  |   2 +-
 tests/cfgs/default/result/raft.pcap.out       |   2 +-
 tests/cfgs/default/result/rdp.pcap.out        |   2 +-
 tests/cfgs/default/result/rdp3.pcap.out       |   2 +-
 .../default/result/rdp_over_http.pcapng.out   |   2 +-
 .../result/reasm_crash_anon.pcapng.out        |   2 +-
 .../default/result/reasm_segv_anon.pcapng.out |   2 +-
 tests/cfgs/default/result/riot.pcapng.out     |   2 +-
 tests/cfgs/default/result/rsh.pcap.out        |   2 +-
 tests/cfgs/default/result/rtmp.pcap.out       |   2 +-
 tests/cfgs/default/result/rtp.pcapng.out      |   2 +-
 .../cfgs/default/result/s7comm-plus.pcap.out  |   2 +-
 tests/cfgs/default/result/s7comm.pcap.out     |   2 +-
 tests/cfgs/default/result/sbe.pcap.out        |   2 +-
 .../cfgs/default/result/shadowsocks.pcap.out  |   2 +-
 tests/cfgs/default/result/shell.pcap.out      |   2 +-
 tests/cfgs/default/result/sites.pcapng.out    |   2 +-
 tests/cfgs/default/result/sites3.pcapng.out   |   2 +-
 tests/cfgs/default/result/smb_frags.pcap.out  |   2 +-
 tests/cfgs/default/result/smbv1.pcap.out      |   2 +-
 .../default/result/smpp_in_general.pcap.out   |   2 +-
 .../default/result/smtp-starttls.pcap.out     |   2 +-
 tests/cfgs/default/result/smtp.pcap.out       |   2 +-
 tests/cfgs/default/result/soap.pcap.out       |   2 +-
 tests/cfgs/default/result/socks.pcap.out      |   2 +-
 .../cfgs/default/result/spotify_tcp.pcap.out  |   2 +-
 tests/cfgs/default/result/ssh.pcap.out        |   2 +-
 .../result/ssh_unidirectional.pcap.out        |   2 +-
 .../default/result/starcraft_battle.pcap.out  |   2 +-
 tests/cfgs/default/result/syslog.pcap.out     |   2 +-
 tests/cfgs/default/result/teams.pcap.out      |   2 +-
 .../result/telegram_videocall.pcapng.out      |   2 +-
 .../default/result/tencent_games.pcap.out     |   2 +-
 tests/cfgs/default/result/teso.pcapng.out     |   2 +-
 tests/cfgs/default/result/threema.pcap.out    |   2 +-
 tests/cfgs/default/result/thrift.pcap.out     |   2 +-
 tests/cfgs/default/result/tinc.pcap.out       |   2 +-
 .../cfgs/default/result/tls-appdata.pcap.out  |   2 +-
 .../result/tls_certificate_too_long.pcap.out  |   2 +-
 .../result/tls_false_positives.pcapng.out     |   2 +-
 .../tls_heur__shadowsocks-tcp.pcapng.out      |   2 +-
 .../tls_heur__trojan-tcp-tls.pcapng.out       |   2 +-
 .../result/tls_heur__vmess-tcp-tls.pcapng.out |   2 +-
 .../result/tls_heur__vmess-tcp.pcapng.out     |   2 +-
 .../tls_heur__vmess-websocket.pcapng.out      |   2 +-
 .../default/result/tls_invalid_reads.pcap.out |   2 +-
 .../result/tls_missing_ch_frag.pcap.out       |   2 +-
 .../result/tls_unidirectional.pcap.out        |   2 +-
 .../result/tls_with_huge_ch.pcapng.out        |   2 +-
 tests/cfgs/default/result/ultrasurf.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/wa_voice.pcap.out   |   2 +-
 tests/cfgs/default/result/waze.pcap.out       |   2 +-
 tests/cfgs/default/result/websocket.pcap.out  |   2 +-
 tests/cfgs/default/result/wechat.pcap.out     |   2 +-
 tests/cfgs/default/result/whatsapp.pcap.out   |   2 +-
 .../result/whatsapp_login_call.pcap.out       |   2 +-
 .../result/whatsapp_login_chat.pcap.out       |   2 +-
 .../whatsapp_voice_and_message.pcap.out       |   2 +-
 tests/cfgs/default/result/whois.pcapng.out    |   2 +-
 tests/cfgs/default/result/xiaomi.pcap.out     |   2 +-
 tests/cfgs/default/result/z3950.pcapng.out    |   2 +-
 tests/cfgs/default/result/zeromq.pcapng.out   |   2 +-
 tests/cfgs/default/result/zoom.pcap.out       |   2 +-
 .../result/ookla.pcap.out                     |   2 +-
 .../disable_protocols/result/soap.pcap.out    |   2 +-
 .../enable_payload_stat/result/1kxun.pcap.out |   2 +-
 tests/cfgs/fpc/result/1kxun.pcap.out          |   2 +-
 tests/cfgs/fpc_disabled/result/teams.pcap.out |   2 +-
 .../result/1kxun.pcap.out                     |   2 +-
 .../ip_lists_disable/result/1kxun.pcap.out    |   2 +-
 tests/cfgs/monitoring/result/s7comm.pcap.out  |   2 +-
 tests/cfgs/monitoring/result/teams.pcap.out   |   2 +-
 .../result/telegram_videocall.pcapng.out      |   2 +-
 .../result/openvpn_obfuscated.pcapng.out      |   2 +-
 .../result/shadowsocks.pcap.out               |   2 +-
 .../result/openvpn_obfuscated.pcapng.out      |   2 +-
 tests/cfgs/plugins/result/plugin.pcapng.out   |   2 +-
 .../result/telegram_videocall.pcapng.out      |   2 +-
 tests/cfgs/tls_analysis/result/ookla.pcap.out |   2 +-
 .../tls_analysis/result/tls-appdata.pcap.out  |   2 +-
 .../tls_heur__trojan-tcp-tls.pcapng.out       |   2 +-
 .../result/tls_heur__vmess-tcp-tls.pcapng.out |   2 +-
 .../tls_heur__shadowsocks-tcp.pcapng.out      |   2 +-
 .../tls_heur__trojan-tcp-tls.pcapng.out       |   2 +-
 .../result/tls_heur__vmess-tcp-tls.pcapng.out |   2 +-
 .../result/tls_heur__vmess-tcp.pcapng.out     |   2 +-
 .../tls_heur__vmess-websocket.pcapng.out      |   2 +-
 .../result/zoom.pcap.out                      |   2 +-
 windows/nDPI.vcxproj                          |   1 -
 windows/nDPI.vcxproj.filters                  |   1 -
 205 files changed, 242 insertions(+), 303 deletions(-)
 delete mode 100644 src/lib/protocols/icecast.c
 create mode 100644 tests/cfgs/default/pcap/icecast.pcapng
 create mode 100644 tests/cfgs/default/result/icecast.pcapng.out

diff --git a/src/include/ndpi_private.h b/src/include/ndpi_private.h
index 3a9434146..a3fdf0821 100644
--- a/src/include/ndpi_private.h
+++ b/src/include/ndpi_private.h
@@ -859,7 +859,6 @@ void init_h323_dissector(struct ndpi_detection_module_struct *ndpi_struct);
 void init_hots_dissector(struct ndpi_detection_module_struct *ndpi_struct);
 void init_http_dissector(struct ndpi_detection_module_struct *ndpi_struct);
 void init_iax_dissector(struct ndpi_detection_module_struct *ndpi_struct);
-void init_icecast_dissector(struct ndpi_detection_module_struct *ndpi_struct);
 void init_ipp_dissector(struct ndpi_detection_module_struct *ndpi_struct);
 void init_irc_dissector(struct ndpi_detection_module_struct *ndpi_struct);
 void init_jabber_dissector(struct ndpi_detection_module_struct *ndpi_struct);
diff --git a/src/include/ndpi_typedefs.h b/src/include/ndpi_typedefs.h
index 30e3a029c..23fef33a1 100644
--- a/src/include/ndpi_typedefs.h
+++ b/src/include/ndpi_typedefs.h
@@ -959,9 +959,6 @@ struct ndpi_flow_tcp_struct {
   /* NDPI_PROTOCOL_POSTGRES */
   u_int64_t postgres_stage:3;
 
-  /* NDPI_PROTOCOL_ICECAST */
-  u_int64_t icecast_stage:1;
-
   /* NDPI_PROTOCOL_MAIL_POP */
   u_int64_t mail_pop_stage:2;
 
diff --git a/src/lib/ndpi_main.c b/src/lib/ndpi_main.c
index fe3479910..d2819feae 100644
--- a/src/lib/ndpi_main.c
+++ b/src/lib/ndpi_main.c
@@ -1499,7 +1499,7 @@ static void init_protocol_defaults(struct ndpi_detection_module_struct *ndpi_str
 			  ndpi_build_default_ports(ports_a, 554, 0, 0, 0, 0) /* TCP */,
 			  ndpi_build_default_ports(ports_b, 554, 0, 0, 0, 0) /* UDP */,
 			  0);
-  ndpi_set_proto_defaults(ndpi_str, 1 /* cleartext */, 0 /* nw proto */, NDPI_PROTOCOL_FUN, NDPI_PROTOCOL_ICECAST,
+  ndpi_set_proto_defaults(ndpi_str, 1 /* cleartext */, 1 /* app proto */, NDPI_PROTOCOL_FUN, NDPI_PROTOCOL_ICECAST,
 			  "IceCast", NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_QOE_CATEGORY_UNSPECIFIED,
 			  ndpi_build_default_ports(ports_a, 0, 0, 0, 0, 0) /* TCP */,
 			  ndpi_build_default_ports(ports_b, 0, 0, 0, 0, 0) /* UDP */,
@@ -6928,9 +6928,6 @@ static int dissectors_init(struct ndpi_detection_module_struct *ndpi_str) {
   /* SNMP */
   init_snmp_dissector(ndpi_str);
 
-  /* ICECAST */
-  init_icecast_dissector(ndpi_str);
-
   /* KERBEROS */
   init_kerberos_dissector(ndpi_str);
 
diff --git a/src/lib/protocols/http.c b/src/lib/protocols/http.c
index ce805a6d8..5c3609338 100644
--- a/src/lib/protocols/http.c
+++ b/src/lib/protocols/http.c
@@ -531,6 +531,13 @@ static void ndpi_http_parse_subprotocol(struct ndpi_detection_module_struct *ndp
     update_category_and_breed(ndpi_struct, flow);
   }
 
+  if(packet->server_line.len > 7 &&
+     strncmp((const char *)packet->server_line.ptr, "Icecast", 7) == 0) {
+    ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_ICECAST, master_protocol, NDPI_CONFIDENCE_DPI);
+    update_category_and_breed(ndpi_struct, flow);
+    ndpi_unset_risk(ndpi_struct, flow, NDPI_KNOWN_PROTOCOL_ON_NON_STANDARD_PORT);
+  }
+
   /* Matching on Content-Type.
       OCSP:  application/ocsp-request, application/ocsp-response
   */
diff --git a/src/lib/protocols/icecast.c b/src/lib/protocols/icecast.c
deleted file mode 100644
index 4c5ed78bb..000000000
--- a/src/lib/protocols/icecast.c
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * icecast.c
- *
- * Copyright (C) 2009-11 - ipoque GmbH
- * Copyright (C) 2011-26 - 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 <http://www.gnu.org/licenses/>.
- *
- */
-
-#include "ndpi_protocol_ids.h"
-
-#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_ICECAST
-
-#include "ndpi_api.h"
-#include "ndpi_private.h"
-
-static void ndpi_int_icecast_add_connection(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow)
-{
-  ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_ICECAST, NDPI_PROTOCOL_UNKNOWN, NDPI_CONFIDENCE_DPI);
-}
-
-static void ndpi_search_icecast_tcp(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow)
-{
-  struct ndpi_packet_struct *packet = &ndpi_struct->packet;
-  u_int16_t i;
-
-  NDPI_LOG_DBG(ndpi_struct, "search icecast\n");
-
-  if((packet->payload_packet_len < 500 &&
-       packet->payload_packet_len >= 7 && memcmp(packet->payload, "SOURCE ", 7) == 0)
-      || flow->l4.tcp.icecast_stage) {
-    ndpi_parse_packet_line_info_any(ndpi_struct);
-    NDPI_LOG_DBG2(ndpi_struct, "Icecast lines=%d\n", packet->parsed_lines);
-    for (i = 0; i < packet->parsed_lines; i++) {
-      if(packet->line[i].ptr != NULL && packet->line[i].len > 4
-	  && memcmp(packet->line[i].ptr, "ice-", 4) == 0) {
-	NDPI_LOG_INFO(ndpi_struct, "found Icecast\n");
-	ndpi_int_icecast_add_connection(ndpi_struct, flow);
-	return;
-      }
-    }
-
-    if(packet->parsed_lines < 1 && !flow->l4.tcp.icecast_stage) {
-      flow->l4.tcp.icecast_stage = 1;
-      return;
-    }
-  }
-
-  if(current_pkt_from_client_to_server(ndpi_struct, flow)
-      && (flow->packet_counter < 10)) {
-    return;
-  }
-
-  if(current_pkt_from_server_to_client(ndpi_struct, flow)) {
-    /* server answer, now test Server for Icecast */
-
-    ndpi_parse_packet_line_info(ndpi_struct, flow);
-
-    if((packet->server_line.ptr != NULL)
-       && (packet->server_line.len > NDPI_STATICSTRING_LEN("Icecast"))
-       &&  memcmp(packet->server_line.ptr, "Icecast",
-		  NDPI_STATICSTRING_LEN("Icecast")) == 0) {
-      /* TODO maybe store the previous protocol type as subtype?
-       *      e.g. ogg or mpeg
-       */
-      NDPI_LOG_INFO(ndpi_struct, "found Icecast\n");
-      ndpi_int_icecast_add_connection(ndpi_struct, flow);
-      return;
-    }
-  }
-
-  NDPI_EXCLUDE_DISSECTOR(ndpi_struct, flow);
-}
-
-
-void init_icecast_dissector(struct ndpi_detection_module_struct *ndpi_struct)
-{
-  ndpi_register_dissector("IceCast", ndpi_struct,
-                     ndpi_search_icecast_tcp,
-                     NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION,
-                     1, NDPI_PROTOCOL_ICECAST);
-}
diff --git a/tests/cfgs/caches_cfg/result/ookla.pcap.out b/tests/cfgs/caches_cfg/result/ookla.pcap.out
index dd6e2d11f..3140e8bf0 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: 579 (96.50 diss/flow)
+Num dissector calls: 573 (95.50 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/3/0 (insert/search/found)
 LRU cache stun:       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 70ac3a965..911f13e18 100644
--- a/tests/cfgs/caches_cfg/result/teams.pcap.out
+++ b/tests/cfgs/caches_cfg/result/teams.pcap.out
@@ -6,7 +6,7 @@ DPI Packets (other):	1	(1.00 pkts/flow)
 Confidence Unknown          : 1 (flows)
 Confidence Match by port    : 2 (flows)
 Confidence DPI              : 80 (flows)
-Num dissector calls: 526 (6.34 diss/flow)
+Num dissector calls: 524 (6.31 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/9/0 (insert/search/found)
 LRU cache stun:       30/0/0 (insert/search/found)
diff --git a/tests/cfgs/caches_global/result/bittorrent.pcap.out b/tests/cfgs/caches_global/result/bittorrent.pcap.out
index 207e3203c..321ef1564 100644
--- a/tests/cfgs/caches_global/result/bittorrent.pcap.out
+++ b/tests/cfgs/caches_global/result/bittorrent.pcap.out
@@ -1,6 +1,6 @@
 DPI Packets (TCP):	24	(1.00 pkts/flow)
 Confidence DPI              : 24 (flows)
-Num dissector calls: 1674 (69.75 diss/flow)
+Num dissector calls: 1652 (68.83 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 120/0/0 (insert/search/found)
 LRU cache stun:       0/0/0 (insert/search/found)
diff --git a/tests/cfgs/caches_global/result/ookla.pcap.out b/tests/cfgs/caches_global/result/ookla.pcap.out
index 1df8c8806..bac29e29f 100644
--- a/tests/cfgs/caches_global/result/ookla.pcap.out
+++ b/tests/cfgs/caches_global/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: 579 (96.50 diss/flow)
+Num dissector calls: 573 (95.50 diss/flow)
 LRU cache ookla:      4/2/2 (insert/search/found)
 LRU cache bittorrent: 0/3/0 (insert/search/found)
 LRU cache stun:       0/0/0 (insert/search/found)
diff --git a/tests/cfgs/caches_global/result/teams.pcap.out b/tests/cfgs/caches_global/result/teams.pcap.out
index e37ec5b62..f0d00c9a4 100644
--- a/tests/cfgs/caches_global/result/teams.pcap.out
+++ b/tests/cfgs/caches_global/result/teams.pcap.out
@@ -7,7 +7,7 @@ Confidence Unknown          : 1 (flows)
 Confidence Match by port    : 2 (flows)
 Confidence DPI (partial)    : 4 (flows)
 Confidence DPI              : 76 (flows)
-Num dissector calls: 526 (6.34 diss/flow)
+Num dissector calls: 524 (6.31 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/9/0 (insert/search/found)
 LRU cache stun:       30/0/0 (insert/search/found)
diff --git a/tests/cfgs/classification_only/result/bittorrent.pcap.out b/tests/cfgs/classification_only/result/bittorrent.pcap.out
index 660e476c3..249c16073 100644
--- a/tests/cfgs/classification_only/result/bittorrent.pcap.out
+++ b/tests/cfgs/classification_only/result/bittorrent.pcap.out
@@ -1,6 +1,6 @@
 DPI Packets (TCP):	24	(1.00 pkts/flow)
 Confidence DPI              : 24 (flows)
-Num dissector calls: 1674 (69.75 diss/flow)
+Num dissector calls: 1652 (68.83 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 120/0/0 (insert/search/found)
 LRU cache stun:       0/0/0 (insert/search/found)
diff --git a/tests/cfgs/classification_only/result/bittorrent_tcp_miss.pcapng.out b/tests/cfgs/classification_only/result/bittorrent_tcp_miss.pcapng.out
index 3b64bbff2..7a198dc11 100644
--- a/tests/cfgs/classification_only/result/bittorrent_tcp_miss.pcapng.out
+++ b/tests/cfgs/classification_only/result/bittorrent_tcp_miss.pcapng.out
@@ -1,6 +1,6 @@
 DPI Packets (TCP):	10	(10.00 pkts/flow)
 Confidence DPI              : 1 (flows)
-Num dissector calls: 229 (229.00 diss/flow)
+Num dissector calls: 227 (227.00 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 5/0/0 (insert/search/found)
 LRU cache stun:       0/0/0 (insert/search/found)
diff --git a/tests/cfgs/classification_only/result/ookla.pcap.out b/tests/cfgs/classification_only/result/ookla.pcap.out
index 348982f0d..24b4b21d8 100644
--- a/tests/cfgs/classification_only/result/ookla.pcap.out
+++ b/tests/cfgs/classification_only/result/ookla.pcap.out
@@ -4,7 +4,7 @@ DPI Packets (TCP):	38	(6.33 pkts/flow)
 Confidence DPI (partial cache): 1 (flows)
 Confidence DPI              : 4 (flows)
 Confidence DPI (aggressive) : 1 (flows)
-Num dissector calls: 579 (96.50 diss/flow)
+Num dissector calls: 573 (95.50 diss/flow)
 LRU cache ookla:      4/2/2 (insert/search/found)
 LRU cache bittorrent: 0/3/0 (insert/search/found)
 LRU cache stun:       0/0/0 (insert/search/found)
diff --git a/tests/cfgs/classification_only/result/teams.pcap.out b/tests/cfgs/classification_only/result/teams.pcap.out
index 209b6c109..a5b5262ba 100644
--- a/tests/cfgs/classification_only/result/teams.pcap.out
+++ b/tests/cfgs/classification_only/result/teams.pcap.out
@@ -7,7 +7,7 @@ Confidence Unknown          : 1 (flows)
 Confidence Match by port    : 2 (flows)
 Confidence DPI (partial)    : 6 (flows)
 Confidence DPI              : 74 (flows)
-Num dissector calls: 526 (6.34 diss/flow)
+Num dissector calls: 524 (6.31 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/9/0 (insert/search/found)
 LRU cache stun:       24/0/0 (insert/search/found)
diff --git a/tests/cfgs/classification_only/result/waze.pcap.out b/tests/cfgs/classification_only/result/waze.pcap.out
index 4e977a10f..18234d3e9 100644
--- a/tests/cfgs/classification_only/result/waze.pcap.out
+++ b/tests/cfgs/classification_only/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: 356 (10.79 diss/flow)
+Num dissector calls: 354 (10.73 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/30/0 (insert/search/found)
 LRU cache stun:       0/0/0 (insert/search/found)
diff --git a/tests/cfgs/default/pcap/icecast.pcapng b/tests/cfgs/default/pcap/icecast.pcapng
new file mode 100644
index 0000000000000000000000000000000000000000..d149c2d52adba5562238c2b7f67e25358db26bbc
GIT binary patch
literal 31392
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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 06fdb681a..85771e666 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          : 9 (flows)
 Confidence Match by port    : 6 (flows)
 Confidence DPI              : 182 (flows)
-Num dissector calls: 4488 (22.78 diss/flow)
+Num dissector calls: 4484 (22.76 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/45/0 (insert/search/found)
 LRU cache stun:       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 b6eaf2ab4..9e8b204e9 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: 161 (161.00 diss/flow)
+Num dissector calls: 160 (160.00 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/3/0 (insert/search/found)
 LRU cache stun:       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 f328f1d5e..2db6284d6 100644
--- a/tests/cfgs/default/result/443-opvn.pcap.out
+++ b/tests/cfgs/default/result/443-opvn.pcap.out
@@ -1,6 +1,6 @@
 DPI Packets (TCP):	6	(6.00 pkts/flow)
 Confidence DPI              : 1 (flows)
-Num dissector calls: 162 (162.00 diss/flow)
+Num dissector calls: 161 (161.00 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/0/0 (insert/search/found)
 LRU cache stun:       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 a3af5ec1c..ceab4f5bc 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: 531 (13.97 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 stun:       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 9ce4425d6..5ee398084 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):	17	(3.40 pkts/flow)
 Confidence Match by port    : 8 (flows)
 Confidence DPI              : 11 (flows)
 Confidence Match by IP      : 1 (flows)
-Num dissector calls: 1227 (61.35 diss/flow)
+Num dissector calls: 1221 (61.05 diss/flow)
 LRU cache ookla:      0/2/0 (insert/search/found)
 LRU cache bittorrent: 0/27/0 (insert/search/found)
 LRU cache stun:       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 2921182e5..a17566e8f 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):	19	(19.00 pkts/flow)
 Confidence Match by port    : 1 (flows)
-Num dissector calls: 245 (245.00 diss/flow)
+Num dissector calls: 243 (243.00 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/3/0 (insert/search/found)
 LRU cache stun:       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 322091958..1181a8f1d 100644
--- a/tests/cfgs/default/result/alexa-app.pcapng.out
+++ b/tests/cfgs/default/result/alexa-app.pcapng.out
@@ -6,7 +6,7 @@ DPI Packets (other):	6	(1.00 pkts/flow)
 Confidence Match by port    : 14 (flows)
 Confidence DPI              : 144 (flows)
 Confidence Match by custom rule: 2 (flows)
-Num dissector calls: 537 (3.36 diss/flow)
+Num dissector calls: 536 (3.35 diss/flow)
 LRU cache ookla:      0/5/0 (insert/search/found)
 LRU cache bittorrent: 0/42/0 (insert/search/found)
 LRU cache stun:       0/0/0 (insert/search/found)
diff --git a/tests/cfgs/default/result/alicloud.pcap.out b/tests/cfgs/default/result/alicloud.pcap.out
index cfa630070..352320368 100644
--- a/tests/cfgs/default/result/alicloud.pcap.out
+++ b/tests/cfgs/default/result/alicloud.pcap.out
@@ -1,6 +1,6 @@
 DPI Packets (TCP):	60	(4.00 pkts/flow)
 Confidence DPI              : 15 (flows)
-Num dissector calls: 1530 (102.00 diss/flow)
+Num dissector calls: 1515 (101.00 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/0/0 (insert/search/found)
 LRU cache stun:       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 eca300c67..d2aa4448d 100644
--- a/tests/cfgs/default/result/amqp.pcap.out
+++ b/tests/cfgs/default/result/amqp.pcap.out
@@ -1,6 +1,6 @@
 DPI Packets (TCP):	9	(3.00 pkts/flow)
 Confidence DPI              : 3 (flows)
-Num dissector calls: 371 (123.67 diss/flow)
+Num dissector calls: 365 (121.67 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/0/0 (insert/search/found)
 LRU cache stun:       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 a6fb984d7..e1db5f3b1 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: 813 (11.78 diss/flow)
+Num dissector calls: 807 (11.70 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/24/0 (insert/search/found)
 LRU cache stun:       0/0/0 (insert/search/found)
diff --git a/tests/cfgs/default/result/apple_push.pcap.out b/tests/cfgs/default/result/apple_push.pcap.out
index 424b19640..6aee952a5 100644
--- a/tests/cfgs/default/result/apple_push.pcap.out
+++ b/tests/cfgs/default/result/apple_push.pcap.out
@@ -1,6 +1,6 @@
 DPI Packets (TCP):	8	(8.00 pkts/flow)
 Confidence DPI              : 1 (flows)
-Num dissector calls: 162 (162.00 diss/flow)
+Num dissector calls: 161 (161.00 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/0/0 (insert/search/found)
 LRU cache stun:       0/0/0 (insert/search/found)
diff --git a/tests/cfgs/default/result/atg.pcap.out b/tests/cfgs/default/result/atg.pcap.out
index 0ebae81c4..e365c3af7 100644
--- a/tests/cfgs/default/result/atg.pcap.out
+++ b/tests/cfgs/default/result/atg.pcap.out
@@ -1,6 +1,6 @@
 DPI Packets (TCP):	5	(2.50 pkts/flow)
 Confidence DPI              : 2 (flows)
-Num dissector calls: 302 (151.00 diss/flow)
+Num dissector calls: 300 (150.00 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/0/0 (insert/search/found)
 LRU cache stun:       0/0/0 (insert/search/found)
diff --git a/tests/cfgs/default/result/avast.pcap.out b/tests/cfgs/default/result/avast.pcap.out
index c3d1b78e5..fedbda50a 100644
--- a/tests/cfgs/default/result/avast.pcap.out
+++ b/tests/cfgs/default/result/avast.pcap.out
@@ -1,6 +1,6 @@
 DPI Packets (TCP):	40	(4.00 pkts/flow)
 Confidence DPI              : 10 (flows)
-Num dissector calls: 1030 (103.00 diss/flow)
+Num dissector calls: 1020 (102.00 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/0/0 (insert/search/found)
 LRU cache stun:       0/0/0 (insert/search/found)
diff --git a/tests/cfgs/default/result/bfcp.pcapng.out b/tests/cfgs/default/result/bfcp.pcapng.out
index 70d9832a3..cda1ef5d8 100644
--- a/tests/cfgs/default/result/bfcp.pcapng.out
+++ b/tests/cfgs/default/result/bfcp.pcapng.out
@@ -1,7 +1,7 @@
 DPI Packets (TCP):	4	(4.00 pkts/flow)
 DPI Packets (UDP):	2	(1.00 pkts/flow)
 Confidence DPI              : 3 (flows)
-Num dissector calls: 419 (139.67 diss/flow)
+Num dissector calls: 418 (139.33 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/0/0 (insert/search/found)
 LRU cache stun:       0/0/0 (insert/search/found)
diff --git a/tests/cfgs/default/result/bittorrent.pcap.out b/tests/cfgs/default/result/bittorrent.pcap.out
index 207e3203c..321ef1564 100644
--- a/tests/cfgs/default/result/bittorrent.pcap.out
+++ b/tests/cfgs/default/result/bittorrent.pcap.out
@@ -1,6 +1,6 @@
 DPI Packets (TCP):	24	(1.00 pkts/flow)
 Confidence DPI              : 24 (flows)
-Num dissector calls: 1674 (69.75 diss/flow)
+Num dissector calls: 1652 (68.83 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 120/0/0 (insert/search/found)
 LRU cache stun:       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 869d07631..50dff1b2f 100644
--- a/tests/cfgs/default/result/bittorrent_tcp_miss.pcapng.out
+++ b/tests/cfgs/default/result/bittorrent_tcp_miss.pcapng.out
@@ -1,6 +1,6 @@
 DPI Packets (TCP):	10	(10.00 pkts/flow)
 Confidence DPI              : 1 (flows)
-Num dissector calls: 229 (229.00 diss/flow)
+Num dissector calls: 227 (227.00 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 5/0/0 (insert/search/found)
 LRU cache stun:       0/0/0 (insert/search/found)
diff --git a/tests/cfgs/default/result/blizzard.pcap.out b/tests/cfgs/default/result/blizzard.pcap.out
index f6b795098..840205597 100644
--- a/tests/cfgs/default/result/blizzard.pcap.out
+++ b/tests/cfgs/default/result/blizzard.pcap.out
@@ -1,7 +1,7 @@
 DPI Packets (TCP):	22	(4.40 pkts/flow)
 DPI Packets (UDP):	4	(1.00 pkts/flow)
 Confidence DPI              : 9 (flows)
-Num dissector calls: 173 (19.22 diss/flow)
+Num dissector calls: 172 (19.11 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/0/0 (insert/search/found)
 LRU cache stun:       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 47f8f4921..76d55b95b 100644
--- a/tests/cfgs/default/result/cassandra.pcap.out
+++ b/tests/cfgs/default/result/cassandra.pcap.out
@@ -1,6 +1,6 @@
 DPI Packets (TCP):	16	(5.33 pkts/flow)
 Confidence DPI              : 3 (flows)
-Num dissector calls: 325 (108.33 diss/flow)
+Num dissector calls: 323 (107.67 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/0/0 (insert/search/found)
 LRU cache stun:       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 2e434e8c8..15a202c2a 100644
--- a/tests/cfgs/default/result/cloudflare-warp.pcap.out
+++ b/tests/cfgs/default/result/cloudflare-warp.pcap.out
@@ -5,7 +5,7 @@ DPI Packets (UDP):	1	(1.00 pkts/flow)
 Confidence Match by port    : 2 (flows)
 Confidence DPI              : 6 (flows)
 Confidence Match by IP      : 1 (flows)
-Num dissector calls: 350 (38.89 diss/flow)
+Num dissector calls: 348 (38.67 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/9/0 (insert/search/found)
 LRU cache stun:       0/0/0 (insert/search/found)
diff --git a/tests/cfgs/default/result/coap_mqtt.pcap.out b/tests/cfgs/default/result/coap_mqtt.pcap.out
index 85e04dcf8..770e65c3b 100644
--- a/tests/cfgs/default/result/coap_mqtt.pcap.out
+++ b/tests/cfgs/default/result/coap_mqtt.pcap.out
@@ -1,7 +1,7 @@
 DPI Packets (TCP):	7	(1.75 pkts/flow)
 DPI Packets (UDP):	12	(1.00 pkts/flow)
 Confidence DPI              : 16 (flows)
-Num dissector calls: 276 (17.25 diss/flow)
+Num dissector calls: 272 (17.00 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/0/0 (insert/search/found)
 LRU cache stun:       0/0/0 (insert/search/found)
diff --git a/tests/cfgs/default/result/codm.pcap.out b/tests/cfgs/default/result/codm.pcap.out
index 05c4f22d0..e87c8eb0f 100644
--- a/tests/cfgs/default/result/codm.pcap.out
+++ b/tests/cfgs/default/result/codm.pcap.out
@@ -1,7 +1,7 @@
 DPI Packets (TCP):	7	(7.00 pkts/flow)
 DPI Packets (UDP):	5	(2.50 pkts/flow)
 Confidence DPI              : 3 (flows)
-Num dissector calls: 487 (162.33 diss/flow)
+Num dissector calls: 486 (162.00 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/0/0 (insert/search/found)
 LRU cache stun:       0/0/0 (insert/search/found)
diff --git a/tests/cfgs/default/result/corba.pcap.out b/tests/cfgs/default/result/corba.pcap.out
index d4f23cb98..68812031b 100644
--- a/tests/cfgs/default/result/corba.pcap.out
+++ b/tests/cfgs/default/result/corba.pcap.out
@@ -1,7 +1,7 @@
 DPI Packets (TCP):	4	(4.00 pkts/flow)
 DPI Packets (UDP):	1	(1.00 pkts/flow)
 Confidence DPI              : 2 (flows)
-Num dissector calls: 108 (54.00 diss/flow)
+Num dissector calls: 107 (53.50 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/0/0 (insert/search/found)
 LRU cache stun:       0/0/0 (insert/search/found)
diff --git a/tests/cfgs/default/result/crossfire.pcapng.out b/tests/cfgs/default/result/crossfire.pcapng.out
index 5f99bfd1c..50edc0277 100644
--- a/tests/cfgs/default/result/crossfire.pcapng.out
+++ b/tests/cfgs/default/result/crossfire.pcapng.out
@@ -1,7 +1,7 @@
 DPI Packets (TCP):	4	(4.00 pkts/flow)
 DPI Packets (UDP):	2	(1.00 pkts/flow)
 Confidence DPI              : 3 (flows)
-Num dissector calls: 113 (37.67 diss/flow)
+Num dissector calls: 112 (37.33 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/0/0 (insert/search/found)
 LRU cache stun:       0/0/0 (insert/search/found)
diff --git a/tests/cfgs/default/result/custom_categories.pcapng.out b/tests/cfgs/default/result/custom_categories.pcapng.out
index b0431523d..852d56bcf 100644
--- a/tests/cfgs/default/result/custom_categories.pcapng.out
+++ b/tests/cfgs/default/result/custom_categories.pcapng.out
@@ -2,7 +2,7 @@ DPI Packets (TCP):	27	(13.50 pkts/flow)
 DPI Packets (UDP):	2	(2.00 pkts/flow)
 DPI Packets (other):	1	(1.00 pkts/flow)
 Confidence DPI              : 4 (flows)
-Num dissector calls: 323 (80.75 diss/flow)
+Num dissector calls: 321 (80.25 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/0/0 (insert/search/found)
 LRU cache stun:       0/0/0 (insert/search/found)
diff --git a/tests/cfgs/default/result/dingtalk.pcap.out b/tests/cfgs/default/result/dingtalk.pcap.out
index 7237483ff..2e07f0351 100644
--- a/tests/cfgs/default/result/dingtalk.pcap.out
+++ b/tests/cfgs/default/result/dingtalk.pcap.out
@@ -1,6 +1,6 @@
 DPI Packets (TCP):	11	(5.50 pkts/flow)
 Confidence DPI              : 2 (flows)
-Num dissector calls: 316 (158.00 diss/flow)
+Num dissector calls: 314 (157.00 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/0/0 (insert/search/found)
 LRU cache stun:       0/0/0 (insert/search/found)
diff --git a/tests/cfgs/default/result/dlms.pcap.out b/tests/cfgs/default/result/dlms.pcap.out
index 49fe3dae1..aab61f88a 100644
--- a/tests/cfgs/default/result/dlms.pcap.out
+++ b/tests/cfgs/default/result/dlms.pcap.out
@@ -1,7 +1,7 @@
 DPI Packets (TCP):	4	(4.00 pkts/flow)
 DPI Packets (UDP):	1	(1.00 pkts/flow)
 Confidence DPI              : 2 (flows)
-Num dissector calls: 249 (124.50 diss/flow)
+Num dissector calls: 248 (124.00 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/3/0 (insert/search/found)
 LRU cache stun:       0/0/0 (insert/search/found)
diff --git a/tests/cfgs/default/result/dofus.pcap.out b/tests/cfgs/default/result/dofus.pcap.out
index 8e57d071b..d7a5cb42b 100644
--- a/tests/cfgs/default/result/dofus.pcap.out
+++ b/tests/cfgs/default/result/dofus.pcap.out
@@ -1,6 +1,6 @@
 DPI Packets (TCP):	32	(6.40 pkts/flow)
 Confidence DPI              : 5 (flows)
-Num dissector calls: 413 (82.60 diss/flow)
+Num dissector calls: 409 (81.80 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/0/0 (insert/search/found)
 LRU cache stun:       0/0/0 (insert/search/found)
diff --git a/tests/cfgs/default/result/drda_db2.pcap.out b/tests/cfgs/default/result/drda_db2.pcap.out
index 3cd9a04c7..2d44f5a6b 100644
--- a/tests/cfgs/default/result/drda_db2.pcap.out
+++ b/tests/cfgs/default/result/drda_db2.pcap.out
@@ -1,6 +1,6 @@
 DPI Packets (TCP):	4	(4.00 pkts/flow)
 Confidence DPI              : 1 (flows)
-Num dissector calls: 69 (69.00 diss/flow)
+Num dissector calls: 68 (68.00 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/0/0 (insert/search/found)
 LRU cache stun:       0/0/0 (insert/search/found)
diff --git a/tests/cfgs/default/result/elasticsearch.pcap.out b/tests/cfgs/default/result/elasticsearch.pcap.out
index a2a26ff57..cc9c45626 100644
--- a/tests/cfgs/default/result/elasticsearch.pcap.out
+++ b/tests/cfgs/default/result/elasticsearch.pcap.out
@@ -1,6 +1,6 @@
 DPI Packets (TCP):	16	(2.29 pkts/flow)
 Confidence DPI              : 7 (flows)
-Num dissector calls: 756 (108.00 diss/flow)
+Num dissector calls: 749 (107.00 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/0/0 (insert/search/found)
 LRU cache stun:       0/0/0 (insert/search/found)
diff --git a/tests/cfgs/default/result/elf.pcap.out b/tests/cfgs/default/result/elf.pcap.out
index 0cf0ae845..18f48ce36 100644
--- a/tests/cfgs/default/result/elf.pcap.out
+++ b/tests/cfgs/default/result/elf.pcap.out
@@ -1,7 +1,7 @@
 DPI Packets (TCP):	10	(10.00 pkts/flow)
 DPI Packets (UDP):	2	(2.00 pkts/flow)
 Confidence Unknown          : 2 (flows)
-Num dissector calls: 349 (174.50 diss/flow)
+Num dissector calls: 347 (173.50 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/6/0 (insert/search/found)
 LRU cache stun:       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 edfce4896..f95d62694 100644
--- a/tests/cfgs/default/result/emotet.pcap.out
+++ b/tests/cfgs/default/result/emotet.pcap.out
@@ -1,6 +1,6 @@
 DPI Packets (TCP):	48	(8.00 pkts/flow)
 Confidence DPI              : 6 (flows)
-Num dissector calls: 223 (37.17 diss/flow)
+Num dissector calls: 222 (37.00 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/0/0 (insert/search/found)
 LRU cache stun:       0/0/0 (insert/search/found)
diff --git a/tests/cfgs/default/result/false_positives.pcapng.out b/tests/cfgs/default/result/false_positives.pcapng.out
index 6ca27fb51..74b6fe1b9 100644
--- a/tests/cfgs/default/result/false_positives.pcapng.out
+++ b/tests/cfgs/default/result/false_positives.pcapng.out
@@ -2,7 +2,7 @@ DPI Packets (TCP):	16	(5.33 pkts/flow)
 DPI Packets (UDP):	66	(7.33 pkts/flow)
 Confidence Unknown          : 4 (flows)
 Confidence DPI              : 8 (flows)
-Num dissector calls: 1759 (146.58 diss/flow)
+Num dissector calls: 1758 (146.50 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/12/0 (insert/search/found)
 LRU cache stun:       0/0/0 (insert/search/found)
diff --git a/tests/cfgs/default/result/false_positives2.pcapng.out b/tests/cfgs/default/result/false_positives2.pcapng.out
index 9e9d15258..a2d789c63 100644
--- a/tests/cfgs/default/result/false_positives2.pcapng.out
+++ b/tests/cfgs/default/result/false_positives2.pcapng.out
@@ -1,6 +1,6 @@
 DPI Packets (TCP):	61	(20.33 pkts/flow)
 Confidence Unknown          : 3 (flows)
-Num dissector calls: 703 (234.33 diss/flow)
+Num dissector calls: 697 (232.33 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/9/0 (insert/search/found)
 LRU cache stun:       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 8e4d3d31e..a1da4cf33 100644
--- a/tests/cfgs/default/result/fastcgi.pcap.out
+++ b/tests/cfgs/default/result/fastcgi.pcap.out
@@ -1,6 +1,6 @@
 DPI Packets (TCP):	6	(6.00 pkts/flow)
 Confidence DPI              : 1 (flows)
-Num dissector calls: 177 (177.00 diss/flow)
+Num dissector calls: 175 (175.00 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/0/0 (insert/search/found)
 LRU cache stun:       0/0/0 (insert/search/found)
diff --git a/tests/cfgs/default/result/fix.pcap.out b/tests/cfgs/default/result/fix.pcap.out
index c83784688..115dd6657 100644
--- a/tests/cfgs/default/result/fix.pcap.out
+++ b/tests/cfgs/default/result/fix.pcap.out
@@ -1,6 +1,6 @@
 DPI Packets (TCP):	12	(1.00 pkts/flow)
 Confidence DPI              : 12 (flows)
-Num dissector calls: 876 (73.00 diss/flow)
+Num dissector calls: 864 (72.00 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/0/0 (insert/search/found)
 LRU cache stun:       0/0/0 (insert/search/found)
diff --git a/tests/cfgs/default/result/fix2.pcap.out b/tests/cfgs/default/result/fix2.pcap.out
index 87a095944..43ac50139 100644
--- a/tests/cfgs/default/result/fix2.pcap.out
+++ b/tests/cfgs/default/result/fix2.pcap.out
@@ -1,6 +1,6 @@
 DPI Packets (TCP):	8	(4.00 pkts/flow)
 Confidence DPI              : 2 (flows)
-Num dissector calls: 144 (72.00 diss/flow)
+Num dissector calls: 142 (71.00 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/0/0 (insert/search/found)
 LRU cache stun:       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 7660a41a8..8c7997efb 100644
--- a/tests/cfgs/default/result/ftp-start-tls.pcap.out
+++ b/tests/cfgs/default/result/ftp-start-tls.pcap.out
@@ -1,6 +1,6 @@
 DPI Packets (TCP):	17	(17.00 pkts/flow)
 Confidence DPI              : 1 (flows)
-Num dissector calls: 182 (182.00 diss/flow)
+Num dissector calls: 181 (181.00 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/0/0 (insert/search/found)
 LRU cache stun:       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 16d894c0c..6db9d2398 100644
--- a/tests/cfgs/default/result/ftp.pcap.out
+++ b/tests/cfgs/default/result/ftp.pcap.out
@@ -1,7 +1,7 @@
 DPI Packets (TCP):	37	(12.33 pkts/flow)
 Confidence Unknown          : 1 (flows)
 Confidence DPI              : 2 (flows)
-Num dissector calls: 531 (177.00 diss/flow)
+Num dissector calls: 528 (176.00 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/3/0 (insert/search/found)
 LRU cache stun:       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 1c15f2e71..c1cb5e160 100644
--- a/tests/cfgs/default/result/ftp_failed.pcap.out
+++ b/tests/cfgs/default/result/ftp_failed.pcap.out
@@ -1,6 +1,6 @@
 DPI Packets (TCP):	8	(8.00 pkts/flow)
 Confidence DPI              : 1 (flows)
-Num dissector calls: 179 (179.00 diss/flow)
+Num dissector calls: 178 (178.00 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/0/0 (insert/search/found)
 LRU cache stun:       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 30500791a..95d18363e 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          : 25 (flows)
 Confidence Match by port    : 32 (flows)
 Confidence DPI              : 189 (flows)
-Num dissector calls: 8755 (35.59 diss/flow)
+Num dissector calls: 8742 (35.54 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/174/0 (insert/search/found)
 LRU cache stun:       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 b5f719aed..8d68c1e6a 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
@@ -6,7 +6,7 @@ Confidence Unknown          : 3 (flows)
 Confidence Match by port    : 22 (flows)
 Confidence DPI              : 13 (flows)
 Confidence Match by custom rule: 1 (flows)
-Num dissector calls: 975 (25.00 diss/flow)
+Num dissector calls: 970 (24.87 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/75/0 (insert/search/found)
 LRU cache stun:       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 b2d3937e5..2dbb12190 100644
--- a/tests/cfgs/default/result/fuzz-2021-10-13.pcap.out
+++ b/tests/cfgs/default/result/fuzz-2021-10-13.pcap.out
@@ -1,6 +1,6 @@
 DPI Packets (TCP):	1	(1.00 pkts/flow)
 Confidence Unknown          : 1 (flows)
-Num dissector calls: 158 (158.00 diss/flow)
+Num dissector calls: 157 (157.00 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/3/0 (insert/search/found)
 LRU cache stun:       0/0/0 (insert/search/found)
diff --git a/tests/cfgs/default/result/gaijin_mobile_mixed.pcap.out b/tests/cfgs/default/result/gaijin_mobile_mixed.pcap.out
index 0dc48e797..1c6d7505f 100644
--- a/tests/cfgs/default/result/gaijin_mobile_mixed.pcap.out
+++ b/tests/cfgs/default/result/gaijin_mobile_mixed.pcap.out
@@ -1,7 +1,7 @@
 DPI Packets (TCP):	13	(6.50 pkts/flow)
 DPI Packets (UDP):	1	(1.00 pkts/flow)
 Confidence DPI              : 3 (flows)
-Num dissector calls: 164 (54.67 diss/flow)
+Num dissector calls: 163 (54.33 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/0/0 (insert/search/found)
 LRU cache stun:       0/0/0 (insert/search/found)
diff --git a/tests/cfgs/default/result/genshin-impact.pcap.out b/tests/cfgs/default/result/genshin-impact.pcap.out
index 9238d6e3d..7be162a0d 100644
--- a/tests/cfgs/default/result/genshin-impact.pcap.out
+++ b/tests/cfgs/default/result/genshin-impact.pcap.out
@@ -1,7 +1,7 @@
 DPI Packets (TCP):	12	(4.00 pkts/flow)
 DPI Packets (UDP):	3	(1.00 pkts/flow)
 Confidence DPI              : 6 (flows)
-Num dissector calls: 432 (72.00 diss/flow)
+Num dissector calls: 429 (71.50 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/0/0 (insert/search/found)
 LRU cache stun:       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 58bf640b8..043cd6782 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):	22	(22.00 pkts/flow)
 Confidence Match by port    : 1 (flows)
-Num dissector calls: 230 (230.00 diss/flow)
+Num dissector calls: 228 (228.00 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/3/0 (insert/search/found)
 LRU cache stun:       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 71a5b4a3e..b26d7fc8c 100644
--- a/tests/cfgs/default/result/h323.pcap.out
+++ b/tests/cfgs/default/result/h323.pcap.out
@@ -1,7 +1,7 @@
 DPI Packets (TCP):	15	(3.75 pkts/flow)
 DPI Packets (UDP):	2	(1.00 pkts/flow)
 Confidence DPI              : 6 (flows)
-Num dissector calls: 56 (9.33 diss/flow)
+Num dissector calls: 55 (9.17 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/0/0 (insert/search/found)
 LRU cache stun:       0/0/0 (insert/search/found)
diff --git a/tests/cfgs/default/result/haproxy.pcap.out b/tests/cfgs/default/result/haproxy.pcap.out
index b4deb64d7..13f43f68d 100644
--- a/tests/cfgs/default/result/haproxy.pcap.out
+++ b/tests/cfgs/default/result/haproxy.pcap.out
@@ -1,6 +1,6 @@
 DPI Packets (TCP):	1	(1.00 pkts/flow)
 Confidence DPI              : 1 (flows)
-Num dissector calls: 114 (114.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 stun:       0/0/0 (insert/search/found)
diff --git a/tests/cfgs/default/result/hl7.pcap.out b/tests/cfgs/default/result/hl7.pcap.out
index eec99e678..8fccf47d9 100644
--- a/tests/cfgs/default/result/hl7.pcap.out
+++ b/tests/cfgs/default/result/hl7.pcap.out
@@ -1,6 +1,6 @@
 DPI Packets (TCP):	18	(6.00 pkts/flow)
 Confidence DPI              : 3 (flows)
-Num dissector calls: 393 (131.00 diss/flow)
+Num dissector calls: 390 (130.00 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/0/0 (insert/search/found)
 LRU cache stun:       0/0/0 (insert/search/found)
diff --git a/tests/cfgs/default/result/hpvirtgrp.pcap.out b/tests/cfgs/default/result/hpvirtgrp.pcap.out
index d2b1f9609..79317d0d7 100644
--- a/tests/cfgs/default/result/hpvirtgrp.pcap.out
+++ b/tests/cfgs/default/result/hpvirtgrp.pcap.out
@@ -1,6 +1,6 @@
 DPI Packets (TCP):	37	(4.11 pkts/flow)
 Confidence DPI              : 9 (flows)
-Num dissector calls: 828 (92.00 diss/flow)
+Num dissector calls: 819 (91.00 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/0/0 (insert/search/found)
 LRU cache stun:       0/0/0 (insert/search/found)
diff --git a/tests/cfgs/default/result/http2.pcapng.out b/tests/cfgs/default/result/http2.pcapng.out
index d74e0e3fd..87687946c 100644
--- a/tests/cfgs/default/result/http2.pcapng.out
+++ b/tests/cfgs/default/result/http2.pcapng.out
@@ -1,6 +1,6 @@
 DPI Packets (TCP):	1	(1.00 pkts/flow)
 Confidence DPI              : 1 (flows)
-Num dissector calls: 113 (113.00 diss/flow)
+Num dissector calls: 112 (112.00 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/0/0 (insert/search/found)
 LRU cache stun:       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 c4efb600a..f5c995fa2 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: 161 (161.00 diss/flow)
+Num dissector calls: 160 (160.00 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/3/0 (insert/search/found)
 LRU cache stun:       0/0/0 (insert/search/found)
diff --git a/tests/cfgs/default/result/icecast.pcapng.out b/tests/cfgs/default/result/icecast.pcapng.out
new file mode 100644
index 000000000..9f77592ff
--- /dev/null
+++ b/tests/cfgs/default/result/icecast.pcapng.out
@@ -0,0 +1,38 @@
+DPI Packets (TCP):	18	(6.00 pkts/flow)
+Confidence DPI              : 3 (flows)
+Num dissector calls: 39 (13.00 diss/flow)
+LRU cache ookla:      0/0/0 (insert/search/found)
+LRU cache bittorrent: 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 fpc_dns:    0/3/0 (insert/search/found)
+Automa host:          6/0 (search/found)
+Automa domain:        3/0 (search/found)
+Automa tls cert:      0/0 (search/found)
+Automa risk mask:     3/0 (search/found)
+Automa common alpns:  0/0 (search/found)
+Patricia risk mask:   6/0 (search/found)
+Patricia risk mask IPv6: 0/0 (search/found)
+Patricia risk:        0/0 (search/found)
+Patricia risk IPv6:   0/0 (search/found)
+Patricia protocols:   6/0 (search/found)
+Patricia protocols IPv6: 0/0 (search/found)
+Hash malicious ja4:        0/0 (search/found)
+Hash malicious sha1:       0/0 (search/found)
+Hash TCP fingerprints:     3/3 (search/found)
+Hash public domain suffix: 9/0 (search/found)
+Hash ja4 custom protos:    0/0 (search/found)
+Hash fp custom protos:     0/0 (search/found)
+Hash url custom protos:    3/0 (search/found)
+
+IceCast	45	29622	3
+
+Fun                             45 29622         3            
+
+Media                           45 29622         3            
+
+	1	TCP 192.168.1.126:58596 <-> 68.34.83.26:8000 [proto: 7.52/HTTP.IceCast][Stack: HTTP.IceCast][IP: 0/Unknown][ClearText][Confidence: DPI][FPC: 0/Unknown, Confidence: Unknown][DPI packets: 6][cat: Media/1][Breed: Fun][10 pkts/1037 bytes <-> 10 pkts/12969 bytes][Goodput ratio: 36/95][0.75 sec][Hostname/SNI: 68.34.83.26][bytes ratio: -0.852 (Download)][IAT c2s/s2c min/avg/max/stddev: 0/0 94/78 378/256 136/107][Pkt Len c2s/s2c min/avg/max/stddev: 66/66 104/1297 435/2962 110/1203][URL: 68.34.83.26:8000/streamTV1.ogg][StatusCode: 200][Content-Type: application/ogg][Server: Icecast 2.4.4][User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:147.0) Gecko/20100101 Firefox/147.0][Risk: ** Known Proto on Non Std Port **** HTTP/TLS/QUIC Numeric Hostname/SNI **][Risk Score: 60][Risk Info: Found host 68.34.83.26;Expected on port 80][TCP Fingerprint: 2_64_64240_2e3cee914fc1/Linux][PLAIN TEXT (GET /streamTV)][Plen Bins: 0,0,0,11,11,0,0,0,0,0,0,11,0,0,0,11,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,22,0,33]
+	2	TCP 192.168.1.126:38030 <-> 168.119.74.185:9000 [proto: 7.52/HTTP.IceCast][Stack: HTTP.IceCast][IP: 0/Unknown][ClearText][Confidence: DPI][FPC: 0/Unknown, Confidence: Unknown][DPI packets: 6][cat: Media/1][Breed: Fun][8 pkts/903 bytes <-> 7 pkts/10781 bytes][Goodput ratio: 41/96][0.09 sec][Hostname/SNI: 168.119.74.185][bytes ratio: -0.845 (Download)][IAT c2s/s2c min/avg/max/stddev: 0/0 15/14 72/55 26/21][Pkt Len c2s/s2c min/avg/max/stddev: 66/66 113/1540 433/2962 121/1286][URL: 168.119.74.185:9000/dos.webm][StatusCode: 200][Content-Type: video/webm][Server: Icecast 2.4.4][User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:147.0) Gecko/20100101 Firefox/147.0][Risk: ** Known Proto on Non Std Port **** HTTP/TLS/QUIC Numeric Hostname/SNI **][Risk Score: 60][Risk Info: Found host 168.119.74.185;Expected on port 80][TCP Fingerprint: 2_64_64240_2e3cee914fc1/Linux][PLAIN TEXT (GET /dos.webm HTTP/1.1)][Plen Bins: 0,0,0,0,0,0,0,0,0,0,0,16,0,16,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,16,0,0,0,0,0,0,0,0,0,51]
+	3	TCP 192.168.1.126:38024 <-> 168.119.74.185:9000 [proto: 7.52/HTTP.IceCast][Stack: HTTP.IceCast][IP: 0/Unknown][ClearText][Confidence: DPI][FPC: 0/Unknown, Confidence: Unknown][DPI packets: 6][cat: Media/1][Breed: Fun][5 pkts/647 bytes <-> 5 pkts/3285 bytes][Goodput ratio: 48/90][0.06 sec][Hostname/SNI: 168.119.74.185][bytes ratio: -0.671 (Download)][IAT c2s/s2c min/avg/max/stddev: 0/3 9/12 20/17 9/7][Pkt Len c2s/s2c min/avg/max/stddev: 66/66 129/657 375/2962 123/1153][URL: 168.119.74.185:9000/][StatusCode: 200][Content-Type: text/xml][Server: Icecast 2.4.4][User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:147.0) Gecko/20100101 Firefox/147.0][Risk: ** Known Proto on Non Std Port **** HTTP/TLS/QUIC Numeric Hostname/SNI **][Risk Score: 60][Risk Info: Found host 168.119.74.185;Expected on port 80][TCP Fingerprint: 2_64_64240_2e3cee914fc1/Linux][PLAIN TEXT (GET / HTTP/1.1)][Plen Bins: 0,33,0,0,0,0,0,0,0,33,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,33]
diff --git a/tests/cfgs/default/result/imap-starttls.pcap.out b/tests/cfgs/default/result/imap-starttls.pcap.out
index a72a9a8c0..cd3cea01d 100644
--- a/tests/cfgs/default/result/imap-starttls.pcap.out
+++ b/tests/cfgs/default/result/imap-starttls.pcap.out
@@ -1,6 +1,6 @@
 DPI Packets (TCP):	19	(19.00 pkts/flow)
 Confidence DPI              : 1 (flows)
-Num dissector calls: 221 (221.00 diss/flow)
+Num dissector calls: 220 (220.00 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/0/0 (insert/search/found)
 LRU cache stun:       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 1d6947fd7..17936b908 100644
--- a/tests/cfgs/default/result/imap.pcap.out
+++ b/tests/cfgs/default/result/imap.pcap.out
@@ -1,6 +1,6 @@
 DPI Packets (TCP):	11	(11.00 pkts/flow)
 Confidence DPI              : 1 (flows)
-Num dissector calls: 221 (221.00 diss/flow)
+Num dissector calls: 220 (220.00 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/0/0 (insert/search/found)
 LRU cache stun:       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 c38818e84..7b0e07263 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: 1279 (33.66 diss/flow)
+Num dissector calls: 1275 (33.55 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/24/0 (insert/search/found)
 LRU cache stun:       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 fcec8b7f8..42ba1458a 100644
--- a/tests/cfgs/default/result/irc.pcap.out
+++ b/tests/cfgs/default/result/irc.pcap.out
@@ -1,6 +1,6 @@
 DPI Packets (TCP):	7	(7.00 pkts/flow)
 Confidence DPI              : 1 (flows)
-Num dissector calls: 186 (186.00 diss/flow)
+Num dissector calls: 184 (184.00 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/0/0 (insert/search/found)
 LRU cache stun:       0/0/0 (insert/search/found)
diff --git a/tests/cfgs/default/result/iso9506-1-mms.pcap.out b/tests/cfgs/default/result/iso9506-1-mms.pcap.out
index 14aea09dd..dc56bc92c 100644
--- a/tests/cfgs/default/result/iso9506-1-mms.pcap.out
+++ b/tests/cfgs/default/result/iso9506-1-mms.pcap.out
@@ -1,6 +1,6 @@
 DPI Packets (TCP):	7	(7.00 pkts/flow)
 Confidence DPI              : 1 (flows)
-Num dissector calls: 197 (197.00 diss/flow)
+Num dissector calls: 195 (195.00 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/0/0 (insert/search/found)
 LRU cache stun:       0/0/0 (insert/search/found)
diff --git a/tests/cfgs/default/result/ja4.pcapng.out b/tests/cfgs/default/result/ja4.pcapng.out
index bbed0e1c7..055cdde38 100644
--- a/tests/cfgs/default/result/ja4.pcapng.out
+++ b/tests/cfgs/default/result/ja4.pcapng.out
@@ -1,6 +1,6 @@
 DPI Packets (TCP):	48	(8.00 pkts/flow)
 Confidence DPI              : 6 (flows)
-Num dissector calls: 972 (162.00 diss/flow)
+Num dissector calls: 966 (161.00 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/0/0 (insert/search/found)
 LRU cache stun:       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 c41f79e8f..4d53ef1be 100644
--- a/tests/cfgs/default/result/jabber.pcap.out
+++ b/tests/cfgs/default/result/jabber.pcap.out
@@ -1,6 +1,6 @@
 DPI Packets (TCP):	74	(6.17 pkts/flow)
 Confidence DPI              : 12 (flows)
-Num dissector calls: 1711 (142.58 diss/flow)
+Num dissector calls: 1697 (141.42 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/0/0 (insert/search/found)
 LRU cache stun:       0/0/0 (insert/search/found)
diff --git a/tests/cfgs/default/result/json.pcapng.out b/tests/cfgs/default/result/json.pcapng.out
index 63f9362da..9dbec19b7 100644
--- a/tests/cfgs/default/result/json.pcapng.out
+++ b/tests/cfgs/default/result/json.pcapng.out
@@ -1,7 +1,7 @@
 DPI Packets (TCP):	132	(4.40 pkts/flow)
 DPI Packets (UDP):	4	(1.00 pkts/flow)
 Confidence DPI              : 34 (flows)
-Num dissector calls: 5090 (149.71 diss/flow)
+Num dissector calls: 5062 (148.88 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/0/0 (insert/search/found)
 LRU cache stun:       0/0/0 (insert/search/found)
diff --git a/tests/cfgs/default/result/jsonrpc.pcap.out b/tests/cfgs/default/result/jsonrpc.pcap.out
index acebb2540..987b677c6 100644
--- a/tests/cfgs/default/result/jsonrpc.pcap.out
+++ b/tests/cfgs/default/result/jsonrpc.pcap.out
@@ -1,6 +1,6 @@
 DPI Packets (TCP):	10	(5.00 pkts/flow)
 Confidence DPI              : 2 (flows)
-Num dissector calls: 144 (72.00 diss/flow)
+Num dissector calls: 143 (71.50 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/0/0 (insert/search/found)
 LRU cache stun:       0/0/0 (insert/search/found)
diff --git a/tests/cfgs/default/result/kafka.pcapng.out b/tests/cfgs/default/result/kafka.pcapng.out
index 8033ddcb0..e5047e7b5 100644
--- a/tests/cfgs/default/result/kafka.pcapng.out
+++ b/tests/cfgs/default/result/kafka.pcapng.out
@@ -3,7 +3,7 @@ Guessed flow protos:	1
 DPI Packets (TCP):	16	(1.78 pkts/flow)
 Confidence Match by port    : 1 (flows)
 Confidence DPI              : 8 (flows)
-Num dissector calls: 221 (24.56 diss/flow)
+Num dissector calls: 218 (24.22 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/3/0 (insert/search/found)
 LRU cache stun:       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 a6a2a6016..789b39f91 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: 4610 (128.06 diss/flow)
+Num dissector calls: 4560 (126.67 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/75/0 (insert/search/found)
 LRU cache stun:       0/0/0 (insert/search/found)
diff --git a/tests/cfgs/default/result/kismet.pcap.out b/tests/cfgs/default/result/kismet.pcap.out
index c5e5bb7af..22676bb69 100644
--- a/tests/cfgs/default/result/kismet.pcap.out
+++ b/tests/cfgs/default/result/kismet.pcap.out
@@ -1,6 +1,6 @@
 DPI Packets (TCP):	4	(4.00 pkts/flow)
 Confidence DPI              : 1 (flows)
-Num dissector calls: 105 (105.00 diss/flow)
+Num dissector calls: 104 (104.00 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/0/0 (insert/search/found)
 LRU cache stun:       0/0/0 (insert/search/found)
diff --git a/tests/cfgs/default/result/lisp_registration.pcap.out b/tests/cfgs/default/result/lisp_registration.pcap.out
index 6786cd2b8..55b97fbd2 100644
--- a/tests/cfgs/default/result/lisp_registration.pcap.out
+++ b/tests/cfgs/default/result/lisp_registration.pcap.out
@@ -1,7 +1,7 @@
 DPI Packets (TCP):	8	(4.00 pkts/flow)
 DPI Packets (UDP):	2	(1.00 pkts/flow)
 Confidence DPI              : 4 (flows)
-Num dissector calls: 162 (40.50 diss/flow)
+Num dissector calls: 160 (40.00 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/0/0 (insert/search/found)
 LRU cache stun:       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 ca7f23aa8..c358af4de 100644
--- a/tests/cfgs/default/result/log4j-webapp-exploit.pcap.out
+++ b/tests/cfgs/default/result/log4j-webapp-exploit.pcap.out
@@ -1,7 +1,7 @@
 DPI Packets (TCP):	54	(7.71 pkts/flow)
 Confidence Unknown          : 2 (flows)
 Confidence DPI              : 5 (flows)
-Num dissector calls: 346 (49.43 diss/flow)
+Num dissector calls: 343 (49.00 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/6/0 (insert/search/found)
 LRU cache stun:       0/0/0 (insert/search/found)
diff --git a/tests/cfgs/default/result/lustre.pcapng.out b/tests/cfgs/default/result/lustre.pcapng.out
index a4073f95a..4523ad352 100644
--- a/tests/cfgs/default/result/lustre.pcapng.out
+++ b/tests/cfgs/default/result/lustre.pcapng.out
@@ -1,6 +1,6 @@
 DPI Packets (TCP):	5	(2.50 pkts/flow)
 Confidence DPI              : 2 (flows)
-Num dissector calls: 306 (153.00 diss/flow)
+Num dissector calls: 304 (152.00 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/0/0 (insert/search/found)
 LRU cache stun:       0/0/0 (insert/search/found)
diff --git a/tests/cfgs/default/result/melsec.pcapng.out b/tests/cfgs/default/result/melsec.pcapng.out
index 47c4767b7..1066b30f5 100644
--- a/tests/cfgs/default/result/melsec.pcapng.out
+++ b/tests/cfgs/default/result/melsec.pcapng.out
@@ -1,7 +1,7 @@
 DPI Packets (TCP):	6	(6.00 pkts/flow)
 DPI Packets (UDP):	2	(1.00 pkts/flow)
 Confidence DPI              : 3 (flows)
-Num dissector calls: 482 (160.67 diss/flow)
+Num dissector calls: 480 (160.00 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/0/0 (insert/search/found)
 LRU cache stun:       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 5adbc3ec7..4c7a9641d 100644
--- a/tests/cfgs/default/result/memcached.cap.out
+++ b/tests/cfgs/default/result/memcached.cap.out
@@ -1,6 +1,6 @@
 DPI Packets (TCP):	6	(6.00 pkts/flow)
 Confidence DPI              : 1 (flows)
-Num dissector calls: 162 (162.00 diss/flow)
+Num dissector calls: 161 (161.00 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/0/0 (insert/search/found)
 LRU cache stun:       0/0/0 (insert/search/found)
diff --git a/tests/cfgs/default/result/monero.pcap.out b/tests/cfgs/default/result/monero.pcap.out
index fd910de09..2479a5375 100644
--- a/tests/cfgs/default/result/monero.pcap.out
+++ b/tests/cfgs/default/result/monero.pcap.out
@@ -1,6 +1,6 @@
 DPI Packets (TCP):	16	(4.00 pkts/flow)
 Confidence DPI              : 4 (flows)
-Num dissector calls: 496 (124.00 diss/flow)
+Num dissector calls: 492 (123.00 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/0/0 (insert/search/found)
 LRU cache stun:       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 ea8352bad..993ffe4ec 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):	13	(13.00 pkts/flow)
 Confidence Match by port    : 1 (flows)
-Num dissector calls: 257 (257.00 diss/flow)
+Num dissector calls: 255 (255.00 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/3/0 (insert/search/found)
 LRU cache stun:       0/0/0 (insert/search/found)
diff --git a/tests/cfgs/default/result/mongodb.pcap.out b/tests/cfgs/default/result/mongodb.pcap.out
index f322e3ce6..7a3af3fa2 100644
--- a/tests/cfgs/default/result/mongodb.pcap.out
+++ b/tests/cfgs/default/result/mongodb.pcap.out
@@ -4,7 +4,7 @@ DPI Packets (TCP):	27	(3.38 pkts/flow)
 Confidence Unknown          : 1 (flows)
 Confidence Match by port    : 2 (flows)
 Confidence DPI              : 5 (flows)
-Num dissector calls: 95 (11.88 diss/flow)
+Num dissector calls: 94 (11.75 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/9/0 (insert/search/found)
 LRU cache stun:       0/0/0 (insert/search/found)
diff --git a/tests/cfgs/default/result/msgpack.pcap.out b/tests/cfgs/default/result/msgpack.pcap.out
index c6e636dd3..45b2f7b3f 100644
--- a/tests/cfgs/default/result/msgpack.pcap.out
+++ b/tests/cfgs/default/result/msgpack.pcap.out
@@ -2,7 +2,7 @@ DPI Packets (TCP):	19	(4.75 pkts/flow)
 DPI Packets (UDP):	12	(1.71 pkts/flow)
 Confidence Unknown          : 1 (flows)
 Confidence DPI              : 10 (flows)
-Num dissector calls: 1662 (151.09 diss/flow)
+Num dissector calls: 1658 (150.73 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/3/0 (insert/search/found)
 LRU cache stun:       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 89684dce1..9ec0c75b6 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: 258 (21.50 diss/flow)
+Num dissector calls: 251 (20.92 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/3/0 (insert/search/found)
 LRU cache stun:       0/0/0 (insert/search/found)
diff --git a/tests/cfgs/default/result/naver.pcap.out b/tests/cfgs/default/result/naver.pcap.out
index 73dea718e..a8a9e1663 100644
--- a/tests/cfgs/default/result/naver.pcap.out
+++ b/tests/cfgs/default/result/naver.pcap.out
@@ -1,6 +1,6 @@
 DPI Packets (TCP):	22	(7.33 pkts/flow)
 Confidence DPI              : 3 (flows)
-Num dissector calls: 486 (162.00 diss/flow)
+Num dissector calls: 483 (161.00 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/0/0 (insert/search/found)
 LRU cache stun:       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 302f748b8..facee0d73 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):	129	(9.92 pkts/flow)
 DPI Packets (UDP):	2	(2.00 pkts/flow)
 Confidence Match by port    : 1 (flows)
 Confidence DPI              : 13 (flows)
-Num dissector calls: 2197 (156.93 diss/flow)
+Num dissector calls: 2173 (155.21 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/3/0 (insert/search/found)
 LRU cache stun:       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 9060811a6..8f1628ede 100644
--- a/tests/cfgs/default/result/netbios.pcap.out
+++ b/tests/cfgs/default/result/netbios.pcap.out
@@ -4,7 +4,7 @@ DPI Packets (TCP):	3	(1.50 pkts/flow)
 DPI Packets (UDP):	14	(1.00 pkts/flow)
 Confidence Match by port    : 1 (flows)
 Confidence DPI              : 15 (flows)
-Num dissector calls: 176 (11.00 diss/flow)
+Num dissector calls: 175 (10.94 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/3/0 (insert/search/found)
 LRU cache stun:       0/0/0 (insert/search/found)
diff --git a/tests/cfgs/default/result/nexon.pcapng.out b/tests/cfgs/default/result/nexon.pcapng.out
index 94f4e6887..da6638c24 100644
--- a/tests/cfgs/default/result/nexon.pcapng.out
+++ b/tests/cfgs/default/result/nexon.pcapng.out
@@ -1,6 +1,6 @@
 DPI Packets (TCP):	8	(4.00 pkts/flow)
 Confidence DPI              : 2 (flows)
-Num dissector calls: 86 (43.00 diss/flow)
+Num dissector calls: 84 (42.00 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/0/0 (insert/search/found)
 LRU cache stun:       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 ff5f8b159..bc93fc317 100644
--- a/tests/cfgs/default/result/nntp.pcap.out
+++ b/tests/cfgs/default/result/nntp.pcap.out
@@ -1,6 +1,6 @@
 DPI Packets (TCP):	6	(6.00 pkts/flow)
 Confidence DPI              : 1 (flows)
-Num dissector calls: 168 (168.00 diss/flow)
+Num dissector calls: 167 (167.00 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/0/0 (insert/search/found)
 LRU cache stun:       0/0/0 (insert/search/found)
diff --git a/tests/cfgs/default/result/nordvpn.pcap.out b/tests/cfgs/default/result/nordvpn.pcap.out
index 8a876197f..5cbb0bca5 100644
--- a/tests/cfgs/default/result/nordvpn.pcap.out
+++ b/tests/cfgs/default/result/nordvpn.pcap.out
@@ -5,7 +5,7 @@ DPI Packets (UDP):	11	(5.50 pkts/flow)
 Confidence Match by port    : 1 (flows)
 Confidence DPI              : 2 (flows)
 Confidence Match by IP      : 1 (flows)
-Num dissector calls: 602 (150.50 diss/flow)
+Num dissector calls: 600 (150.00 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/6/0 (insert/search/found)
 LRU cache stun:       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 1df8c8806..bac29e29f 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: 579 (96.50 diss/flow)
+Num dissector calls: 573 (95.50 diss/flow)
 LRU cache ookla:      4/2/2 (insert/search/found)
 LRU cache bittorrent: 0/3/0 (insert/search/found)
 LRU cache stun:       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 ee3d284ab..4755615cd 100644
--- a/tests/cfgs/default/result/openvpn.pcap.out
+++ b/tests/cfgs/default/result/openvpn.pcap.out
@@ -1,7 +1,7 @@
 DPI Packets (TCP):	24	(8.00 pkts/flow)
 DPI Packets (UDP):	24	(3.43 pkts/flow)
 Confidence DPI              : 10 (flows)
-Num dissector calls: 1802 (180.20 diss/flow)
+Num dissector calls: 1797 (179.70 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/9/0 (insert/search/found)
 LRU cache stun:       0/0/0 (insert/search/found)
diff --git a/tests/cfgs/default/result/openvpn_nohmac_tcp.pcapng.out b/tests/cfgs/default/result/openvpn_nohmac_tcp.pcapng.out
index 4b26bdfdd..cafc07400 100644
--- a/tests/cfgs/default/result/openvpn_nohmac_tcp.pcapng.out
+++ b/tests/cfgs/default/result/openvpn_nohmac_tcp.pcapng.out
@@ -1,6 +1,6 @@
 DPI Packets (TCP):	6	(6.00 pkts/flow)
 Confidence DPI              : 1 (flows)
-Num dissector calls: 162 (162.00 diss/flow)
+Num dissector calls: 161 (161.00 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/0/0 (insert/search/found)
 LRU cache stun:       0/0/0 (insert/search/found)
diff --git a/tests/cfgs/default/result/openvpn_obfuscated.pcapng.out b/tests/cfgs/default/result/openvpn_obfuscated.pcapng.out
index f2ff1c41f..1e8a59674 100644
--- a/tests/cfgs/default/result/openvpn_obfuscated.pcapng.out
+++ b/tests/cfgs/default/result/openvpn_obfuscated.pcapng.out
@@ -4,7 +4,7 @@ DPI Packets (TCP):	34	(17.00 pkts/flow)
 DPI Packets (UDP):	9	(9.00 pkts/flow)
 Confidence Match by port    : 2 (flows)
 Confidence Match by IP      : 1 (flows)
-Num dissector calls: 688 (229.33 diss/flow)
+Num dissector calls: 676 (225.33 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/9/0 (insert/search/found)
 LRU cache stun:       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 f8d933945..c7eb802f4 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
@@ -5,7 +5,7 @@ DPI Packets (UDP):	9	(2.25 pkts/flow)
 Confidence Unknown          : 5 (flows)
 Confidence Match by port    : 4 (flows)
 Confidence DPI              : 1 (flows)
-Num dissector calls: 1685 (168.50 diss/flow)
+Num dissector calls: 1677 (167.70 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/27/0 (insert/search/found)
 LRU cache stun:       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 595708a0c..4edd58e4d 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):	38	(6.33 pkts/flow)
 DPI Packets (UDP):	4	(2.00 pkts/flow)
 Confidence Match by port    : 1 (flows)
 Confidence DPI              : 7 (flows)
-Num dissector calls: 1070 (133.75 diss/flow)
+Num dissector calls: 1063 (132.88 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/3/0 (insert/search/found)
 LRU cache stun:       0/0/0 (insert/search/found)
diff --git a/tests/cfgs/default/result/paltalk.pcapng.out b/tests/cfgs/default/result/paltalk.pcapng.out
index 463d5fe1c..1046353a0 100644
--- a/tests/cfgs/default/result/paltalk.pcapng.out
+++ b/tests/cfgs/default/result/paltalk.pcapng.out
@@ -1,6 +1,6 @@
 DPI Packets (TCP):	17	(4.25 pkts/flow)
 Confidence DPI              : 4 (flows)
-Num dissector calls: 324 (81.00 diss/flow)
+Num dissector calls: 322 (80.50 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/0/0 (insert/search/found)
 LRU cache stun:       0/0/0 (insert/search/found)
diff --git a/tests/cfgs/default/result/path_of_exile.pcapng.out b/tests/cfgs/default/result/path_of_exile.pcapng.out
index efd8307f3..4a3e18357 100644
--- a/tests/cfgs/default/result/path_of_exile.pcapng.out
+++ b/tests/cfgs/default/result/path_of_exile.pcapng.out
@@ -1,6 +1,6 @@
 DPI Packets (TCP):	16	(4.00 pkts/flow)
 Confidence DPI              : 4 (flows)
-Num dissector calls: 572 (143.00 diss/flow)
+Num dissector calls: 568 (142.00 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/0/0 (insert/search/found)
 LRU cache stun:       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 0502a5e48..686ce5b23 100644
--- a/tests/cfgs/default/result/pgsql.pcap.out
+++ b/tests/cfgs/default/result/pgsql.pcap.out
@@ -1,6 +1,6 @@
 DPI Packets (TCP):	36	(6.00 pkts/flow)
 Confidence DPI              : 6 (flows)
-Num dissector calls: 972 (162.00 diss/flow)
+Num dissector calls: 966 (161.00 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/0/0 (insert/search/found)
 LRU cache stun:       0/0/0 (insert/search/found)
diff --git a/tests/cfgs/default/result/pgsql2.pcapng.out b/tests/cfgs/default/result/pgsql2.pcapng.out
index 3e3c7321c..aa423451d 100644
--- a/tests/cfgs/default/result/pgsql2.pcapng.out
+++ b/tests/cfgs/default/result/pgsql2.pcapng.out
@@ -1,6 +1,6 @@
 DPI Packets (TCP):	6	(6.00 pkts/flow)
 Confidence DPI              : 1 (flows)
-Num dissector calls: 165 (165.00 diss/flow)
+Num dissector calls: 164 (164.00 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/0/0 (insert/search/found)
 LRU cache stun:       0/0/0 (insert/search/found)
diff --git a/tests/cfgs/default/result/plugin.pcapng.out b/tests/cfgs/default/result/plugin.pcapng.out
index 785b8f080..de4b85d3d 100644
--- a/tests/cfgs/default/result/plugin.pcapng.out
+++ b/tests/cfgs/default/result/plugin.pcapng.out
@@ -2,7 +2,7 @@ Guessed flow protos:	1
 
 DPI Packets (TCP):	8	(8.00 pkts/flow)
 Confidence Match by port    : 1 (flows)
-Num dissector calls: 161 (161.00 diss/flow)
+Num dissector calls: 160 (160.00 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/3/0 (insert/search/found)
 LRU cache stun:       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 a7dfca164..b846f8e19 100644
--- a/tests/cfgs/default/result/pop3.pcap.out
+++ b/tests/cfgs/default/result/pop3.pcap.out
@@ -1,6 +1,6 @@
 DPI Packets (TCP):	83	(13.83 pkts/flow)
 Confidence DPI              : 6 (flows)
-Num dissector calls: 1244 (207.33 diss/flow)
+Num dissector calls: 1238 (206.33 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/0/0 (insert/search/found)
 LRU cache stun:       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 2eaafbf94..6d871973d 100644
--- a/tests/cfgs/default/result/pop3_stls.pcap.out
+++ b/tests/cfgs/default/result/pop3_stls.pcap.out
@@ -1,6 +1,6 @@
 DPI Packets (TCP):	18	(18.00 pkts/flow)
 Confidence DPI              : 1 (flows)
-Num dissector calls: 208 (208.00 diss/flow)
+Num dissector calls: 207 (207.00 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/0/0 (insert/search/found)
 LRU cache stun:       0/0/0 (insert/search/found)
diff --git a/tests/cfgs/default/result/portable_executable.pcap.out b/tests/cfgs/default/result/portable_executable.pcap.out
index 4ecfc0ffe..9513544f2 100644
--- a/tests/cfgs/default/result/portable_executable.pcap.out
+++ b/tests/cfgs/default/result/portable_executable.pcap.out
@@ -3,7 +3,7 @@ Guessed flow protos:	2
 DPI Packets (TCP):	30	(15.00 pkts/flow)
 Confidence Match by port    : 1 (flows)
 Confidence Match by IP      : 1 (flows)
-Num dissector calls: 455 (227.50 diss/flow)
+Num dissector calls: 453 (226.50 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/6/0 (insert/search/found)
 LRU cache stun:       0/0/0 (insert/search/found)
diff --git a/tests/cfgs/default/result/pptp.pcap.out b/tests/cfgs/default/result/pptp.pcap.out
index 03a2a8ddb..b8f2b3703 100644
--- a/tests/cfgs/default/result/pptp.pcap.out
+++ b/tests/cfgs/default/result/pptp.pcap.out
@@ -1,6 +1,6 @@
 DPI Packets (TCP):	4	(4.00 pkts/flow)
 Confidence DPI              : 1 (flows)
-Num dissector calls: 40 (40.00 diss/flow)
+Num dissector calls: 39 (39.00 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/0/0 (insert/search/found)
 LRU cache stun:       0/0/0 (insert/search/found)
diff --git a/tests/cfgs/default/result/protobuf.pcap.out b/tests/cfgs/default/result/protobuf.pcap.out
index 960bd637d..4e89800b9 100644
--- a/tests/cfgs/default/result/protobuf.pcap.out
+++ b/tests/cfgs/default/result/protobuf.pcap.out
@@ -1,6 +1,6 @@
 DPI Packets (TCP):	26	(5.20 pkts/flow)
 Confidence DPI              : 5 (flows)
-Num dissector calls: 683 (136.60 diss/flow)
+Num dissector calls: 675 (135.00 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/0/0 (insert/search/found)
 LRU cache stun:       0/0/0 (insert/search/found)
diff --git a/tests/cfgs/default/result/radmin3.pcapng.out b/tests/cfgs/default/result/radmin3.pcapng.out
index 7709de340..44ae33b39 100644
--- a/tests/cfgs/default/result/radmin3.pcapng.out
+++ b/tests/cfgs/default/result/radmin3.pcapng.out
@@ -1,6 +1,6 @@
 DPI Packets (TCP):	12	(6.00 pkts/flow)
 Confidence DPI              : 2 (flows)
-Num dissector calls: 324 (162.00 diss/flow)
+Num dissector calls: 322 (161.00 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/0/0 (insert/search/found)
 LRU cache stun:       0/0/0 (insert/search/found)
diff --git a/tests/cfgs/default/result/raft.pcap.out b/tests/cfgs/default/result/raft.pcap.out
index ce646df43..d6b2b2979 100644
--- a/tests/cfgs/default/result/raft.pcap.out
+++ b/tests/cfgs/default/result/raft.pcap.out
@@ -1,6 +1,6 @@
 DPI Packets (TCP):	12	(6.00 pkts/flow)
 Confidence DPI              : 2 (flows)
-Num dissector calls: 358 (179.00 diss/flow)
+Num dissector calls: 354 (177.00 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/0/0 (insert/search/found)
 LRU cache stun:       0/0/0 (insert/search/found)
diff --git a/tests/cfgs/default/result/rdp.pcap.out b/tests/cfgs/default/result/rdp.pcap.out
index 92db694f4..359b6e359 100644
--- a/tests/cfgs/default/result/rdp.pcap.out
+++ b/tests/cfgs/default/result/rdp.pcap.out
@@ -1,6 +1,6 @@
 DPI Packets (TCP):	5	(5.00 pkts/flow)
 Confidence DPI              : 1 (flows)
-Num dissector calls: 162 (162.00 diss/flow)
+Num dissector calls: 161 (161.00 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/0/0 (insert/search/found)
 LRU cache stun:       0/0/0 (insert/search/found)
diff --git a/tests/cfgs/default/result/rdp3.pcap.out b/tests/cfgs/default/result/rdp3.pcap.out
index 81e5d9fa3..95c185154 100644
--- a/tests/cfgs/default/result/rdp3.pcap.out
+++ b/tests/cfgs/default/result/rdp3.pcap.out
@@ -1,6 +1,6 @@
 DPI Packets (TCP):	5	(5.00 pkts/flow)
 Confidence DPI              : 1 (flows)
-Num dissector calls: 162 (162.00 diss/flow)
+Num dissector calls: 161 (161.00 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/0/0 (insert/search/found)
 LRU cache stun:       0/0/0 (insert/search/found)
diff --git a/tests/cfgs/default/result/rdp_over_http.pcapng.out b/tests/cfgs/default/result/rdp_over_http.pcapng.out
index 1b31ad53f..3c9684eb4 100644
--- a/tests/cfgs/default/result/rdp_over_http.pcapng.out
+++ b/tests/cfgs/default/result/rdp_over_http.pcapng.out
@@ -1,6 +1,6 @@
 DPI Packets (TCP):	6	(6.00 pkts/flow)
 Confidence DPI              : 1 (flows)
-Num dissector calls: 162 (162.00 diss/flow)
+Num dissector calls: 161 (161.00 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/0/0 (insert/search/found)
 LRU cache stun:       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 2941b90be..21f40b4e4 100644
--- a/tests/cfgs/default/result/reasm_crash_anon.pcapng.out
+++ b/tests/cfgs/default/result/reasm_crash_anon.pcapng.out
@@ -1,6 +1,6 @@
 DPI Packets (TCP):	3	(3.00 pkts/flow)
 Confidence DPI              : 1 (flows)
-Num dissector calls: 182 (182.00 diss/flow)
+Num dissector calls: 180 (180.00 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/0/0 (insert/search/found)
 LRU cache stun:       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 4dd895a2b..a2472c50b 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):	15	(15.00 pkts/flow)
 Confidence Match by port    : 1 (flows)
-Num dissector calls: 202 (202.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 stun:       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 1bb97e0f1..50356785f 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 DPI (partial)    : 1 (flows)
 Confidence DPI              : 1 (flows)
-Num dissector calls: 203 (101.50 diss/flow)
+Num dissector calls: 202 (101.00 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/0/0 (insert/search/found)
 LRU cache stun:       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 aff744068..817f7e82b 100644
--- a/tests/cfgs/default/result/rsh.pcap.out
+++ b/tests/cfgs/default/result/rsh.pcap.out
@@ -1,6 +1,6 @@
 DPI Packets (TCP):	12	(6.00 pkts/flow)
 Confidence DPI              : 2 (flows)
-Num dissector calls: 350 (175.00 diss/flow)
+Num dissector calls: 346 (173.00 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/0/0 (insert/search/found)
 LRU cache stun:       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 9073cafb9..15766fd7d 100644
--- a/tests/cfgs/default/result/rtmp.pcap.out
+++ b/tests/cfgs/default/result/rtmp.pcap.out
@@ -1,6 +1,6 @@
 DPI Packets (TCP):	18	(6.00 pkts/flow)
 Confidence DPI              : 3 (flows)
-Num dissector calls: 557 (185.67 diss/flow)
+Num dissector calls: 550 (183.33 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/0/0 (insert/search/found)
 LRU cache stun:       0/0/0 (insert/search/found)
diff --git a/tests/cfgs/default/result/rtp.pcapng.out b/tests/cfgs/default/result/rtp.pcapng.out
index b3fb6571c..76eaaad5f 100644
--- a/tests/cfgs/default/result/rtp.pcapng.out
+++ b/tests/cfgs/default/result/rtp.pcapng.out
@@ -1,7 +1,7 @@
 DPI Packets (TCP):	32	(32.00 pkts/flow)
 DPI Packets (UDP):	41	(13.67 pkts/flow)
 Confidence DPI              : 4 (flows)
-Num dissector calls: 696 (174.00 diss/flow)
+Num dissector calls: 694 (173.50 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/0/0 (insert/search/found)
 LRU cache stun:       0/0/0 (insert/search/found)
diff --git a/tests/cfgs/default/result/s7comm-plus.pcap.out b/tests/cfgs/default/result/s7comm-plus.pcap.out
index 11411a201..46a44688e 100644
--- a/tests/cfgs/default/result/s7comm-plus.pcap.out
+++ b/tests/cfgs/default/result/s7comm-plus.pcap.out
@@ -1,6 +1,6 @@
 DPI Packets (TCP):	9	(9.00 pkts/flow)
 Confidence DPI              : 1 (flows)
-Num dissector calls: 192 (192.00 diss/flow)
+Num dissector calls: 190 (190.00 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/0/0 (insert/search/found)
 LRU cache stun:       0/0/0 (insert/search/found)
diff --git a/tests/cfgs/default/result/s7comm.pcap.out b/tests/cfgs/default/result/s7comm.pcap.out
index 2969da86e..2aab791c0 100644
--- a/tests/cfgs/default/result/s7comm.pcap.out
+++ b/tests/cfgs/default/result/s7comm.pcap.out
@@ -1,6 +1,6 @@
 DPI Packets (TCP):	18	(4.50 pkts/flow)
 Confidence DPI              : 4 (flows)
-Num dissector calls: 660 (165.00 diss/flow)
+Num dissector calls: 653 (163.25 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/0/0 (insert/search/found)
 LRU cache stun:       0/0/0 (insert/search/found)
diff --git a/tests/cfgs/default/result/sbe.pcap.out b/tests/cfgs/default/result/sbe.pcap.out
index 951905cf5..63b3f0a3e 100644
--- a/tests/cfgs/default/result/sbe.pcap.out
+++ b/tests/cfgs/default/result/sbe.pcap.out
@@ -1,7 +1,7 @@
 DPI Packets (TCP):	16	(4.00 pkts/flow)
 DPI Packets (UDP):	3	(1.00 pkts/flow)
 Confidence DPI              : 7 (flows)
-Num dissector calls: 1109 (158.43 diss/flow)
+Num dissector calls: 1105 (157.86 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/0/0 (insert/search/found)
 LRU cache stun:       0/0/0 (insert/search/found)
diff --git a/tests/cfgs/default/result/shadowsocks.pcap.out b/tests/cfgs/default/result/shadowsocks.pcap.out
index 4ee0a721c..95b36b35e 100644
--- a/tests/cfgs/default/result/shadowsocks.pcap.out
+++ b/tests/cfgs/default/result/shadowsocks.pcap.out
@@ -1,7 +1,7 @@
 DPI Packets (TCP):	21	(10.50 pkts/flow)
 Confidence Unknown          : 1 (flows)
 Confidence DPI              : 1 (flows)
-Num dissector calls: 379 (189.50 diss/flow)
+Num dissector calls: 376 (188.00 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/3/0 (insert/search/found)
 LRU cache stun:       0/0/0 (insert/search/found)
diff --git a/tests/cfgs/default/result/shell.pcap.out b/tests/cfgs/default/result/shell.pcap.out
index 0da4a8b8b..9ca388a93 100644
--- a/tests/cfgs/default/result/shell.pcap.out
+++ b/tests/cfgs/default/result/shell.pcap.out
@@ -1,7 +1,7 @@
 DPI Packets (TCP):	16	(8.00 pkts/flow)
 DPI Packets (UDP):	2	(1.00 pkts/flow)
 Confidence Unknown          : 4 (flows)
-Num dissector calls: 632 (158.00 diss/flow)
+Num dissector calls: 630 (157.50 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/12/0 (insert/search/found)
 LRU cache stun:       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 e4bd00a3f..d62f81353 100644
--- a/tests/cfgs/default/result/sites.pcapng.out
+++ b/tests/cfgs/default/result/sites.pcapng.out
@@ -4,7 +4,7 @@ DPI Packets (TCP):	364	(5.43 pkts/flow)
 DPI Packets (UDP):	6	(1.20 pkts/flow)
 Confidence Match by port    : 4 (flows)
 Confidence DPI              : 68 (flows)
-Num dissector calls: 253 (3.51 diss/flow)
+Num dissector calls: 252 (3.50 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/12/0 (insert/search/found)
 LRU cache stun:       0/0/0 (insert/search/found)
diff --git a/tests/cfgs/default/result/sites3.pcapng.out b/tests/cfgs/default/result/sites3.pcapng.out
index 7983c896c..beaccf78f 100644
--- a/tests/cfgs/default/result/sites3.pcapng.out
+++ b/tests/cfgs/default/result/sites3.pcapng.out
@@ -1,6 +1,6 @@
 DPI Packets (TCP):	55	(6.88 pkts/flow)
 Confidence DPI              : 8 (flows)
-Num dissector calls: 491 (61.38 diss/flow)
+Num dissector calls: 488 (61.00 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/0/0 (insert/search/found)
 LRU cache stun:       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 1c51b5c6e..5dc5b6c75 100644
--- a/tests/cfgs/default/result/smb_frags.pcap.out
+++ b/tests/cfgs/default/result/smb_frags.pcap.out
@@ -1,6 +1,6 @@
 DPI Packets (TCP):	5	(5.00 pkts/flow)
 Confidence DPI              : 1 (flows)
-Num dissector calls: 181 (181.00 diss/flow)
+Num dissector calls: 179 (179.00 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/0/0 (insert/search/found)
 LRU cache stun:       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 1d31da4b7..be587f7e5 100644
--- a/tests/cfgs/default/result/smbv1.pcap.out
+++ b/tests/cfgs/default/result/smbv1.pcap.out
@@ -1,6 +1,6 @@
 DPI Packets (TCP):	3	(3.00 pkts/flow)
 Confidence DPI              : 1 (flows)
-Num dissector calls: 183 (183.00 diss/flow)
+Num dissector calls: 181 (181.00 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/0/0 (insert/search/found)
 LRU cache stun:       0/0/0 (insert/search/found)
diff --git a/tests/cfgs/default/result/smpp_in_general.pcap.out b/tests/cfgs/default/result/smpp_in_general.pcap.out
index fd8b08e78..59ea793d1 100644
--- a/tests/cfgs/default/result/smpp_in_general.pcap.out
+++ b/tests/cfgs/default/result/smpp_in_general.pcap.out
@@ -1,6 +1,6 @@
 DPI Packets (TCP):	4	(4.00 pkts/flow)
 Confidence DPI              : 1 (flows)
-Num dissector calls: 70 (70.00 diss/flow)
+Num dissector calls: 69 (69.00 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/0/0 (insert/search/found)
 LRU cache stun:       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 6f7da3e48..5c2e454b9 100644
--- a/tests/cfgs/default/result/smtp-starttls.pcap.out
+++ b/tests/cfgs/default/result/smtp-starttls.pcap.out
@@ -1,6 +1,6 @@
 DPI Packets (TCP):	26	(13.00 pkts/flow)
 Confidence DPI              : 2 (flows)
-Num dissector calls: 178 (89.00 diss/flow)
+Num dissector calls: 177 (88.50 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/0/0 (insert/search/found)
 LRU cache stun:       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 9cff54639..432f3f0db 100644
--- a/tests/cfgs/default/result/smtp.pcap.out
+++ b/tests/cfgs/default/result/smtp.pcap.out
@@ -1,6 +1,6 @@
 DPI Packets (TCP):	11	(11.00 pkts/flow)
 Confidence DPI              : 1 (flows)
-Num dissector calls: 215 (215.00 diss/flow)
+Num dissector calls: 214 (214.00 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/0/0 (insert/search/found)
 LRU cache stun:       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 081a0f5bf..f9d683dd8 100644
--- a/tests/cfgs/default/result/soap.pcap.out
+++ b/tests/cfgs/default/result/soap.pcap.out
@@ -1,6 +1,6 @@
 DPI Packets (TCP):	11	(3.67 pkts/flow)
 Confidence DPI              : 3 (flows)
-Num dissector calls: 409 (136.33 diss/flow)
+Num dissector calls: 404 (134.67 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/0/0 (insert/search/found)
 LRU cache stun:       0/0/0 (insert/search/found)
diff --git a/tests/cfgs/default/result/socks.pcap.out b/tests/cfgs/default/result/socks.pcap.out
index d315cc222..752a69d64 100644
--- a/tests/cfgs/default/result/socks.pcap.out
+++ b/tests/cfgs/default/result/socks.pcap.out
@@ -1,6 +1,6 @@
 DPI Packets (TCP):	23	(5.75 pkts/flow)
 Confidence DPI              : 4 (flows)
-Num dissector calls: 651 (162.75 diss/flow)
+Num dissector calls: 647 (161.75 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/0/0 (insert/search/found)
 LRU cache stun:       0/0/0 (insert/search/found)
diff --git a/tests/cfgs/default/result/spotify_tcp.pcap.out b/tests/cfgs/default/result/spotify_tcp.pcap.out
index 02eb9b549..6030f05a2 100644
--- a/tests/cfgs/default/result/spotify_tcp.pcap.out
+++ b/tests/cfgs/default/result/spotify_tcp.pcap.out
@@ -1,6 +1,6 @@
 DPI Packets (TCP):	4	(4.00 pkts/flow)
 Confidence DPI              : 1 (flows)
-Num dissector calls: 47 (47.00 diss/flow)
+Num dissector calls: 46 (46.00 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/0/0 (insert/search/found)
 LRU cache stun:       0/0/0 (insert/search/found)
diff --git a/tests/cfgs/default/result/ssh.pcap.out b/tests/cfgs/default/result/ssh.pcap.out
index 0e50d8b96..34e4b7c86 100644
--- a/tests/cfgs/default/result/ssh.pcap.out
+++ b/tests/cfgs/default/result/ssh.pcap.out
@@ -1,6 +1,6 @@
 DPI Packets (TCP):	38	(12.67 pkts/flow)
 Confidence DPI              : 3 (flows)
-Num dissector calls: 346 (115.33 diss/flow)
+Num dissector calls: 344 (114.67 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/0/0 (insert/search/found)
 LRU cache stun:       0/0/0 (insert/search/found)
diff --git a/tests/cfgs/default/result/ssh_unidirectional.pcap.out b/tests/cfgs/default/result/ssh_unidirectional.pcap.out
index 66a2568b5..afdfaa75f 100644
--- a/tests/cfgs/default/result/ssh_unidirectional.pcap.out
+++ b/tests/cfgs/default/result/ssh_unidirectional.pcap.out
@@ -2,7 +2,7 @@ Guessed flow protos:	1
 
 DPI Packets (TCP):	13	(13.00 pkts/flow)
 Confidence DPI (partial)    : 1 (flows)
-Num dissector calls: 193 (193.00 diss/flow)
+Num dissector calls: 192 (192.00 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/0/0 (insert/search/found)
 LRU cache stun:       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 4b68f6b11..88264de84 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    : 13 (flows)
 Confidence DPI              : 38 (flows)
 Confidence Match by IP      : 1 (flows)
-Num dissector calls: 1953 (37.56 diss/flow)
+Num dissector calls: 1946 (37.42 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/42/0 (insert/search/found)
 LRU cache stun:       0/0/0 (insert/search/found)
diff --git a/tests/cfgs/default/result/syslog.pcap.out b/tests/cfgs/default/result/syslog.pcap.out
index 3d087601b..0f8bf0104 100644
--- a/tests/cfgs/default/result/syslog.pcap.out
+++ b/tests/cfgs/default/result/syslog.pcap.out
@@ -2,7 +2,7 @@ DPI Packets (TCP):	10	(5.00 pkts/flow)
 DPI Packets (UDP):	20	(1.00 pkts/flow)
 Confidence Unknown          : 1 (flows)
 Confidence DPI              : 21 (flows)
-Num dissector calls: 54 (2.45 diss/flow)
+Num dissector calls: 53 (2.41 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/3/0 (insert/search/found)
 LRU cache stun:       0/0/0 (insert/search/found)
diff --git a/tests/cfgs/default/result/teams.pcap.out b/tests/cfgs/default/result/teams.pcap.out
index e37ec5b62..f0d00c9a4 100644
--- a/tests/cfgs/default/result/teams.pcap.out
+++ b/tests/cfgs/default/result/teams.pcap.out
@@ -7,7 +7,7 @@ Confidence Unknown          : 1 (flows)
 Confidence Match by port    : 2 (flows)
 Confidence DPI (partial)    : 4 (flows)
 Confidence DPI              : 76 (flows)
-Num dissector calls: 526 (6.34 diss/flow)
+Num dissector calls: 524 (6.31 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/9/0 (insert/search/found)
 LRU cache stun:       30/0/0 (insert/search/found)
diff --git a/tests/cfgs/default/result/telegram_videocall.pcapng.out b/tests/cfgs/default/result/telegram_videocall.pcapng.out
index c78678b90..e4d7d7ad3 100644
--- a/tests/cfgs/default/result/telegram_videocall.pcapng.out
+++ b/tests/cfgs/default/result/telegram_videocall.pcapng.out
@@ -7,7 +7,7 @@ Confidence Match by port    : 1 (flows)
 Confidence DPI (cache)      : 10 (flows)
 Confidence DPI              : 15 (flows)
 Confidence Match by IP      : 8 (flows)
-Num dissector calls: 752 (22.12 diss/flow)
+Num dissector calls: 743 (21.85 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/6/0 (insert/search/found)
 LRU cache stun:       38/49/10 (insert/search/found)
diff --git a/tests/cfgs/default/result/tencent_games.pcap.out b/tests/cfgs/default/result/tencent_games.pcap.out
index d51c976dd..b8f5d49db 100644
--- a/tests/cfgs/default/result/tencent_games.pcap.out
+++ b/tests/cfgs/default/result/tencent_games.pcap.out
@@ -1,6 +1,6 @@
 DPI Packets (TCP):	16	(4.00 pkts/flow)
 Confidence DPI              : 4 (flows)
-Num dissector calls: 560 (140.00 diss/flow)
+Num dissector calls: 556 (139.00 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/0/0 (insert/search/found)
 LRU cache stun:       0/0/0 (insert/search/found)
diff --git a/tests/cfgs/default/result/teso.pcapng.out b/tests/cfgs/default/result/teso.pcapng.out
index 87275de07..50fc55ea6 100644
--- a/tests/cfgs/default/result/teso.pcapng.out
+++ b/tests/cfgs/default/result/teso.pcapng.out
@@ -1,6 +1,6 @@
 DPI Packets (TCP):	8	(4.00 pkts/flow)
 Confidence DPI              : 2 (flows)
-Num dissector calls: 288 (144.00 diss/flow)
+Num dissector calls: 286 (143.00 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/0/0 (insert/search/found)
 LRU cache stun:       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 ea6fd749d..024634091 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: 1312 (218.67 diss/flow)
+Num dissector calls: 1300 (216.67 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/6/0 (insert/search/found)
 LRU cache stun:       0/0/0 (insert/search/found)
diff --git a/tests/cfgs/default/result/thrift.pcap.out b/tests/cfgs/default/result/thrift.pcap.out
index 440541a2d..a11cacee0 100644
--- a/tests/cfgs/default/result/thrift.pcap.out
+++ b/tests/cfgs/default/result/thrift.pcap.out
@@ -1,7 +1,7 @@
 DPI Packets (TCP):	4	(4.00 pkts/flow)
 DPI Packets (UDP):	1	(1.00 pkts/flow)
 Confidence DPI              : 2 (flows)
-Num dissector calls: 214 (107.00 diss/flow)
+Num dissector calls: 213 (106.50 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/0/0 (insert/search/found)
 LRU cache stun:       0/0/0 (insert/search/found)
diff --git a/tests/cfgs/default/result/tinc.pcap.out b/tests/cfgs/default/result/tinc.pcap.out
index 1fb8a6032..794298060 100644
--- a/tests/cfgs/default/result/tinc.pcap.out
+++ b/tests/cfgs/default/result/tinc.pcap.out
@@ -2,7 +2,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: 530 (132.50 diss/flow)
+Num dissector calls: 526 (131.50 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/0/0 (insert/search/found)
 LRU cache stun:       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 a68f43230..acd6c45d1 100644
--- a/tests/cfgs/default/result/tls-appdata.pcap.out
+++ b/tests/cfgs/default/result/tls-appdata.pcap.out
@@ -1,6 +1,6 @@
 DPI Packets (TCP):	17	(8.50 pkts/flow)
 Confidence DPI              : 2 (flows)
-Num dissector calls: 163 (81.50 diss/flow)
+Num dissector calls: 162 (81.00 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/0/0 (insert/search/found)
 LRU cache stun:       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 bbba73870..98a070a0d 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: 636 (18.17 diss/flow)
+Num dissector calls: 632 (18.06 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/6/0 (insert/search/found)
 LRU cache stun:       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 b32c95ab2..6fdf4dcef 100644
--- a/tests/cfgs/default/result/tls_false_positives.pcapng.out
+++ b/tests/cfgs/default/result/tls_false_positives.pcapng.out
@@ -1,6 +1,6 @@
 DPI Packets (TCP):	12	(12.00 pkts/flow)
 Confidence Unknown          : 1 (flows)
-Num dissector calls: 236 (236.00 diss/flow)
+Num dissector calls: 234 (234.00 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/3/0 (insert/search/found)
 LRU cache stun:       0/0/0 (insert/search/found)
diff --git a/tests/cfgs/default/result/tls_heur__shadowsocks-tcp.pcapng.out b/tests/cfgs/default/result/tls_heur__shadowsocks-tcp.pcapng.out
index 3452ecec1..3f4b76951 100644
--- a/tests/cfgs/default/result/tls_heur__shadowsocks-tcp.pcapng.out
+++ b/tests/cfgs/default/result/tls_heur__shadowsocks-tcp.pcapng.out
@@ -2,7 +2,7 @@ DPI Packets (TCP):	32	(10.67 pkts/flow)
 DPI Packets (UDP):	3	(3.00 pkts/flow)
 Confidence Unknown          : 1 (flows)
 Confidence DPI              : 3 (flows)
-Num dissector calls: 408 (102.00 diss/flow)
+Num dissector calls: 405 (101.25 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/3/0 (insert/search/found)
 LRU cache stun:       0/0/0 (insert/search/found)
diff --git a/tests/cfgs/default/result/tls_heur__trojan-tcp-tls.pcapng.out b/tests/cfgs/default/result/tls_heur__trojan-tcp-tls.pcapng.out
index 22717f2bd..5e15120e6 100644
--- a/tests/cfgs/default/result/tls_heur__trojan-tcp-tls.pcapng.out
+++ b/tests/cfgs/default/result/tls_heur__trojan-tcp-tls.pcapng.out
@@ -1,7 +1,7 @@
 DPI Packets (TCP):	18	(6.00 pkts/flow)
 DPI Packets (UDP):	15	(2.14 pkts/flow)
 Confidence DPI              : 10 (flows)
-Num dissector calls: 173 (17.30 diss/flow)
+Num dissector calls: 172 (17.20 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/0/0 (insert/search/found)
 LRU cache stun:       0/0/0 (insert/search/found)
diff --git a/tests/cfgs/default/result/tls_heur__vmess-tcp-tls.pcapng.out b/tests/cfgs/default/result/tls_heur__vmess-tcp-tls.pcapng.out
index a5ad70c7a..4947b8074 100644
--- a/tests/cfgs/default/result/tls_heur__vmess-tcp-tls.pcapng.out
+++ b/tests/cfgs/default/result/tls_heur__vmess-tcp-tls.pcapng.out
@@ -1,7 +1,7 @@
 DPI Packets (TCP):	18	(6.00 pkts/flow)
 DPI Packets (UDP):	15	(2.14 pkts/flow)
 Confidence DPI              : 10 (flows)
-Num dissector calls: 173 (17.30 diss/flow)
+Num dissector calls: 172 (17.20 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/0/0 (insert/search/found)
 LRU cache stun:       0/0/0 (insert/search/found)
diff --git a/tests/cfgs/default/result/tls_heur__vmess-tcp.pcapng.out b/tests/cfgs/default/result/tls_heur__vmess-tcp.pcapng.out
index e3929f2ab..0b2f49689 100644
--- a/tests/cfgs/default/result/tls_heur__vmess-tcp.pcapng.out
+++ b/tests/cfgs/default/result/tls_heur__vmess-tcp.pcapng.out
@@ -2,7 +2,7 @@ DPI Packets (TCP):	37	(12.33 pkts/flow)
 DPI Packets (UDP):	3	(3.00 pkts/flow)
 Confidence Unknown          : 1 (flows)
 Confidence DPI              : 3 (flows)
-Num dissector calls: 411 (102.75 diss/flow)
+Num dissector calls: 408 (102.00 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/3/0 (insert/search/found)
 LRU cache stun:       0/0/0 (insert/search/found)
diff --git a/tests/cfgs/default/result/tls_heur__vmess-websocket.pcapng.out b/tests/cfgs/default/result/tls_heur__vmess-websocket.pcapng.out
index 57f7c5c59..e74921618 100644
--- a/tests/cfgs/default/result/tls_heur__vmess-websocket.pcapng.out
+++ b/tests/cfgs/default/result/tls_heur__vmess-websocket.pcapng.out
@@ -1,7 +1,7 @@
 DPI Packets (TCP):	18	(6.00 pkts/flow)
 DPI Packets (UDP):	2	(2.00 pkts/flow)
 Confidence DPI              : 4 (flows)
-Num dissector calls: 182 (45.50 diss/flow)
+Num dissector calls: 181 (45.25 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/0/0 (insert/search/found)
 LRU cache stun:       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 4debb57f0..2bb5e2293 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:	1
 DPI Packets (TCP):	9	(3.00 pkts/flow)
 Confidence Match by port    : 1 (flows)
 Confidence DPI              : 2 (flows)
-Num dissector calls: 163 (54.33 diss/flow)
+Num dissector calls: 162 (54.00 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/3/0 (insert/search/found)
 LRU cache stun:       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 b33488a6a..ac47e99dc 100644
--- a/tests/cfgs/default/result/tls_missing_ch_frag.pcap.out
+++ b/tests/cfgs/default/result/tls_missing_ch_frag.pcap.out
@@ -1,6 +1,6 @@
 DPI Packets (TCP):	14	(14.00 pkts/flow)
 Confidence DPI              : 1 (flows)
-Num dissector calls: 162 (162.00 diss/flow)
+Num dissector calls: 161 (161.00 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/0/0 (insert/search/found)
 LRU cache stun:       0/0/0 (insert/search/found)
diff --git a/tests/cfgs/default/result/tls_unidirectional.pcap.out b/tests/cfgs/default/result/tls_unidirectional.pcap.out
index 8c80b68ee..0c84b9b5d 100644
--- a/tests/cfgs/default/result/tls_unidirectional.pcap.out
+++ b/tests/cfgs/default/result/tls_unidirectional.pcap.out
@@ -2,7 +2,7 @@ Guessed flow protos:	1
 
 DPI Packets (TCP):	8	(8.00 pkts/flow)
 Confidence Match by port    : 1 (flows)
-Num dissector calls: 161 (161.00 diss/flow)
+Num dissector calls: 160 (160.00 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/3/0 (insert/search/found)
 LRU cache stun:       0/0/0 (insert/search/found)
diff --git a/tests/cfgs/default/result/tls_with_huge_ch.pcapng.out b/tests/cfgs/default/result/tls_with_huge_ch.pcapng.out
index 24f2e216b..b1a4d81ea 100644
--- a/tests/cfgs/default/result/tls_with_huge_ch.pcapng.out
+++ b/tests/cfgs/default/result/tls_with_huge_ch.pcapng.out
@@ -1,6 +1,6 @@
 DPI Packets (TCP):	32	(32.00 pkts/flow)
 Confidence DPI              : 1 (flows)
-Num dissector calls: 270 (270.00 diss/flow)
+Num dissector calls: 260 (260.00 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/3/0 (insert/search/found)
 LRU cache stun:       0/0/0 (insert/search/found)
diff --git a/tests/cfgs/default/result/ultrasurf.pcap.out b/tests/cfgs/default/result/ultrasurf.pcap.out
index beb97060c..e80b9d7be 100644
--- a/tests/cfgs/default/result/ultrasurf.pcap.out
+++ b/tests/cfgs/default/result/ultrasurf.pcap.out
@@ -1,6 +1,6 @@
 DPI Packets (TCP):	13	(4.33 pkts/flow)
 Confidence DPI              : 3 (flows)
-Num dissector calls: 106 (35.33 diss/flow)
+Num dissector calls: 105 (35.00 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/0/0 (insert/search/found)
 LRU cache stun:       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 a7cd06921..0124f0be3 100644
--- a/tests/cfgs/default/result/viber.pcap.out
+++ b/tests/cfgs/default/result/viber.pcap.out
@@ -5,7 +5,7 @@ DPI Packets (UDP):	34	(2.27 pkts/flow)
 DPI Packets (other):	2	(1.00 pkts/flow)
 Confidence Match by port    : 4 (flows)
 Confidence DPI              : 26 (flows)
-Num dissector calls: 458 (15.27 diss/flow)
+Num dissector calls: 455 (15.17 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/12/0 (insert/search/found)
 LRU cache stun:       3/6/0 (insert/search/found)
diff --git a/tests/cfgs/default/result/vnc.pcap.out b/tests/cfgs/default/result/vnc.pcap.out
index 6e8d80356..840166e5e 100644
--- a/tests/cfgs/default/result/vnc.pcap.out
+++ b/tests/cfgs/default/result/vnc.pcap.out
@@ -1,6 +1,6 @@
 DPI Packets (TCP):	10	(5.00 pkts/flow)
 Confidence DPI              : 2 (flows)
-Num dissector calls: 332 (166.00 diss/flow)
+Num dissector calls: 330 (165.00 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/0/0 (insert/search/found)
 LRU cache stun:       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 9a810a725..56340c89d 100644
--- a/tests/cfgs/default/result/wa_video.pcap.out
+++ b/tests/cfgs/default/result/wa_video.pcap.out
@@ -5,7 +5,7 @@ DPI Packets (UDP):	44	(3.38 pkts/flow)
 Confidence DPI (cache)      : 2 (flows)
 Confidence DPI              : 11 (flows)
 Confidence Match by IP      : 1 (flows)
-Num dissector calls: 362 (25.86 diss/flow)
+Num dissector calls: 360 (25.71 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/3/0 (insert/search/found)
 LRU cache stun:       14/2/2 (insert/search/found)
diff --git a/tests/cfgs/default/result/wa_voice.pcap.out b/tests/cfgs/default/result/wa_voice.pcap.out
index c4dd40b97..76d18649a 100644
--- a/tests/cfgs/default/result/wa_voice.pcap.out
+++ b/tests/cfgs/default/result/wa_voice.pcap.out
@@ -4,7 +4,7 @@ DPI Packets (other):	1	(1.00 pkts/flow)
 Confidence Unknown          : 1 (flows)
 Confidence DPI (cache)      : 1 (flows)
 Confidence DPI              : 26 (flows)
-Num dissector calls: 474 (16.93 diss/flow)
+Num dissector calls: 471 (16.82 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/3/0 (insert/search/found)
 LRU cache stun:       16/3/2 (insert/search/found)
diff --git a/tests/cfgs/default/result/waze.pcap.out b/tests/cfgs/default/result/waze.pcap.out
index 736c993a0..d0b40e630 100644
--- a/tests/cfgs/default/result/waze.pcap.out
+++ b/tests/cfgs/default/result/waze.pcap.out
@@ -5,7 +5,7 @@ DPI Packets (UDP):	2	(2.00 pkts/flow)
 Confidence Unknown          : 1 (flows)
 Confidence Match by port    : 9 (flows)
 Confidence DPI              : 23 (flows)
-Num dissector calls: 356 (10.79 diss/flow)
+Num dissector calls: 354 (10.73 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/30/0 (insert/search/found)
 LRU cache stun:       0/0/0 (insert/search/found)
diff --git a/tests/cfgs/default/result/websocket.pcap.out b/tests/cfgs/default/result/websocket.pcap.out
index 9bd261b77..45d6bd64b 100644
--- a/tests/cfgs/default/result/websocket.pcap.out
+++ b/tests/cfgs/default/result/websocket.pcap.out
@@ -1,6 +1,6 @@
 DPI Packets (TCP):	1	(1.00 pkts/flow)
 Confidence DPI              : 1 (flows)
-Num dissector calls: 88 (88.00 diss/flow)
+Num dissector calls: 87 (87.00 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/0/0 (insert/search/found)
 LRU cache stun:       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 fc9a3235b..2fcdaa758 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: 344 (3.34 diss/flow)
+Num dissector calls: 343 (3.33 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/75/0 (insert/search/found)
 LRU cache stun:       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 d1becc840..8710b4981 100644
--- a/tests/cfgs/default/result/whatsapp.pcap.out
+++ b/tests/cfgs/default/result/whatsapp.pcap.out
@@ -1,6 +1,6 @@
 DPI Packets (TCP):	344	(4.00 pkts/flow)
 Confidence DPI              : 86 (flows)
-Num dissector calls: 14792 (172.00 diss/flow)
+Num dissector calls: 14620 (170.00 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/0/0 (insert/search/found)
 LRU cache stun:       0/0/0 (insert/search/found)
diff --git a/tests/cfgs/default/result/whatsapp_login_call.pcap.out b/tests/cfgs/default/result/whatsapp_login_call.pcap.out
index 3d3835e48..50feb15ca 100644
--- a/tests/cfgs/default/result/whatsapp_login_call.pcap.out
+++ b/tests/cfgs/default/result/whatsapp_login_call.pcap.out
@@ -6,7 +6,7 @@ DPI Packets (other):	1	(1.00 pkts/flow)
 Confidence Match by port    : 20 (flows)
 Confidence DPI (cache)      : 2 (flows)
 Confidence DPI              : 35 (flows)
-Num dissector calls: 375 (6.58 diss/flow)
+Num dissector calls: 373 (6.54 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/60/0 (insert/search/found)
 LRU cache stun:       46/4/4 (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 f7e9bed8f..5e62ada28 100644
--- a/tests/cfgs/default/result/whatsapp_login_chat.pcap.out
+++ b/tests/cfgs/default/result/whatsapp_login_chat.pcap.out
@@ -1,7 +1,7 @@
 DPI Packets (TCP):	17	(5.67 pkts/flow)
 DPI Packets (UDP):	7	(1.17 pkts/flow)
 Confidence DPI              : 9 (flows)
-Num dissector calls: 306 (34.00 diss/flow)
+Num dissector calls: 304 (33.78 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/0/0 (insert/search/found)
 LRU cache stun:       0/0/0 (insert/search/found)
diff --git a/tests/cfgs/default/result/whatsapp_voice_and_message.pcap.out b/tests/cfgs/default/result/whatsapp_voice_and_message.pcap.out
index 21ccedf8a..6d8f9ef11 100644
--- a/tests/cfgs/default/result/whatsapp_voice_and_message.pcap.out
+++ b/tests/cfgs/default/result/whatsapp_voice_and_message.pcap.out
@@ -1,7 +1,7 @@
 DPI Packets (TCP):	20	(4.00 pkts/flow)
 DPI Packets (UDP):	42	(5.25 pkts/flow)
 Confidence DPI              : 13 (flows)
-Num dissector calls: 393 (30.23 diss/flow)
+Num dissector calls: 388 (29.85 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/0/0 (insert/search/found)
 LRU cache stun:       16/0/0 (insert/search/found)
diff --git a/tests/cfgs/default/result/whois.pcapng.out b/tests/cfgs/default/result/whois.pcapng.out
index b2cb50b12..da3b0bb87 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: 206 (68.67 diss/flow)
+Num dissector calls: 205 (68.33 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/3/0 (insert/search/found)
 LRU cache stun:       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 c111d8abd..559e7cd31 100644
--- a/tests/cfgs/default/result/xiaomi.pcap.out
+++ b/tests/cfgs/default/result/xiaomi.pcap.out
@@ -1,6 +1,6 @@
 DPI Packets (TCP):	19	(2.71 pkts/flow)
 Confidence DPI              : 7 (flows)
-Num dissector calls: 595 (85.00 diss/flow)
+Num dissector calls: 589 (84.14 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/0/0 (insert/search/found)
 LRU cache stun:       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 d61f773c2..04ca032e0 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: 460 (230.00 diss/flow)
+Num dissector calls: 456 (228.00 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/3/0 (insert/search/found)
 LRU cache stun:       0/0/0 (insert/search/found)
diff --git a/tests/cfgs/default/result/zeromq.pcapng.out b/tests/cfgs/default/result/zeromq.pcapng.out
index cfb45e56f..750c60a30 100644
--- a/tests/cfgs/default/result/zeromq.pcapng.out
+++ b/tests/cfgs/default/result/zeromq.pcapng.out
@@ -1,6 +1,6 @@
 DPI Packets (TCP):	4	(4.00 pkts/flow)
 Confidence DPI              : 1 (flows)
-Num dissector calls: 63 (63.00 diss/flow)
+Num dissector calls: 62 (62.00 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/0/0 (insert/search/found)
 LRU cache stun:       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 93573b51a..826bc387e 100644
--- a/tests/cfgs/default/result/zoom.pcap.out
+++ b/tests/cfgs/default/result/zoom.pcap.out
@@ -5,7 +5,7 @@ DPI Packets (UDP):	43	(2.39 pkts/flow)
 DPI Packets (other):	2	(1.00 pkts/flow)
 Confidence Match by port    : 2 (flows)
 Confidence DPI              : 32 (flows)
-Num dissector calls: 1039 (30.56 diss/flow)
+Num dissector calls: 1036 (30.47 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/6/0 (insert/search/found)
 LRU cache stun:       6/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 d1c23612c..a92a6692c 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: 579 (96.50 diss/flow)
+Num dissector calls: 573 (95.50 diss/flow)
 LRU cache ookla:      4/1/1 (insert/search/found)
 LRU cache bittorrent: 0/3/0 (insert/search/found)
 LRU cache stun:       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 52c5a8096..d9b638d36 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:	2
 DPI Packets (TCP):	20	(6.67 pkts/flow)
 Confidence Match by port    : 2 (flows)
 Confidence DPI              : 1 (flows)
-Num dissector calls: 446 (148.67 diss/flow)
+Num dissector calls: 440 (146.67 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/6/0 (insert/search/found)
 LRU cache stun:       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 20ef809c5..c408b378c 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          : 9 (flows)
 Confidence Match by port    : 6 (flows)
 Confidence DPI              : 182 (flows)
-Num dissector calls: 4488 (22.78 diss/flow)
+Num dissector calls: 4484 (22.76 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/45/0 (insert/search/found)
 LRU cache stun:       0/0/0 (insert/search/found)
diff --git a/tests/cfgs/fpc/result/1kxun.pcap.out b/tests/cfgs/fpc/result/1kxun.pcap.out
index 2db690c92..2f762775f 100644
--- a/tests/cfgs/fpc/result/1kxun.pcap.out
+++ b/tests/cfgs/fpc/result/1kxun.pcap.out
@@ -9,7 +9,7 @@ FPC Confidence Unknown          : 20 (flows)
 FPC Confidence IP address       : 4 (flows)
 FPC Confidence DNS              : 13 (flows)
 FPC Confidence DPI              : 160 (flows)
-Num dissector calls: 4488 (22.78 diss/flow)
+Num dissector calls: 4484 (22.76 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/45/0 (insert/search/found)
 LRU cache stun:       0/0/0 (insert/search/found)
diff --git a/tests/cfgs/fpc_disabled/result/teams.pcap.out b/tests/cfgs/fpc_disabled/result/teams.pcap.out
index 027acd2ee..4aed65446 100644
--- a/tests/cfgs/fpc_disabled/result/teams.pcap.out
+++ b/tests/cfgs/fpc_disabled/result/teams.pcap.out
@@ -7,7 +7,7 @@ Confidence Unknown          : 1 (flows)
 Confidence Match by port    : 2 (flows)
 Confidence DPI (partial)    : 4 (flows)
 Confidence DPI              : 76 (flows)
-Num dissector calls: 526 (6.34 diss/flow)
+Num dissector calls: 524 (6.31 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/9/0 (insert/search/found)
 LRU cache stun:       30/0/0 (insert/search/found)
diff --git a/tests/cfgs/guess_ip_before_port_enabled/result/1kxun.pcap.out b/tests/cfgs/guess_ip_before_port_enabled/result/1kxun.pcap.out
index f3ad5d98d..2c48d7048 100644
--- a/tests/cfgs/guess_ip_before_port_enabled/result/1kxun.pcap.out
+++ b/tests/cfgs/guess_ip_before_port_enabled/result/1kxun.pcap.out
@@ -6,7 +6,7 @@ Confidence Unknown          : 9 (flows)
 Confidence Match by port    : 4 (flows)
 Confidence DPI              : 182 (flows)
 Confidence Match by IP      : 2 (flows)
-Num dissector calls: 4488 (22.78 diss/flow)
+Num dissector calls: 4484 (22.76 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/45/0 (insert/search/found)
 LRU cache stun:       0/0/0 (insert/search/found)
diff --git a/tests/cfgs/ip_lists_disable/result/1kxun.pcap.out b/tests/cfgs/ip_lists_disable/result/1kxun.pcap.out
index ae3b67336..ba465d670 100644
--- a/tests/cfgs/ip_lists_disable/result/1kxun.pcap.out
+++ b/tests/cfgs/ip_lists_disable/result/1kxun.pcap.out
@@ -5,7 +5,7 @@ DPI Packets (UDP):	120	(1.21 pkts/flow)
 Confidence Unknown          : 9 (flows)
 Confidence Match by port    : 6 (flows)
 Confidence DPI              : 182 (flows)
-Num dissector calls: 4488 (22.78 diss/flow)
+Num dissector calls: 4484 (22.76 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/45/0 (insert/search/found)
 LRU cache stun:       0/0/0 (insert/search/found)
diff --git a/tests/cfgs/monitoring/result/s7comm.pcap.out b/tests/cfgs/monitoring/result/s7comm.pcap.out
index 5f823fd15..b290b2516 100644
--- a/tests/cfgs/monitoring/result/s7comm.pcap.out
+++ b/tests/cfgs/monitoring/result/s7comm.pcap.out
@@ -1,6 +1,6 @@
 DPI Packets (TCP):	193	(48.25 pkts/flow)
 Confidence DPI              : 4 (flows)
-Num dissector calls: 660 (165.00 diss/flow)
+Num dissector calls: 653 (163.25 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/0/0 (insert/search/found)
 LRU cache stun:       0/0/0 (insert/search/found)
diff --git a/tests/cfgs/monitoring/result/teams.pcap.out b/tests/cfgs/monitoring/result/teams.pcap.out
index e947da909..e3462bfc3 100644
--- a/tests/cfgs/monitoring/result/teams.pcap.out
+++ b/tests/cfgs/monitoring/result/teams.pcap.out
@@ -7,7 +7,7 @@ Confidence Unknown          : 1 (flows)
 Confidence Match by port    : 2 (flows)
 Confidence DPI (partial)    : 4 (flows)
 Confidence DPI              : 76 (flows)
-Num dissector calls: 526 (6.34 diss/flow)
+Num dissector calls: 524 (6.31 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/9/0 (insert/search/found)
 LRU cache stun:       32/0/0 (insert/search/found)
diff --git a/tests/cfgs/monitoring/result/telegram_videocall.pcapng.out b/tests/cfgs/monitoring/result/telegram_videocall.pcapng.out
index ac5b1dc4e..6dba52108 100644
--- a/tests/cfgs/monitoring/result/telegram_videocall.pcapng.out
+++ b/tests/cfgs/monitoring/result/telegram_videocall.pcapng.out
@@ -7,7 +7,7 @@ Confidence Match by port    : 1 (flows)
 Confidence DPI (cache)      : 10 (flows)
 Confidence DPI              : 15 (flows)
 Confidence Match by IP      : 8 (flows)
-Num dissector calls: 752 (22.12 diss/flow)
+Num dissector calls: 743 (21.85 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/6/0 (insert/search/found)
 LRU cache stun:       46/49/10 (insert/search/found)
diff --git a/tests/cfgs/ndpireader_conf_file/result/openvpn_obfuscated.pcapng.out b/tests/cfgs/ndpireader_conf_file/result/openvpn_obfuscated.pcapng.out
index 202d20f86..d63d5ce85 100644
--- a/tests/cfgs/ndpireader_conf_file/result/openvpn_obfuscated.pcapng.out
+++ b/tests/cfgs/ndpireader_conf_file/result/openvpn_obfuscated.pcapng.out
@@ -1,7 +1,7 @@
 DPI Packets (TCP):	59	(29.50 pkts/flow)
 DPI Packets (UDP):	10	(10.00 pkts/flow)
 Confidence DPI (aggressive) : 3 (flows)
-Num dissector calls: 745 (248.33 diss/flow)
+Num dissector calls: 733 (244.33 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/9/0 (insert/search/found)
 LRU cache stun:       0/0/0 (insert/search/found)
diff --git a/tests/cfgs/ndpireader_conf_file/result/shadowsocks.pcap.out b/tests/cfgs/ndpireader_conf_file/result/shadowsocks.pcap.out
index 0adebfab7..beeaea1b6 100644
--- a/tests/cfgs/ndpireader_conf_file/result/shadowsocks.pcap.out
+++ b/tests/cfgs/ndpireader_conf_file/result/shadowsocks.pcap.out
@@ -1,7 +1,7 @@
 DPI Packets (TCP):	21	(10.50 pkts/flow)
 Confidence Unknown          : 1 (flows)
 Confidence DPI              : 1 (flows)
-Num dissector calls: 383 (191.50 diss/flow)
+Num dissector calls: 380 (190.00 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/3/0 (insert/search/found)
 LRU cache stun:       0/0/0 (insert/search/found)
diff --git a/tests/cfgs/openvpn_heuristic_enabled/result/openvpn_obfuscated.pcapng.out b/tests/cfgs/openvpn_heuristic_enabled/result/openvpn_obfuscated.pcapng.out
index b828c7ce7..529708c9e 100644
--- a/tests/cfgs/openvpn_heuristic_enabled/result/openvpn_obfuscated.pcapng.out
+++ b/tests/cfgs/openvpn_heuristic_enabled/result/openvpn_obfuscated.pcapng.out
@@ -1,7 +1,7 @@
 DPI Packets (TCP):	59	(29.50 pkts/flow)
 DPI Packets (UDP):	10	(10.00 pkts/flow)
 Confidence DPI (aggressive) : 3 (flows)
-Num dissector calls: 730 (243.33 diss/flow)
+Num dissector calls: 718 (239.33 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/9/0 (insert/search/found)
 LRU cache stun:       0/0/0 (insert/search/found)
diff --git a/tests/cfgs/plugins/result/plugin.pcapng.out b/tests/cfgs/plugins/result/plugin.pcapng.out
index 554433c40..87899d2a1 100644
--- a/tests/cfgs/plugins/result/plugin.pcapng.out
+++ b/tests/cfgs/plugins/result/plugin.pcapng.out
@@ -1,6 +1,6 @@
 DPI Packets (TCP):	4	(4.00 pkts/flow)
 Confidence DPI              : 1 (flows)
-Num dissector calls: 162 (162.00 diss/flow)
+Num dissector calls: 161 (161.00 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/0/0 (insert/search/found)
 LRU cache stun:       0/0/0 (insert/search/found)
diff --git a/tests/cfgs/stun_only_peer_address_enabled/result/telegram_videocall.pcapng.out b/tests/cfgs/stun_only_peer_address_enabled/result/telegram_videocall.pcapng.out
index 67982f290..71189a963 100644
--- a/tests/cfgs/stun_only_peer_address_enabled/result/telegram_videocall.pcapng.out
+++ b/tests/cfgs/stun_only_peer_address_enabled/result/telegram_videocall.pcapng.out
@@ -7,7 +7,7 @@ Confidence Match by port    : 1 (flows)
 Confidence DPI (cache)      : 10 (flows)
 Confidence DPI              : 15 (flows)
 Confidence Match by IP      : 8 (flows)
-Num dissector calls: 752 (22.12 diss/flow)
+Num dissector calls: 743 (21.85 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/6/0 (insert/search/found)
 LRU cache stun:       38/49/10 (insert/search/found)
diff --git a/tests/cfgs/tls_analysis/result/ookla.pcap.out b/tests/cfgs/tls_analysis/result/ookla.pcap.out
index eb6e6e877..42d9124f6 100644
--- a/tests/cfgs/tls_analysis/result/ookla.pcap.out
+++ b/tests/cfgs/tls_analysis/result/ookla.pcap.out
@@ -4,7 +4,7 @@ DPI Packets (TCP):	51	(8.50 pkts/flow)
 Confidence DPI (partial cache): 1 (flows)
 Confidence DPI              : 4 (flows)
 Confidence DPI (aggressive) : 1 (flows)
-Num dissector calls: 584 (97.33 diss/flow)
+Num dissector calls: 578 (96.33 diss/flow)
 LRU cache ookla:      4/2/2 (insert/search/found)
 LRU cache bittorrent: 0/3/0 (insert/search/found)
 LRU cache stun:       0/0/0 (insert/search/found)
diff --git a/tests/cfgs/tls_analysis/result/tls-appdata.pcap.out b/tests/cfgs/tls_analysis/result/tls-appdata.pcap.out
index 600747fc3..100f183d6 100644
--- a/tests/cfgs/tls_analysis/result/tls-appdata.pcap.out
+++ b/tests/cfgs/tls_analysis/result/tls-appdata.pcap.out
@@ -1,6 +1,6 @@
 DPI Packets (TCP):	38	(19.00 pkts/flow)
 Confidence DPI              : 2 (flows)
-Num dissector calls: 163 (81.50 diss/flow)
+Num dissector calls: 162 (81.00 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/0/0 (insert/search/found)
 LRU cache stun:       0/0/0 (insert/search/found)
diff --git a/tests/cfgs/tls_analysis/result/tls_heur__trojan-tcp-tls.pcapng.out b/tests/cfgs/tls_analysis/result/tls_heur__trojan-tcp-tls.pcapng.out
index 503ddc470..5c39cfde5 100644
--- a/tests/cfgs/tls_analysis/result/tls_heur__trojan-tcp-tls.pcapng.out
+++ b/tests/cfgs/tls_analysis/result/tls_heur__trojan-tcp-tls.pcapng.out
@@ -2,7 +2,7 @@ DPI Packets (TCP):	46	(15.33 pkts/flow)
 DPI Packets (UDP):	15	(2.14 pkts/flow)
 Confidence DPI              : 9 (flows)
 Confidence DPI (aggressive) : 1 (flows)
-Num dissector calls: 173 (17.30 diss/flow)
+Num dissector calls: 172 (17.20 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/0/0 (insert/search/found)
 LRU cache stun:       0/0/0 (insert/search/found)
diff --git a/tests/cfgs/tls_analysis/result/tls_heur__vmess-tcp-tls.pcapng.out b/tests/cfgs/tls_analysis/result/tls_heur__vmess-tcp-tls.pcapng.out
index 6713968cf..dbf9b5e00 100644
--- a/tests/cfgs/tls_analysis/result/tls_heur__vmess-tcp-tls.pcapng.out
+++ b/tests/cfgs/tls_analysis/result/tls_heur__vmess-tcp-tls.pcapng.out
@@ -2,7 +2,7 @@ DPI Packets (TCP):	39	(13.00 pkts/flow)
 DPI Packets (UDP):	15	(2.14 pkts/flow)
 Confidence DPI              : 9 (flows)
 Confidence DPI (aggressive) : 1 (flows)
-Num dissector calls: 173 (17.30 diss/flow)
+Num dissector calls: 172 (17.20 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/0/0 (insert/search/found)
 LRU cache stun:       0/0/0 (insert/search/found)
diff --git a/tests/cfgs/tls_heuristics_enabled/result/tls_heur__shadowsocks-tcp.pcapng.out b/tests/cfgs/tls_heuristics_enabled/result/tls_heur__shadowsocks-tcp.pcapng.out
index 959b1d455..87fb84f16 100644
--- a/tests/cfgs/tls_heuristics_enabled/result/tls_heur__shadowsocks-tcp.pcapng.out
+++ b/tests/cfgs/tls_heuristics_enabled/result/tls_heur__shadowsocks-tcp.pcapng.out
@@ -2,7 +2,7 @@ DPI Packets (TCP):	27	(9.00 pkts/flow)
 DPI Packets (UDP):	3	(3.00 pkts/flow)
 Confidence DPI              : 3 (flows)
 Confidence DPI (aggressive) : 1 (flows)
-Num dissector calls: 407 (101.75 diss/flow)
+Num dissector calls: 404 (101.00 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/3/0 (insert/search/found)
 LRU cache stun:       0/0/0 (insert/search/found)
diff --git a/tests/cfgs/tls_heuristics_enabled/result/tls_heur__trojan-tcp-tls.pcapng.out b/tests/cfgs/tls_heuristics_enabled/result/tls_heur__trojan-tcp-tls.pcapng.out
index ddf899074..1567b5055 100644
--- a/tests/cfgs/tls_heuristics_enabled/result/tls_heur__trojan-tcp-tls.pcapng.out
+++ b/tests/cfgs/tls_heuristics_enabled/result/tls_heur__trojan-tcp-tls.pcapng.out
@@ -2,7 +2,7 @@ DPI Packets (TCP):	35	(11.67 pkts/flow)
 DPI Packets (UDP):	15	(2.14 pkts/flow)
 Confidence DPI              : 9 (flows)
 Confidence DPI (aggressive) : 1 (flows)
-Num dissector calls: 173 (17.30 diss/flow)
+Num dissector calls: 172 (17.20 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/0/0 (insert/search/found)
 LRU cache stun:       0/0/0 (insert/search/found)
diff --git a/tests/cfgs/tls_heuristics_enabled/result/tls_heur__vmess-tcp-tls.pcapng.out b/tests/cfgs/tls_heuristics_enabled/result/tls_heur__vmess-tcp-tls.pcapng.out
index 802343978..f250b2b4e 100644
--- a/tests/cfgs/tls_heuristics_enabled/result/tls_heur__vmess-tcp-tls.pcapng.out
+++ b/tests/cfgs/tls_heuristics_enabled/result/tls_heur__vmess-tcp-tls.pcapng.out
@@ -2,7 +2,7 @@ DPI Packets (TCP):	36	(12.00 pkts/flow)
 DPI Packets (UDP):	15	(2.14 pkts/flow)
 Confidence DPI              : 9 (flows)
 Confidence DPI (aggressive) : 1 (flows)
-Num dissector calls: 173 (17.30 diss/flow)
+Num dissector calls: 172 (17.20 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/0/0 (insert/search/found)
 LRU cache stun:       0/0/0 (insert/search/found)
diff --git a/tests/cfgs/tls_heuristics_enabled/result/tls_heur__vmess-tcp.pcapng.out b/tests/cfgs/tls_heuristics_enabled/result/tls_heur__vmess-tcp.pcapng.out
index 72ca7f9e4..a95258529 100644
--- a/tests/cfgs/tls_heuristics_enabled/result/tls_heur__vmess-tcp.pcapng.out
+++ b/tests/cfgs/tls_heuristics_enabled/result/tls_heur__vmess-tcp.pcapng.out
@@ -2,7 +2,7 @@ DPI Packets (TCP):	35	(11.67 pkts/flow)
 DPI Packets (UDP):	3	(3.00 pkts/flow)
 Confidence DPI              : 3 (flows)
 Confidence DPI (aggressive) : 1 (flows)
-Num dissector calls: 418 (104.50 diss/flow)
+Num dissector calls: 415 (103.75 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/3/0 (insert/search/found)
 LRU cache stun:       0/0/0 (insert/search/found)
diff --git a/tests/cfgs/tls_heuristics_enabled/result/tls_heur__vmess-websocket.pcapng.out b/tests/cfgs/tls_heuristics_enabled/result/tls_heur__vmess-websocket.pcapng.out
index 1c9b0e5c0..60baea087 100644
--- a/tests/cfgs/tls_heuristics_enabled/result/tls_heur__vmess-websocket.pcapng.out
+++ b/tests/cfgs/tls_heuristics_enabled/result/tls_heur__vmess-websocket.pcapng.out
@@ -2,7 +2,7 @@ DPI Packets (TCP):	31	(10.33 pkts/flow)
 DPI Packets (UDP):	2	(2.00 pkts/flow)
 Confidence DPI              : 3 (flows)
 Confidence DPI (aggressive) : 1 (flows)
-Num dissector calls: 182 (45.50 diss/flow)
+Num dissector calls: 181 (45.25 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/0/0 (insert/search/found)
 LRU cache stun:       0/0/0 (insert/search/found)
diff --git a/tests/cfgs/zoom_extra_dissection/result/zoom.pcap.out b/tests/cfgs/zoom_extra_dissection/result/zoom.pcap.out
index ca4e0b4b1..88d1344f3 100644
--- a/tests/cfgs/zoom_extra_dissection/result/zoom.pcap.out
+++ b/tests/cfgs/zoom_extra_dissection/result/zoom.pcap.out
@@ -5,7 +5,7 @@ DPI Packets (UDP):	301	(16.72 pkts/flow)
 DPI Packets (other):	2	(1.00 pkts/flow)
 Confidence Match by port    : 2 (flows)
 Confidence DPI              : 32 (flows)
-Num dissector calls: 1039 (30.56 diss/flow)
+Num dissector calls: 1036 (30.47 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/6/0 (insert/search/found)
 LRU cache stun:       6/0/0 (insert/search/found)
diff --git a/windows/nDPI.vcxproj b/windows/nDPI.vcxproj
index 497dce597..046c26bd4 100644
--- a/windows/nDPI.vcxproj
+++ b/windows/nDPI.vcxproj
@@ -260,7 +260,6 @@
     <ClCompile Include="..\src\lib\protocols\http.c" />
     <ClCompile Include="..\src\lib\protocols\http2.c" />
     <ClCompile Include="..\src\lib\protocols\iax.c" />
-    <ClCompile Include="..\src\lib\protocols\icecast.c" />
     <ClCompile Include="..\src\lib\protocols\ipp.c" />
     <ClCompile Include="..\src\lib\protocols\irc.c" />
     <ClCompile Include="..\src\lib\protocols\jabber.c" />
diff --git a/windows/nDPI.vcxproj.filters b/windows/nDPI.vcxproj.filters
index 368c62c74..8cb58bfaa 100644
--- a/windows/nDPI.vcxproj.filters
+++ b/windows/nDPI.vcxproj.filters
@@ -33,7 +33,6 @@
     <ClCompile Include="..\src\lib\protocols\http.c" />
     <ClCompile Include="..\src\lib\protocols\http2.c" />
     <ClCompile Include="..\src\lib\protocols\iax.c" />
-    <ClCompile Include="..\src\lib\protocols\icecast.c" />
     <ClCompile Include="..\src\lib\protocols\ipp.c" />
     <ClCompile Include="..\src\lib\protocols\irc.c" />
     <ClCompile Include="..\src\lib\protocols\jabber.c" />