Hangout: avoid useless lookups in the protocol tree (#1755)

We already performed exactly these lookups in the generic code to
populate `flow->guessed_protocol_id_by_ip`: use it!

This code probably needs a deeper review, since it is basicaly a simple
matching on ip + port.

121 files changed, 126 insertions, 152 deletions

diff --git a/src/lib/protocols/hangout.c b/src/lib/protocols/hangout.c
index 70b1baba3..ebc978420 100644
--- a/src/lib/protocols/hangout.c
+++ b/src/lib/protocols/hangout.c
@@ -53,32 +53,6 @@ static u_int8_t isHangoutTCPPort(u_int16_t port) {
     return(0);
 }
 
-/* ******************************************* */
-
-static u_int8_t google_ptree_match(struct ndpi_detection_module_struct *ndpi_struct, struct in_addr *pin) {
-  return((ndpi_network_ptree_match(ndpi_struct, pin) == NDPI_PROTOCOL_GOOGLE) ? 1 : 0);
-}
-
-/* ******************************************* */
-
-static u_int8_t is_google_flow(struct ndpi_detection_module_struct *ndpi_struct,
-			       struct ndpi_flow_struct *flow) {
-  struct ndpi_packet_struct *packet = &ndpi_struct->packet;
-  
-  if(packet->iph) {
-    struct in_addr saddr, daddr;
-
-    saddr.s_addr = packet->iph->saddr, daddr.s_addr = packet->iph->daddr;
-    
-    if(google_ptree_match(ndpi_struct, &saddr)
-       || google_ptree_match(ndpi_struct, &daddr)) {
-      return(1);
-    }
-  }
-
-  return(0);
-}
-
 /* ***************************************************************** */
 
 void ndpi_search_hangout(struct ndpi_detection_module_struct *ndpi_struct,
@@ -87,13 +61,13 @@ void ndpi_search_hangout(struct ndpi_detection_module_struct *ndpi_struct,
 
   NDPI_LOG_DBG(ndpi_struct, "search Hangout\n");
 
-  if((packet->payload_packet_len > 24) && is_google_flow(ndpi_struct, flow)) {
+  if((packet->payload_packet_len > 24) && flow->guessed_protocol_id_by_ip == NDPI_PROTOCOL_GOOGLE) {
     int matched_src = 0;
     if(
        ((packet->udp != NULL) && (matched_src = isHangoutUDPPort(ntohs(packet->udp->source))
 				  || isHangoutUDPPort(ntohs(packet->udp->dest))))
        ||
-       ((packet->tcp != NULL) && (isHangoutTCPPort(ntohs(packet->tcp->source))
+       ((packet->tcp != NULL) && (matched_src = isHangoutTCPPort(ntohs(packet->tcp->source))
 				  || isHangoutTCPPort(ntohs(packet->tcp->dest))))) {
       NDPI_LOG_INFO(ndpi_struct, "found Hangout\n");
 
@@ -125,7 +99,7 @@ void init_hangout_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_
   ndpi_set_bitmask_protocol_detection("GoogleHangout", ndpi_struct, detection_bitmask, *id,
 				      NDPI_PROTOCOL_HANGOUT_DUO,
 				      ndpi_search_hangout,
-				      NDPI_SELECTION_BITMASK_PROTOCOL_TCP_OR_UDP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION, /* TODO: IPv6? */
+				      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_OR_UDP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION,
 				      SAVE_DETECTION_BITMASK_AS_UNKNOWN,
 				      ADD_TO_DETECTION_BITMASK);
 
diff --git a/tests/result/1kxun.pcap.out b/tests/result/1kxun.pcap.out
index f219309af..3e20cc119 100644
--- a/tests/result/1kxun.pcap.out
+++ b/tests/result/1kxun.pcap.out
@@ -5,7 +5,7 @@ DPI Packets (UDP):	120	(1.21 pkts/flow)
 Confidence Unknown          : 14 (flows)
 Confidence Match by port    : 6 (flows)
 Confidence DPI              : 177 (flows)
-Num dissector calls: 4789 (24.31 diss/flow)
+Num dissector calls: 4793 (24.33 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/45/0 (insert/search/found)
 LRU cache zoom:       0/0/0 (insert/search/found)
@@ -20,7 +20,7 @@ Automa risk mask:     18/0 (search/found)
 Automa common alpns:  0/0 (search/found)
 Patricia risk mask:   252/0 (search/found)
 Patricia risk:        6/0 (search/found)
-Patricia protocols:   359/38 (search/found)
+Patricia protocols:   337/37 (search/found)
 
 Unknown	24	6428	14
 HTTP	780	1058113	34
diff --git a/tests/result/443-chrome.pcap.out b/tests/result/443-chrome.pcap.out
index 849a646d9..ceb9023b2 100644
--- a/tests/result/443-chrome.pcap.out
+++ b/tests/result/443-chrome.pcap.out
@@ -17,7 +17,7 @@ Automa risk mask:     0/0 (search/found)
 Automa common alpns:  0/0 (search/found)
 Patricia risk mask:   2/0 (search/found)
 Patricia risk:        0/0 (search/found)
-Patricia protocols:   4/0 (search/found)
+Patricia protocols:   2/0 (search/found)
 
 TLS	1	1506	1
 
diff --git a/tests/result/443-opvn.pcap.out b/tests/result/443-opvn.pcap.out
index 7c46efb82..fa15fd19d 100644
--- a/tests/result/443-opvn.pcap.out
+++ b/tests/result/443-opvn.pcap.out
@@ -17,7 +17,7 @@ Automa risk mask:     0/0 (search/found)
 Automa common alpns:  0/0 (search/found)
 Patricia risk mask:   2/0 (search/found)
 Patricia risk:        0/0 (search/found)
-Patricia protocols:   4/0 (search/found)
+Patricia protocols:   2/0 (search/found)
 
 OpenVPN	46	11573	1
 
diff --git a/tests/result/4in4tunnel.pcap.out b/tests/result/4in4tunnel.pcap.out
index 9ed6f69c9..1f21a48e2 100644
--- a/tests/result/4in4tunnel.pcap.out
+++ b/tests/result/4in4tunnel.pcap.out
@@ -17,7 +17,7 @@ Automa risk mask:     0/0 (search/found)
 Automa common alpns:  0/0 (search/found)
 Patricia risk mask:   2/0 (search/found)
 Patricia risk:        0/0 (search/found)
-Patricia protocols:   4/0 (search/found)
+Patricia protocols:   2/0 (search/found)
 
 Unknown	5	850	1
 
diff --git a/tests/result/6in6tunnel.pcap.out b/tests/result/6in6tunnel.pcap.out
index b889bed0a..e427f96a5 100644
--- a/tests/result/6in6tunnel.pcap.out
+++ b/tests/result/6in6tunnel.pcap.out
@@ -2,7 +2,7 @@ Guessed flow protos:	1
 
 DPI Packets (UDP):	2	(2.00 pkts/flow)
 Confidence Unknown          : 1 (flows)
-Num dissector calls: 121 (121.00 diss/flow)
+Num dissector calls: 122 (122.00 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/3/0 (insert/search/found)
 LRU cache zoom:       0/0/0 (insert/search/found)
diff --git a/tests/result/KakaoTalk_chat.pcap.out b/tests/result/KakaoTalk_chat.pcap.out
index 897cc70c2..dad470dcb 100644
--- a/tests/result/KakaoTalk_chat.pcap.out
+++ b/tests/result/KakaoTalk_chat.pcap.out
@@ -20,7 +20,7 @@ Automa risk mask:     3/0 (search/found)
 Automa common alpns:  0/0 (search/found)
 Patricia risk mask:   78/0 (search/found)
 Patricia risk:        0/0 (search/found)
-Patricia protocols:   67/15 (search/found)
+Patricia protocols:   63/15 (search/found)
 
 DNS	2	217	1
 HTTP	15	840	2
diff --git a/tests/result/KakaoTalk_talk.pcap.out b/tests/result/KakaoTalk_talk.pcap.out
index d84a51255..90ca9ce27 100644
--- a/tests/result/KakaoTalk_talk.pcap.out
+++ b/tests/result/KakaoTalk_talk.pcap.out
@@ -20,7 +20,7 @@ Automa risk mask:     1/0 (search/found)
 Automa common alpns:  0/0 (search/found)
 Patricia risk mask:   44/0 (search/found)
 Patricia risk:        0/0 (search/found)
-Patricia protocols:   39/12 (search/found)
+Patricia protocols:   33/11 (search/found)
 
 Unknown	4	396	1
 HTTP	5	280	1
diff --git a/tests/result/Oscar.pcap.out b/tests/result/Oscar.pcap.out
index b61fb6154..3e2a8f205 100644
--- a/tests/result/Oscar.pcap.out
+++ b/tests/result/Oscar.pcap.out
@@ -17,7 +17,7 @@ Automa risk mask:     0/0 (search/found)
 Automa common alpns:  0/0 (search/found)
 Patricia risk mask:   2/0 (search/found)
 Patricia risk:        0/0 (search/found)
-Patricia protocols:   4/0 (search/found)
+Patricia protocols:   2/0 (search/found)
 
 TLS	71	9386	1
 
diff --git a/tests/result/activision.pcap.out b/tests/result/activision.pcap.out
index 36a653c2b..01588122b 100644
--- a/tests/result/activision.pcap.out
+++ b/tests/result/activision.pcap.out
@@ -17,7 +17,7 @@ Automa risk mask:     0/0 (search/found)
 Automa common alpns:  0/0 (search/found)
 Patricia risk mask:   8/0 (search/found)
 Patricia risk:        0/0 (search/found)
-Patricia protocols:   16/0 (search/found)
+Patricia protocols:   8/0 (search/found)
 
 Activision	60	3904	4
 
diff --git a/tests/result/agora-sd-rtn.pcap.out b/tests/result/agora-sd-rtn.pcap.out
index 8eba12629..cea4d531a 100644
--- a/tests/result/agora-sd-rtn.pcap.out
+++ b/tests/result/agora-sd-rtn.pcap.out
@@ -17,7 +17,7 @@ Automa risk mask:     0/0 (search/found)
 Automa common alpns:  0/0 (search/found)
 Patricia risk mask:   52/0 (search/found)
 Patricia risk:        0/0 (search/found)
-Patricia protocols:   104/0 (search/found)
+Patricia protocols:   52/0 (search/found)
 
 SD-RTN	403	112365	26
 
diff --git a/tests/result/amqp.pcap.out b/tests/result/amqp.pcap.out
index 8f5478864..eba04e643 100644
--- a/tests/result/amqp.pcap.out
+++ b/tests/result/amqp.pcap.out
@@ -17,7 +17,7 @@ Automa risk mask:     0/0 (search/found)
 Automa common alpns:  0/0 (search/found)
 Patricia risk mask:   6/0 (search/found)
 Patricia risk:        0/0 (search/found)
-Patricia protocols:   12/0 (search/found)
+Patricia protocols:   6/0 (search/found)
 
 AMQP	160	23514	3
 
diff --git a/tests/result/avast.pcap.out b/tests/result/avast.pcap.out
index c11a7357b..f19db05b3 100644
--- a/tests/result/avast.pcap.out
+++ b/tests/result/avast.pcap.out
@@ -17,7 +17,7 @@ Automa risk mask:     0/0 (search/found)
 Automa common alpns:  0/0 (search/found)
 Patricia risk mask:   20/0 (search/found)
 Patricia risk:        0/0 (search/found)
-Patricia protocols:   30/20 (search/found)
+Patricia protocols:   10/10 (search/found)
 
 AVAST	142	9433	10
 
diff --git a/tests/result/avast_securedns.pcapng.out b/tests/result/avast_securedns.pcapng.out
index 7e93ca98e..8f3ebd59a 100644
--- a/tests/result/avast_securedns.pcapng.out
+++ b/tests/result/avast_securedns.pcapng.out
@@ -17,7 +17,7 @@ Automa risk mask:     0/0 (search/found)
 Automa common alpns:  0/0 (search/found)
 Patricia risk mask:   78/0 (search/found)
 Patricia risk:        0/0 (search/found)
-Patricia protocols:   156/0 (search/found)
+Patricia protocols:   78/0 (search/found)
 
 AVASTSecureDNS	77	11443	39
 
diff --git a/tests/result/bittorrent.pcap.out b/tests/result/bittorrent.pcap.out
index 619dd8dad..765031c05 100644
--- a/tests/result/bittorrent.pcap.out
+++ b/tests/result/bittorrent.pcap.out
@@ -17,7 +17,7 @@ Automa risk mask:     0/0 (search/found)
 Automa common alpns:  0/0 (search/found)
 Patricia risk mask:   48/0 (search/found)
 Patricia risk:        0/0 (search/found)
-Patricia protocols:   92/0 (search/found)
+Patricia protocols:   48/0 (search/found)
 
 BitTorrent	299	305728	24
 
diff --git a/tests/result/bittorrent_utp.pcap.out b/tests/result/bittorrent_utp.pcap.out
index 0a56ea91c..4a6259d3b 100644
--- a/tests/result/bittorrent_utp.pcap.out
+++ b/tests/result/bittorrent_utp.pcap.out
@@ -17,7 +17,7 @@ Automa risk mask:     0/0 (search/found)
 Automa common alpns:  0/0 (search/found)
 Patricia risk mask:   2/0 (search/found)
 Patricia risk:        0/0 (search/found)
-Patricia protocols:   4/0 (search/found)
+Patricia protocols:   2/0 (search/found)
 
 BitTorrent	86	41489	1
 
diff --git a/tests/result/cloudflare-warp.pcap.out b/tests/result/cloudflare-warp.pcap.out
index 3f6f39916..9792a8246 100644
--- a/tests/result/cloudflare-warp.pcap.out
+++ b/tests/result/cloudflare-warp.pcap.out
@@ -19,7 +19,7 @@ Automa risk mask:     1/0 (search/found)
 Automa common alpns:  3/3 (search/found)
 Patricia risk mask:   16/0 (search/found)
 Patricia risk:        0/0 (search/found)
-Patricia protocols:   11/7 (search/found)
+Patricia protocols:   9/7 (search/found)
 
 Unknown	3	182	1
 Jabber	11	890	1
diff --git a/tests/result/collectd.pcap.out b/tests/result/collectd.pcap.out
index fe1e6c1da..73cb77f0a 100644
--- a/tests/result/collectd.pcap.out
+++ b/tests/result/collectd.pcap.out
@@ -18,7 +18,7 @@ Automa risk mask:     0/0 (search/found)
 Automa common alpns:  0/0 (search/found)
 Patricia risk mask:   12/0 (search/found)
 Patricia risk:        0/0 (search/found)
-Patricia protocols:   22/0 (search/found)
+Patricia protocols:   16/0 (search/found)
 
 collectd	81	109386	8
 
diff --git a/tests/result/crynet.pcap.out b/tests/result/crynet.pcap.out
index be4e5f8b1..df8f55a2c 100644
--- a/tests/result/crynet.pcap.out
+++ b/tests/result/crynet.pcap.out
@@ -17,7 +17,7 @@ Automa risk mask:     0/0 (search/found)
 Automa common alpns:  0/0 (search/found)
 Patricia risk mask:   8/0 (search/found)
 Patricia risk:        0/0 (search/found)
-Patricia protocols:   16/0 (search/found)
+Patricia protocols:   8/0 (search/found)
 
 CryNetwork	60	8045	4
 
diff --git a/tests/result/dhcp-fuzz.pcapng.out b/tests/result/dhcp-fuzz.pcapng.out
index bd142dacb..ee2d2de42 100644
--- a/tests/result/dhcp-fuzz.pcapng.out
+++ b/tests/result/dhcp-fuzz.pcapng.out
@@ -17,7 +17,7 @@ Automa risk mask:     0/0 (search/found)
 Automa common alpns:  0/0 (search/found)
 Patricia risk mask:   0/0 (search/found)
 Patricia risk:        0/0 (search/found)
-Patricia protocols:   4/0 (search/found)
+Patricia protocols:   2/0 (search/found)
 
 DHCP	1	342	1
 
diff --git a/tests/result/discord.pcap.out b/tests/result/discord.pcap.out
index 5c818f605..c3ef5369a 100644
--- a/tests/result/discord.pcap.out
+++ b/tests/result/discord.pcap.out
@@ -18,7 +18,7 @@ Automa risk mask:     1/0 (search/found)
 Automa common alpns:  2/2 (search/found)
 Patricia risk mask:   68/0 (search/found)
 Patricia risk:        0/0 (search/found)
-Patricia protocols:   88/61 (search/found)
+Patricia protocols:   34/34 (search/found)
 
 Discord	411	98410	34
 
diff --git a/tests/result/dnscrypt-v1-and-resolver-pings.pcap.out b/tests/result/dnscrypt-v1-and-resolver-pings.pcap.out
index ee12ac58a..b6b4b01ca 100644
--- a/tests/result/dnscrypt-v1-and-resolver-pings.pcap.out
+++ b/tests/result/dnscrypt-v1-and-resolver-pings.pcap.out
@@ -17,7 +17,7 @@ Automa risk mask:     0/0 (search/found)
 Automa common alpns:  0/0 (search/found)
 Patricia risk mask:   490/0 (search/found)
 Patricia risk:        0/0 (search/found)
-Patricia protocols:   974/12 (search/found)
+Patricia protocols:   484/6 (search/found)
 
 DNScrypt	488	309562	245
 
diff --git a/tests/result/dnscrypt-v2.pcap.out b/tests/result/dnscrypt-v2.pcap.out
index df0070c2f..54cd7a91d 100644
--- a/tests/result/dnscrypt-v2.pcap.out
+++ b/tests/result/dnscrypt-v2.pcap.out
@@ -17,7 +17,7 @@ Automa risk mask:     0/0 (search/found)
 Automa common alpns:  0/0 (search/found)
 Patricia risk mask:   6/0 (search/found)
 Patricia risk:        0/0 (search/found)
-Patricia protocols:   12/0 (search/found)
+Patricia protocols:   6/0 (search/found)
 
 DNScrypt	6	4300	3
 
diff --git a/tests/result/dnscrypt_skype_false_positive.pcapng.out b/tests/result/dnscrypt_skype_false_positive.pcapng.out
index 47e8547af..3e28a4a7b 100644
--- a/tests/result/dnscrypt_skype_false_positive.pcapng.out
+++ b/tests/result/dnscrypt_skype_false_positive.pcapng.out
@@ -17,7 +17,7 @@ Automa risk mask:     0/0 (search/found)
 Automa common alpns:  0/0 (search/found)
 Patricia risk mask:   2/0 (search/found)
 Patricia risk:        0/0 (search/found)
-Patricia protocols:   4/0 (search/found)
+Patricia protocols:   2/0 (search/found)
 
 DNScrypt	6	2380	1
 
diff --git a/tests/result/drda_db2.pcap.out b/tests/result/drda_db2.pcap.out
index 96d91dbca..2d2046282 100644
--- a/tests/result/drda_db2.pcap.out
+++ b/tests/result/drda_db2.pcap.out
@@ -17,7 +17,7 @@ Automa risk mask:     0/0 (search/found)
 Automa common alpns:  0/0 (search/found)
 Patricia risk mask:   2/0 (search/found)
 Patricia risk:        0/0 (search/found)
-Patricia protocols:   4/0 (search/found)
+Patricia protocols:   2/0 (search/found)
 
 DRDA	38	6691	1
 
diff --git a/tests/result/elasticsearch.pcap.out b/tests/result/elasticsearch.pcap.out
index e85ae7558..d92fe149c 100644
--- a/tests/result/elasticsearch.pcap.out
+++ b/tests/result/elasticsearch.pcap.out
@@ -17,7 +17,7 @@ Automa risk mask:     0/0 (search/found)
 Automa common alpns:  0/0 (search/found)
 Patricia risk mask:   14/0 (search/found)
 Patricia risk:        0/0 (search/found)
-Patricia protocols:   28/0 (search/found)
+Patricia protocols:   14/0 (search/found)
 
 Elasticsearch	47	12739	7
 
diff --git a/tests/result/emotet.pcap.out b/tests/result/emotet.pcap.out
index 2ac3b0da6..834b58db9 100644
--- a/tests/result/emotet.pcap.out
+++ b/tests/result/emotet.pcap.out
@@ -17,7 +17,7 @@ Automa risk mask:     2/0 (search/found)
 Automa common alpns:  0/0 (search/found)
 Patricia risk mask:   12/0 (search/found)
 Patricia risk:        0/0 (search/found)
-Patricia protocols:   14/0 (search/found)
+Patricia protocols:   12/0 (search/found)
 
 SMTP	626	438465	1
 HTTP	1601	1581542	3
diff --git a/tests/result/fix.pcap.out b/tests/result/fix.pcap.out
index be629f06f..6dd002a9b 100644
--- a/tests/result/fix.pcap.out
+++ b/tests/result/fix.pcap.out
@@ -17,7 +17,7 @@ Automa risk mask:     0/0 (search/found)
 Automa common alpns:  0/0 (search/found)
 Patricia risk mask:   24/0 (search/found)
 Patricia risk:        0/0 (search/found)
-Patricia protocols:   48/0 (search/found)
+Patricia protocols:   24/0 (search/found)
 
 FIX	1261	115514	12
 
diff --git a/tests/result/fix2.pcap.out b/tests/result/fix2.pcap.out
index d24769630..6927680be 100644
--- a/tests/result/fix2.pcap.out
+++ b/tests/result/fix2.pcap.out
@@ -17,7 +17,7 @@ Automa risk mask:     0/0 (search/found)
 Automa common alpns:  0/0 (search/found)
 Patricia risk mask:   4/0 (search/found)
 Patricia risk:        0/0 (search/found)
-Patricia protocols:   8/0 (search/found)
+Patricia protocols:   4/0 (search/found)
 
 FIX	3046	246540	2
 
diff --git a/tests/result/ftp-start-tls.pcap.out b/tests/result/ftp-start-tls.pcap.out
index 50c4d5a15..2126bd03b 100644
--- a/tests/result/ftp-start-tls.pcap.out
+++ b/tests/result/ftp-start-tls.pcap.out
@@ -17,7 +17,7 @@ Automa risk mask:     0/0 (search/found)
 Automa common alpns:  0/0 (search/found)
 Patricia risk mask:   2/0 (search/found)
 Patricia risk:        0/0 (search/found)
-Patricia protocols:   4/0 (search/found)
+Patricia protocols:   2/0 (search/found)
 
 FTPS	51	7510	1
 
diff --git a/tests/result/ftp.pcap.out b/tests/result/ftp.pcap.out
index 539a4acbe..755c85332 100644
--- a/tests/result/ftp.pcap.out
+++ b/tests/result/ftp.pcap.out
@@ -18,7 +18,7 @@ Automa risk mask:     0/0 (search/found)
 Automa common alpns:  0/0 (search/found)
 Patricia risk mask:   6/0 (search/found)
 Patricia risk:        0/0 (search/found)
-Patricia protocols:   8/0 (search/found)
+Patricia protocols:   6/0 (search/found)
 
 Unknown	1115	1122198	1
 FTP_CONTROL	68	5571	1
diff --git a/tests/result/ftp_failed.pcap.out b/tests/result/ftp_failed.pcap.out
index 1acda9ebd..f874910b1 100644
--- a/tests/result/ftp_failed.pcap.out
+++ b/tests/result/ftp_failed.pcap.out
@@ -2,7 +2,7 @@ Guessed flow protos:	0
 
 DPI Packets (TCP):	8	(8.00 pkts/flow)
 Confidence DPI              : 1 (flows)
-Num dissector calls: 157 (157.00 diss/flow)
+Num dissector calls: 158 (158.00 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/0/0 (insert/search/found)
 LRU cache zoom:       0/0/0 (insert/search/found)
diff --git a/tests/result/fuzz-2006-06-26-2594.pcap.out b/tests/result/fuzz-2006-06-26-2594.pcap.out
index b828cdb56..d19efa006 100644
--- a/tests/result/fuzz-2006-06-26-2594.pcap.out
+++ b/tests/result/fuzz-2006-06-26-2594.pcap.out
@@ -21,7 +21,7 @@ Automa risk mask:     38/0 (search/found)
 Automa common alpns:  0/0 (search/found)
 Patricia risk mask:   458/0 (search/found)
 Patricia risk:        26/0 (search/found)
-Patricia protocols:   572/0 (search/found)
+Patricia protocols:   502/0 (search/found)
 
 Unknown	30	3356	30
 FTP_CONTROL	36	2569	12
diff --git a/tests/result/fuzz-2006-09-29-28586.pcap.out b/tests/result/fuzz-2006-09-29-28586.pcap.out
index 53207bb42..b987a0abf 100644
--- a/tests/result/fuzz-2006-09-29-28586.pcap.out
+++ b/tests/result/fuzz-2006-09-29-28586.pcap.out
@@ -20,7 +20,7 @@ Automa risk mask:     0/0 (search/found)
 Automa common alpns:  0/0 (search/found)
 Patricia risk mask:   74/0 (search/found)
 Patricia risk:        0/0 (search/found)
-Patricia protocols:   85/4 (search/found)
+Patricia protocols:   75/2 (search/found)
 
 Unknown	3	655	3
 HTTP	118	28709	37
diff --git a/tests/result/fuzz-2020-02-16-11740.pcap.out b/tests/result/fuzz-2020-02-16-11740.pcap.out
index 0a4207aae..7b0f94e1a 100644
--- a/tests/result/fuzz-2020-02-16-11740.pcap.out
+++ b/tests/result/fuzz-2020-02-16-11740.pcap.out
@@ -20,7 +20,7 @@ Automa risk mask:     0/0 (search/found)
 Automa common alpns:  0/0 (search/found)
 Patricia risk mask:   148/0 (search/found)
 Patricia risk:        18/0 (search/found)
-Patricia protocols:   186/0 (search/found)
+Patricia protocols:   154/0 (search/found)
 
 Unknown	19	6603	19
 VRRP	1	725	1
diff --git a/tests/result/fuzz-2021-10-13.pcap.out b/tests/result/fuzz-2021-10-13.pcap.out
index 5124f403a..2d347ff58 100644
--- a/tests/result/fuzz-2021-10-13.pcap.out
+++ b/tests/result/fuzz-2021-10-13.pcap.out
@@ -2,7 +2,7 @@ Guessed flow protos:	1
 
 DPI Packets (TCP):	1	(1.00 pkts/flow)
 Confidence Unknown          : 1 (flows)
-Num dissector calls: 126 (126.00 diss/flow)
+Num dissector calls: 127 (127.00 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/3/0 (insert/search/found)
 LRU cache zoom:       0/0/0 (insert/search/found)
diff --git a/tests/result/genshin-impact.pcap.out b/tests/result/genshin-impact.pcap.out
index 0afe863fc..a08059485 100644
--- a/tests/result/genshin-impact.pcap.out
+++ b/tests/result/genshin-impact.pcap.out
@@ -18,7 +18,7 @@ Automa risk mask:     0/0 (search/found)
 Automa common alpns:  0/0 (search/found)
 Patricia risk mask:   12/0 (search/found)
 Patricia risk:        0/0 (search/found)
-Patricia protocols:   15/6 (search/found)
+Patricia protocols:   9/3 (search/found)
 
 GenshinImpact	90	18405	6
 
diff --git a/tests/result/gnutella.pcap.out b/tests/result/gnutella.pcap.out
index fb991e755..65f84dede 100644
--- a/tests/result/gnutella.pcap.out
+++ b/tests/result/gnutella.pcap.out
@@ -21,7 +21,7 @@ Automa risk mask:     4/0 (search/found)
 Automa common alpns:  0/0 (search/found)
 Patricia risk mask:   1768/0 (search/found)
 Patricia risk:        2/0 (search/found)
-Patricia protocols:   2577/2 (search/found)
+Patricia protocols:   1803/1 (search/found)
 
 Unknown	1420	119471	592
 MDNS	18	1632	2
diff --git a/tests/result/google_ssl.pcap.out b/tests/result/google_ssl.pcap.out
index a9fdfa14e..8ff034274 100644
--- a/tests/result/google_ssl.pcap.out
+++ b/tests/result/google_ssl.pcap.out
@@ -17,7 +17,7 @@ Automa risk mask:     0/0 (search/found)
 Automa common alpns:  0/0 (search/found)
 Patricia risk mask:   2/0 (search/found)
 Patricia risk:        0/0 (search/found)
-Patricia protocols:   3/2 (search/found)
+Patricia protocols:   1/1 (search/found)
 
 TLS	28	9108	1
 
diff --git a/tests/result/gtp_false_positive.pcapng.out b/tests/result/gtp_false_positive.pcapng.out
index 22db7899e..f08405919 100644
--- a/tests/result/gtp_false_positive.pcapng.out
+++ b/tests/result/gtp_false_positive.pcapng.out
@@ -18,7 +18,7 @@ Automa risk mask:     0/0 (search/found)
 Automa common alpns:  0/0 (search/found)
 Patricia risk mask:   6/0 (search/found)
 Patricia risk:        6/0 (search/found)
-Patricia protocols:   10/0 (search/found)
+Patricia protocols:   6/0 (search/found)
 
 Unknown	5	428	1
 GTP	2	424	2
diff --git a/tests/result/h323.pcap.out b/tests/result/h323.pcap.out
index 81e2f8412..24071d5a5 100644
--- a/tests/result/h323.pcap.out
+++ b/tests/result/h323.pcap.out
@@ -18,7 +18,7 @@ Automa risk mask:     0/0 (search/found)
 Automa common alpns:  0/0 (search/found)
 Patricia risk mask:   4/0 (search/found)
 Patricia risk:        4/0 (search/found)
-Patricia protocols:   4/4 (search/found)
+Patricia protocols:   2/2 (search/found)
 
 H323	12	1825	2
 
diff --git a/tests/result/hangout.pcap.out b/tests/result/hangout.pcap.out
index 23311f93b..9d19f55b1 100644
--- a/tests/result/hangout.pcap.out
+++ b/tests/result/hangout.pcap.out
@@ -17,7 +17,7 @@ Automa risk mask:     0/0 (search/found)
 Automa common alpns:  0/0 (search/found)
 Patricia risk mask:   2/0 (search/found)
 Patricia risk:        0/0 (search/found)
-Patricia protocols:   3/2 (search/found)
+Patricia protocols:   2/1 (search/found)
 
 GoogleHangoutDuo	19	2774	1
 
diff --git a/tests/result/hpvirtgrp.pcap.out b/tests/result/hpvirtgrp.pcap.out
index 354ff7d7b..1e89c8dee 100644
--- a/tests/result/hpvirtgrp.pcap.out
+++ b/tests/result/hpvirtgrp.pcap.out
@@ -17,7 +17,7 @@ Automa risk mask:     0/0 (search/found)
 Automa common alpns:  0/0 (search/found)
 Patricia risk mask:   20/0 (search/found)
 Patricia risk:        0/0 (search/found)
-Patricia protocols:   38/0 (search/found)
+Patricia protocols:   20/0 (search/found)
 
 HP_VIRTGRP	135	12739	9
 
diff --git a/tests/result/http_guessed_host_and_guessed.pcapng.out b/tests/result/http_guessed_host_and_guessed.pcapng.out
index dff16d208..b9bd07fcf 100644
--- a/tests/result/http_guessed_host_and_guessed.pcapng.out
+++ b/tests/result/http_guessed_host_and_guessed.pcapng.out
@@ -17,7 +17,7 @@ Automa risk mask:     1/0 (search/found)
 Automa common alpns:  0/0 (search/found)
 Patricia risk mask:   2/0 (search/found)
 Patricia risk:        0/0 (search/found)
-Patricia protocols:   3/2 (search/found)
+Patricia protocols:   1/1 (search/found)
 
 POP3	1	123	1
 
diff --git a/tests/result/http_ipv6.pcap.out b/tests/result/http_ipv6.pcap.out
index bfccb26a0..402d2c9e1 100644
--- a/tests/result/http_ipv6.pcap.out
+++ b/tests/result/http_ipv6.pcap.out
@@ -5,7 +5,7 @@ DPI Packets (UDP):	4	(2.00 pkts/flow)
 Confidence Unknown          : 1 (flows)
 Confidence Match by port    : 6 (flows)
 Confidence DPI              : 8 (flows)
-Num dissector calls: 144 (9.60 diss/flow)
+Num dissector calls: 145 (9.67 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/3/0 (insert/search/found)
 LRU cache zoom:       0/0/0 (insert/search/found)
diff --git a/tests/result/i3d.pcap.out b/tests/result/i3d.pcap.out
index bd5c96abe..872074cac 100644
--- a/tests/result/i3d.pcap.out
+++ b/tests/result/i3d.pcap.out
@@ -17,7 +17,7 @@ Automa risk mask:     0/0 (search/found)
 Automa common alpns:  0/0 (search/found)
 Patricia risk mask:   8/0 (search/found)
 Patricia risk:        0/0 (search/found)
-Patricia protocols:   12/8 (search/found)
+Patricia protocols:   4/4 (search/found)
 
 i3D	60	36502	4
 
diff --git a/tests/result/imap-starttls.pcap.out b/tests/result/imap-starttls.pcap.out
index bfff90b4c..60d790ce9 100644
--- a/tests/result/imap-starttls.pcap.out
+++ b/tests/result/imap-starttls.pcap.out
@@ -17,7 +17,7 @@ Automa risk mask:     0/0 (search/found)
 Automa common alpns:  0/0 (search/found)
 Patricia risk mask:   2/0 (search/found)
 Patricia risk:        0/0 (search/found)
-Patricia protocols:   4/0 (search/found)
+Patricia protocols:   2/0 (search/found)
 
 IMAPS	32	7975	1
 
diff --git a/tests/result/imap.pcap.out b/tests/result/imap.pcap.out
index 7b2335853..4a4758136 100644
--- a/tests/result/imap.pcap.out
+++ b/tests/result/imap.pcap.out
@@ -17,7 +17,7 @@ Automa risk mask:     0/0 (search/found)
 Automa common alpns:  0/0 (search/found)
 Patricia risk mask:   2/0 (search/found)
 Patricia risk:        0/0 (search/found)
-Patricia protocols:   4/0 (search/found)
+Patricia protocols:   2/0 (search/found)
 
 IMAP	33	3774	1
 
diff --git a/tests/result/imo.pcap.out b/tests/result/imo.pcap.out
index 577f70aff..2937f08c0 100644
--- a/tests/result/imo.pcap.out
+++ b/tests/result/imo.pcap.out
@@ -17,7 +17,7 @@ Automa risk mask:     0/0 (search/found)
 Automa common alpns:  0/0 (search/found)
 Patricia risk mask:   4/0 (search/found)
 Patricia risk:        0/0 (search/found)
-Patricia protocols:   6/0 (search/found)
+Patricia protocols:   4/0 (search/found)
 
 IMO	100	35380	2
 
diff --git a/tests/result/instagram.pcap.out b/tests/result/instagram.pcap.out
index d1bfae15c..8c281dc9f 100644
--- a/tests/result/instagram.pcap.out
+++ b/tests/result/instagram.pcap.out
@@ -21,7 +21,7 @@ Automa risk mask:     1/0 (search/found)
 Automa common alpns:  6/6 (search/found)
 Patricia risk mask:   70/0 (search/found)
 Patricia risk:        0/0 (search/found)
-Patricia protocols:   68/17 (search/found)
+Patricia protocols:   60/16 (search/found)
 
 Unknown	1	66	1
 HTTP	266	245342	7
diff --git a/tests/result/irc.pcap.out b/tests/result/irc.pcap.out
index 0331ef1c0..7fc6d2479 100644
--- a/tests/result/irc.pcap.out
+++ b/tests/result/irc.pcap.out
@@ -17,7 +17,7 @@ Automa risk mask:     0/0 (search/found)
 Automa common alpns:  0/0 (search/found)
 Patricia risk mask:   2/0 (search/found)
 Patricia risk:        0/0 (search/found)
-Patricia protocols:   4/0 (search/found)
+Patricia protocols:   2/0 (search/found)
 
 IRC	29	8945	1
 
diff --git a/tests/result/jabber.pcap.out b/tests/result/jabber.pcap.out
index b46f84710..0c978b706 100644
--- a/tests/result/jabber.pcap.out
+++ b/tests/result/jabber.pcap.out
@@ -17,7 +17,7 @@ Automa risk mask:     0/0 (search/found)
 Automa common alpns:  0/0 (search/found)
 Patricia risk mask:   24/0 (search/found)
 Patricia risk:        0/0 (search/found)
-Patricia protocols:   34/0 (search/found)
+Patricia protocols:   24/0 (search/found)
 
 Jabber	358	61304	12
 
diff --git a/tests/result/kerberos.pcap.out b/tests/result/kerberos.pcap.out
index 3ac19d6a7..32bdaee64 100644
--- a/tests/result/kerberos.pcap.out
+++ b/tests/result/kerberos.pcap.out
@@ -19,7 +19,7 @@ Automa risk mask:     0/0 (search/found)
 Automa common alpns:  0/0 (search/found)
 Patricia risk mask:   72/0 (search/found)
 Patricia risk:        0/0 (search/found)
-Patricia protocols:   122/0 (search/found)
+Patricia protocols:   72/0 (search/found)
 
 Unknown	9	3031	2
 SMBv23	6	1914	3
diff --git a/tests/result/kismet.pcap.out b/tests/result/kismet.pcap.out
index 0389adfb1..cf6b4f126 100644
--- a/tests/result/kismet.pcap.out
+++ b/tests/result/kismet.pcap.out
@@ -17,7 +17,7 @@ Automa risk mask:     0/0 (search/found)
 Automa common alpns:  0/0 (search/found)
 Patricia risk mask:   2/0 (search/found)
 Patricia risk:        0/0 (search/found)
-Patricia protocols:   4/0 (search/found)
+Patricia protocols:   2/0 (search/found)
 
 Kismet	35	4871	1
 
diff --git a/tests/result/kontiki.pcap.out b/tests/result/kontiki.pcap.out
index d8ac391d3..6e6a09bf6 100644
--- a/tests/result/kontiki.pcap.out
+++ b/tests/result/kontiki.pcap.out
@@ -19,7 +19,7 @@ Automa risk mask:     0/0 (search/found)
 Automa common alpns:  0/0 (search/found)
 Patricia risk mask:   14/0 (search/found)
 Patricia risk:        0/0 (search/found)
-Patricia protocols:   20/0 (search/found)
+Patricia protocols:   16/0 (search/found)
 
 Unknown	4	1696	2
 Kontiki	3278	3852324	2
diff --git a/tests/result/line.pcap.out b/tests/result/line.pcap.out
index b562d580e..a6e4c45cd 100644
--- a/tests/result/line.pcap.out
+++ b/tests/result/line.pcap.out
@@ -18,7 +18,7 @@ Automa risk mask:     1/0 (search/found)
 Automa common alpns:  0/0 (search/found)
 Patricia risk mask:   10/0 (search/found)
 Patricia risk:        0/0 (search/found)
-Patricia protocols:   12/6 (search/found)
+Patricia protocols:   6/4 (search/found)
 
 TLS	71	8307	1
 Line	37	9480	1
diff --git a/tests/result/mongo_false_positive.pcapng.out b/tests/result/mongo_false_positive.pcapng.out
index cba376e9a..3a3a546f6 100644
--- a/tests/result/mongo_false_positive.pcapng.out
+++ b/tests/result/mongo_false_positive.pcapng.out
@@ -17,7 +17,7 @@ Automa risk mask:     0/0 (search/found)
 Automa common alpns:  0/0 (search/found)
 Patricia risk mask:   0/0 (search/found)
 Patricia risk:        2/0 (search/found)
-Patricia protocols:   4/0 (search/found)
+Patricia protocols:   2/0 (search/found)
 
 TLS	26	12163	1
 
diff --git a/tests/result/mongodb.pcap.out b/tests/result/mongodb.pcap.out
index 35061504d..830c6a064 100644
--- a/tests/result/mongodb.pcap.out
+++ b/tests/result/mongodb.pcap.out
@@ -19,7 +19,7 @@ Automa risk mask:     0/0 (search/found)
 Automa common alpns:  0/0 (search/found)
 Patricia risk mask:   16/0 (search/found)
 Patricia risk:        0/0 (search/found)
-Patricia protocols:   18/0 (search/found)
+Patricia protocols:   16/0 (search/found)
 
 Unknown	3	230	1
 MongoDB	24	2510	7
diff --git a/tests/result/mssql_tds.pcap.out b/tests/result/mssql_tds.pcap.out
index 9a79c4273..501d27672 100644
--- a/tests/result/mssql_tds.pcap.out
+++ b/tests/result/mssql_tds.pcap.out
@@ -18,7 +18,7 @@ Automa risk mask:     0/0 (search/found)
 Automa common alpns:  0/0 (search/found)
 Patricia risk mask:   24/0 (search/found)
 Patricia risk:        0/0 (search/found)
-Patricia protocols:   26/0 (search/found)
+Patricia protocols:   24/0 (search/found)
 
 MsSQL-TDS	38	16260	12
 
diff --git a/tests/result/nest_log_sink.pcap.out b/tests/result/nest_log_sink.pcap.out
index d96e84b64..9a2e2f560 100644
--- a/tests/result/nest_log_sink.pcap.out
+++ b/tests/result/nest_log_sink.pcap.out
@@ -19,7 +19,7 @@ Automa risk mask:     0/0 (search/found)
 Automa common alpns:  0/0 (search/found)
 Patricia risk mask:   28/0 (search/found)
 Patricia risk:        0/0 (search/found)
-Patricia protocols:   39/25 (search/found)
+Patricia protocols:   15/13 (search/found)
 
 DNS	15	1612	1
 NestLogSink	759	116848	13
diff --git a/tests/result/nintendo.pcap.out b/tests/result/nintendo.pcap.out
index 6a627eb71..4481a4238 100644
--- a/tests/result/nintendo.pcap.out
+++ b/tests/result/nintendo.pcap.out
@@ -21,7 +21,7 @@ Automa risk mask:     2/0 (search/found)
 Automa common alpns:  0/0 (search/found)
 Patricia risk mask:   42/0 (search/found)
 Patricia risk:        0/0 (search/found)
-Patricia protocols:   52/14 (search/found)
+Patricia protocols:   32/10 (search/found)
 
 Unknown	20	2216	5
 ICMP	30	2100	2
diff --git a/tests/result/nntp.pcap.out b/tests/result/nntp.pcap.out
index df7ff9a86..9c529ee38 100644
--- a/tests/result/nntp.pcap.out
+++ b/tests/result/nntp.pcap.out
@@ -17,7 +17,7 @@ Automa risk mask:     0/0 (search/found)
 Automa common alpns:  0/0 (search/found)
 Patricia risk mask:   2/0 (search/found)
 Patricia risk:        0/0 (search/found)
-Patricia protocols:   4/0 (search/found)
+Patricia protocols:   2/0 (search/found)
 
 Usenet	32	7037	1
 
diff --git a/tests/result/openvpn.pcap.out b/tests/result/openvpn.pcap.out
index ee7c33249..1e556eaa0 100644
--- a/tests/result/openvpn.pcap.out
+++ b/tests/result/openvpn.pcap.out
@@ -18,7 +18,7 @@ Automa risk mask:     0/0 (search/found)
 Automa common alpns:  0/0 (search/found)
 Patricia risk mask:   6/0 (search/found)
 Patricia risk:        0/0 (search/found)
-Patricia protocols:   12/0 (search/found)
+Patricia protocols:   6/0 (search/found)
 
 OpenVPN	298	57111	3
 
diff --git a/tests/result/oracle12.pcapng.out b/tests/result/oracle12.pcapng.out
index c27837a0f..a9a0a3116 100644
--- a/tests/result/oracle12.pcapng.out
+++ b/tests/result/oracle12.pcapng.out
@@ -17,7 +17,7 @@ Automa risk mask:     0/0 (search/found)
 Automa common alpns:  0/0 (search/found)
 Patricia risk mask:   2/0 (search/found)
 Patricia risk:        0/0 (search/found)
-Patricia protocols:   4/0 (search/found)
+Patricia protocols:   2/0 (search/found)
 
 Oracle	20	2518	1
 
diff --git a/tests/result/pgsql.pcap.out b/tests/result/pgsql.pcap.out
index 783efa7ca..ad24988e9 100644
--- a/tests/result/pgsql.pcap.out
+++ b/tests/result/pgsql.pcap.out
@@ -17,7 +17,7 @@ Automa risk mask:     0/0 (search/found)
 Automa common alpns:  0/0 (search/found)
 Patricia risk mask:   4/0 (search/found)
 Patricia risk:        0/0 (search/found)
-Patricia protocols:   8/0 (search/found)
+Patricia protocols:   4/0 (search/found)
 
 PostgreSQL	39	4709	2
 
diff --git a/tests/result/pop3.pcap.out b/tests/result/pop3.pcap.out
index 37f3a00a9..59b8493ea 100644
--- a/tests/result/pop3.pcap.out
+++ b/tests/result/pop3.pcap.out
@@ -17,7 +17,7 @@ Automa risk mask:     0/0 (search/found)
 Automa common alpns:  0/0 (search/found)
 Patricia risk mask:   2/0 (search/found)
 Patricia risk:        2/0 (search/found)
-Patricia protocols:   4/0 (search/found)
+Patricia protocols:   2/0 (search/found)
 
 POP3	31	3915	1
 
diff --git a/tests/result/pps.pcap.out b/tests/result/pps.pcap.out
index 263d53f1e..7fb01668b 100644
--- a/tests/result/pps.pcap.out
+++ b/tests/result/pps.pcap.out
@@ -20,7 +20,7 @@ Automa risk mask:     0/0 (search/found)
 Automa common alpns:  0/0 (search/found)
 Patricia risk mask:   194/0 (search/found)
 Patricia risk:        0/0 (search/found)
-Patricia protocols:   240/2 (search/found)
+Patricia protocols:   212/2 (search/found)
 
 Unknown	990	378832	34
 HTTP	377	402676	46
diff --git a/tests/result/quic.pcap.out b/tests/result/quic.pcap.out
index 4a038b3de..a848dc3ad 100644
--- a/tests/result/quic.pcap.out
+++ b/tests/result/quic.pcap.out
@@ -18,7 +18,7 @@ Automa risk mask:     0/0 (search/found)
 Automa common alpns:  0/0 (search/found)
 Patricia risk mask:   20/0 (search/found)
 Patricia risk:        0/0 (search/found)
-Patricia protocols:   13/10 (search/found)
+Patricia protocols:   11/9 (search/found)
 
 Unknown	3	364	1
 GMail	413	254874	1
diff --git a/tests/result/quic_0RTT.pcap.out b/tests/result/quic_0RTT.pcap.out
index 27e0c7327..c7ea711ed 100644
--- a/tests/result/quic_0RTT.pcap.out
+++ b/tests/result/quic_0RTT.pcap.out
@@ -17,7 +17,7 @@ Automa risk mask:     1/0 (search/found)
 Automa common alpns:  2/2 (search/found)
 Patricia risk mask:   2/0 (search/found)
 Patricia risk:        0/0 (search/found)
-Patricia protocols:   3/2 (search/found)
+Patricia protocols:   1/1 (search/found)
 
 Google	15	5178	1
 QUIC	2	2588	1
diff --git a/tests/result/radius_false_positive.pcapng.out b/tests/result/radius_false_positive.pcapng.out
index 5ec4f33ef..465fa1012 100644
--- a/tests/result/radius_false_positive.pcapng.out
+++ b/tests/result/radius_false_positive.pcapng.out
@@ -2,7 +2,7 @@ Guessed flow protos:	1
 
 DPI Packets (UDP):	10	(10.00 pkts/flow)
 Confidence Unknown          : 1 (flows)
-Num dissector calls: 200 (200.00 diss/flow)
+Num dissector calls: 201 (201.00 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/3/0 (insert/search/found)
 LRU cache zoom:       0/0/0 (insert/search/found)
diff --git a/tests/result/raknet.pcap.out b/tests/result/raknet.pcap.out
index ef6350096..f1a2f979b 100644
--- a/tests/result/raknet.pcap.out
+++ b/tests/result/raknet.pcap.out
@@ -17,7 +17,7 @@ Automa risk mask:     0/0 (search/found)
 Automa common alpns:  0/0 (search/found)
 Patricia risk mask:   24/0 (search/found)
 Patricia risk:        0/0 (search/found)
-Patricia protocols:   42/0 (search/found)
+Patricia protocols:   24/0 (search/found)
 
 RakNet	66	9600	12
 
diff --git a/tests/result/reasm_segv_anon.pcapng.out b/tests/result/reasm_segv_anon.pcapng.out
index 65ee11eee..824942f19 100644
--- a/tests/result/reasm_segv_anon.pcapng.out
+++ b/tests/result/reasm_segv_anon.pcapng.out
@@ -17,7 +17,7 @@ Automa risk mask:     0/0 (search/found)
 Automa common alpns:  0/0 (search/found)
 Patricia risk mask:   2/0 (search/found)
 Patricia risk:        0/0 (search/found)
-Patricia protocols:   4/0 (search/found)
+Patricia protocols:   2/0 (search/found)
 
 HTTP	82	77940	1
 
diff --git a/tests/result/riotgames.pcap.out b/tests/result/riotgames.pcap.out
index 3b78009a4..197ec165d 100644
--- a/tests/result/riotgames.pcap.out
+++ b/tests/result/riotgames.pcap.out
@@ -17,7 +17,7 @@ Automa risk mask:     0/0 (search/found)
 Automa common alpns:  0/0 (search/found)
 Patricia risk mask:   18/0 (search/found)
 Patricia risk:        0/0 (search/found)
-Patricia protocols:   23/16 (search/found)
+Patricia protocols:   9/9 (search/found)
 
 Discord	4	220	2
 RiotGames	40	3733	7
diff --git a/tests/result/rtmp.pcap.out b/tests/result/rtmp.pcap.out
index 547f95fd2..c8c3cba90 100644
--- a/tests/result/rtmp.pcap.out
+++ b/tests/result/rtmp.pcap.out
@@ -17,7 +17,7 @@ Automa risk mask:     0/0 (search/found)
 Automa common alpns:  0/0 (search/found)
 Patricia risk mask:   2/0 (search/found)
 Patricia risk:        0/0 (search/found)
-Patricia protocols:   4/0 (search/found)
+Patricia protocols:   2/0 (search/found)
 
 RTMP	26	8368	1
 
diff --git a/tests/result/rx.pcap.out b/tests/result/rx.pcap.out
index 30d29e38c..480a60643 100644
--- a/tests/result/rx.pcap.out
+++ b/tests/result/rx.pcap.out
@@ -17,7 +17,7 @@ Automa risk mask:     0/0 (search/found)
 Automa common alpns:  0/0 (search/found)
 Patricia risk mask:   10/0 (search/found)
 Patricia risk:        10/0 (search/found)
-Patricia protocols:   20/0 (search/found)
+Patricia protocols:   10/0 (search/found)
 
 RX	132	26475	5
 
diff --git a/tests/result/sflow.pcap.out b/tests/result/sflow.pcap.out
index 247525eb7..16eaf9334 100644
--- a/tests/result/sflow.pcap.out
+++ b/tests/result/sflow.pcap.out
@@ -17,7 +17,7 @@ Automa risk mask:     0/0 (search/found)
 Automa common alpns:  0/0 (search/found)
 Patricia risk mask:   2/0 (search/found)
 Patricia risk:        0/0 (search/found)
-Patricia protocols:   4/0 (search/found)
+Patricia protocols:   2/0 (search/found)
 
 sFlow	9	1702	1
 
diff --git a/tests/result/skype.pcap.out b/tests/result/skype.pcap.out
index 4e3073a94..572363215 100644
--- a/tests/result/skype.pcap.out
+++ b/tests/result/skype.pcap.out
@@ -21,7 +21,7 @@ Automa risk mask:     3/0 (search/found)
 Automa common alpns:  0/0 (search/found)
 Patricia risk mask:   580/0 (search/found)
 Patricia risk:        0/0 (search/found)
-Patricia protocols:   1000/5 (search/found)
+Patricia protocols:   608/5 (search/found)
 
 Unknown	1567	272044	59
 DNS	2	267	1
diff --git a/tests/result/skype_no_unknown.pcap.out b/tests/result/skype_no_unknown.pcap.out
index c73b26320..420decce8 100644
--- a/tests/result/skype_no_unknown.pcap.out
+++ b/tests/result/skype_no_unknown.pcap.out
@@ -21,7 +21,7 @@ Automa risk mask:     4/0 (search/found)
 Automa common alpns:  0/0 (search/found)
 Patricia risk mask:   536/0 (search/found)
 Patricia risk:        0/0 (search/found)
-Patricia protocols:   918/3 (search/found)
+Patricia protocols:   564/3 (search/found)
 
 Unknown	846	152252	44
 DNS	2	267	1
diff --git a/tests/result/skype_udp.pcap.out b/tests/result/skype_udp.pcap.out
index 732f44bc0..f52b80d92 100644
--- a/tests/result/skype_udp.pcap.out
+++ b/tests/result/skype_udp.pcap.out
@@ -17,7 +17,7 @@ Automa risk mask:     0/0 (search/found)
 Automa common alpns:  0/0 (search/found)
 Patricia risk mask:   2/0 (search/found)
 Patricia risk:        0/0 (search/found)
-Patricia protocols:   4/0 (search/found)
+Patricia protocols:   2/0 (search/found)
 
 Skype_Teams	5	339	1
 
diff --git a/tests/result/smb_frags.pcap.out b/tests/result/smb_frags.pcap.out
index c817a07d7..653764cee 100644
--- a/tests/result/smb_frags.pcap.out
+++ b/tests/result/smb_frags.pcap.out
@@ -17,7 +17,7 @@ Automa risk mask:     0/0 (search/found)
 Automa common alpns:  0/0 (search/found)
 Patricia risk mask:   2/0 (search/found)
 Patricia risk:        0/0 (search/found)
-Patricia protocols:   4/0 (search/found)
+Patricia protocols:   2/0 (search/found)
 
 SMBv1	8	2763	1
 
diff --git a/tests/result/smbv1.pcap.out b/tests/result/smbv1.pcap.out
index 9414d5600..d4cdfe4cf 100644
--- a/tests/result/smbv1.pcap.out
+++ b/tests/result/smbv1.pcap.out
@@ -17,7 +17,7 @@ Automa risk mask:     0/0 (search/found)
 Automa common alpns:  0/0 (search/found)
 Patricia risk mask:   2/0 (search/found)
 Patricia risk:        0/0 (search/found)
-Patricia protocols:   4/0 (search/found)
+Patricia protocols:   2/0 (search/found)
 
 SMBv1	7	1197	1
 
diff --git a/tests/result/smpp_in_general.pcap.out b/tests/result/smpp_in_general.pcap.out
index 7dd8bd9c9..fe8774c6a 100644
--- a/tests/result/smpp_in_general.pcap.out
+++ b/tests/result/smpp_in_general.pcap.out
@@ -17,7 +17,7 @@ Automa risk mask:     0/0 (search/found)
 Automa common alpns:  0/0 (search/found)
 Patricia risk mask:   2/0 (search/found)
 Patricia risk:        0/0 (search/found)
-Patricia protocols:   4/0 (search/found)
+Patricia protocols:   2/0 (search/found)
 
 SMPP	17	1144	1
 
diff --git a/tests/result/smtp-starttls.pcap.out b/tests/result/smtp-starttls.pcap.out
index f2f898811..f55ca99bf 100644
--- a/tests/result/smtp-starttls.pcap.out
+++ b/tests/result/smtp-starttls.pcap.out
@@ -2,7 +2,7 @@ Guessed flow protos:	0
 
 DPI Packets (TCP):	26	(13.00 pkts/flow)
 Confidence DPI              : 2 (flows)
-Num dissector calls: 156 (78.00 diss/flow)
+Num dissector calls: 157 (78.50 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/0/0 (insert/search/found)
 LRU cache zoom:       0/0/0 (insert/search/found)
diff --git a/tests/result/smtp.pcap.out b/tests/result/smtp.pcap.out
index 180101a0e..fa064dca1 100644
--- a/tests/result/smtp.pcap.out
+++ b/tests/result/smtp.pcap.out
@@ -17,7 +17,7 @@ Automa risk mask:     0/0 (search/found)
 Automa common alpns:  0/0 (search/found)
 Patricia risk mask:   2/0 (search/found)
 Patricia risk:        0/0 (search/found)
-Patricia protocols:   4/0 (search/found)
+Patricia protocols:   2/0 (search/found)
 
 SMTP	95	23157	1
 
diff --git a/tests/result/soap.pcap.out b/tests/result/soap.pcap.out
index 4e7ef9c34..46b77db51 100644
--- a/tests/result/soap.pcap.out
+++ b/tests/result/soap.pcap.out
@@ -18,7 +18,7 @@ Automa risk mask:     1/0 (search/found)
 Automa common alpns:  0/0 (search/found)
 Patricia risk mask:   6/0 (search/found)
 Patricia risk:        2/0 (search/found)
-Patricia protocols:   10/0 (search/found)
+Patricia protocols:   6/0 (search/found)
 
 HTTP	14	5498	1
 SOAP	6	5450	2
diff --git a/tests/result/socks-http-example.pcap.out b/tests/result/socks-http-example.pcap.out
index a59e40448..22e0c5027 100644
--- a/tests/result/socks-http-example.pcap.out
+++ b/tests/result/socks-http-example.pcap.out
@@ -18,7 +18,7 @@ Automa risk mask:     0/0 (search/found)
 Automa common alpns:  0/0 (search/found)
 Patricia risk mask:   6/0 (search/found)
 Patricia risk:        0/0 (search/found)
-Patricia protocols:   8/0 (search/found)
+Patricia protocols:   6/0 (search/found)
 
 SOCKS	46	8383	3
 
diff --git a/tests/result/softether.pcap.out b/tests/result/softether.pcap.out
index cd40b3c4c..843747034 100644
--- a/tests/result/softether.pcap.out
+++ b/tests/result/softether.pcap.out
@@ -18,7 +18,7 @@ Automa risk mask:     0/0 (search/found)
 Automa common alpns:  0/0 (search/found)
 Patricia risk mask:   8/0 (search/found)
 Patricia risk:        0/0 (search/found)
-Patricia protocols:   10/0 (search/found)
+Patricia protocols:   8/0 (search/found)
 
 Softether	177	21287	4
 
diff --git a/tests/result/starcraft_battle.pcap.out b/tests/result/starcraft_battle.pcap.out
index 0851e0bc4..d2fc06d07 100644
--- a/tests/result/starcraft_battle.pcap.out
+++ b/tests/result/starcraft_battle.pcap.out
@@ -21,7 +21,7 @@ Automa risk mask:     5/0 (search/found)
 Automa common alpns:  0/0 (search/found)
 Patricia risk mask:   100/0 (search/found)
 Patricia risk:        0/0 (search/found)
-Patricia protocols:   98/8 (search/found)
+Patricia protocols:   97/7 (search/found)
 
 Unknown	8	596	2
 DNS	26	2848	7
diff --git a/tests/result/stun.pcap.out b/tests/result/stun.pcap.out
index dae5e38fa..a0248eee4 100644
--- a/tests/result/stun.pcap.out
+++ b/tests/result/stun.pcap.out
@@ -3,7 +3,7 @@ Guessed flow protos:	0
 DPI Packets (TCP):	4	(4.00 pkts/flow)
 DPI Packets (UDP):	13	(4.33 pkts/flow)
 Confidence DPI              : 4 (flows)
-Num dissector calls: 588 (147.00 diss/flow)
+Num dissector calls: 589 (147.25 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/0/0 (insert/search/found)
 LRU cache zoom:       0/0/0 (insert/search/found)
@@ -18,7 +18,7 @@ Automa risk mask:     1/0 (search/found)
 Automa common alpns:  0/0 (search/found)
 Patricia risk mask:   6/0 (search/found)
 Patricia risk:        2/0 (search/found)
-Patricia protocols:   10/4 (search/found)
+Patricia protocols:   4/2 (search/found)
 
 STUN	62	7620	2
 GoogleHangoutDuo	33	6292	1
diff --git a/tests/result/stun_signal.pcapng.out b/tests/result/stun_signal.pcapng.out
index cfd87e79e..6a1264378 100644
--- a/tests/result/stun_signal.pcapng.out
+++ b/tests/result/stun_signal.pcapng.out
@@ -19,7 +19,7 @@ Automa risk mask:     0/0 (search/found)
 Automa common alpns:  0/0 (search/found)
 Patricia risk mask:   46/0 (search/found)
 Patricia risk:        0/0 (search/found)
-Patricia protocols:   29/25 (search/found)
+Patricia protocols:   25/23 (search/found)
 
 STUN	166	16290	6
 ICMP	53	5186	2
diff --git a/tests/result/syncthing.pcap.out b/tests/result/syncthing.pcap.out
index a9d1aef42..634e1f4e2 100644
--- a/tests/result/syncthing.pcap.out
+++ b/tests/result/syncthing.pcap.out
@@ -2,7 +2,7 @@ Guessed flow protos:	0
 
 DPI Packets (UDP):	4	(1.00 pkts/flow)
 Confidence DPI              : 4 (flows)
-Num dissector calls: 412 (103.00 diss/flow)
+Num dissector calls: 414 (103.50 diss/flow)
 LRU cache ookla:      0/0/0 (insert/search/found)
 LRU cache bittorrent: 0/0/0 (insert/search/found)
 LRU cache zoom:       0/0/0 (insert/search/found)
@@ -17,7 +17,7 @@ Automa risk mask:     0/0 (search/found)
 Automa common alpns:  0/0 (search/found)
 Patricia risk mask:   0/0 (search/found)
 Patricia risk:        0/0 (search/found)
-Patricia protocols:   8/0 (search/found)
+Patricia protocols:   4/0 (search/found)
 
 Syncthing	34	15680	4
 
diff --git a/tests/result/targusdataspeed_false_positives.pcap.out b/tests/result/targusdataspeed_false_positives.pcap.out
index 683858c02..7a8030c35 100644
--- a/tests/result/targusdataspeed_false_positives.pcap.out
+++ b/tests/result/targusdataspeed_false_positives.pcap.out
@@ -17,7 +17,7 @@ Automa risk mask:     0/0 (search/found)
 Automa common alpns:  0/0 (search/found)
 Patricia risk mask:   4/0 (search/found)
 Patricia risk:        0/0 (search/found)
-Patricia protocols:   8/0 (search/found)
+Patricia protocols:   4/0 (search/found)
 
 BitTorrent	4	939	2
 
diff --git a/tests/result/teams.pcap.out b/tests/result/teams.pcap.out
index ad2d6ddd4..b047855d3 100644
--- a/tests/result/teams.pcap.out
+++ b/tests/result/teams.pcap.out
@@ -22,7 +22,7 @@ Automa risk mask:     21/0 (search/found)
 Automa common alpns:  67/67 (search/found)
 Patricia risk mask:   156/0 (search/found)
 Patricia risk:        2/0 (search/found)
-Patricia protocols:   125/48 (search/found)
+Patricia protocols:   121/47 (search/found)
 
 Unknown	4	456	1
 DNS	8	1126	4
diff --git a/tests/result/teamviewer.pcap.out b/tests/result/teamviewer.pcap.out
index 34b72117c..fb8d673c4 100644
--- a/tests/result/teamviewer.pcap.out
+++ b/tests/result/teamviewer.pcap.out
@@ -18,7 +18,7 @@ Automa risk mask:     0/0 (search/found)
 Automa common alpns:  0/0 (search/found)
 Patricia risk mask:   4/0 (search/found)
 Patricia risk:        0/0 (search/found)
-Patricia protocols:   6/0 (search/found)
+Patricia protocols:   4/0 (search/found)
 
 TeamViewer	1298	704218	2
 
diff --git a/tests/result/telegram.pcap.out b/tests/result/telegram.pcap.out
index 95548573a..fca097b25 100644
--- a/tests/result/telegram.pcap.out
+++ b/tests/result/telegram.pcap.out
@@ -18,7 +18,7 @@ Automa risk mask:     4/0 (search/found)
 Automa common alpns:  0/0 (search/found)
 Patricia risk mask:   58/0 (search/found)
 Patricia risk:        2/0 (search/found)
-Patricia protocols:   80/14 (search/found)
+Patricia protocols:   76/14 (search/found)
 
 Unknown	304	72496	2
 DNS	8	716	4
diff --git a/tests/result/telnet.pcap.out b/tests/result/telnet.pcap.out
index 934379250..834516cae 100644
--- a/tests/result/telnet.pcap.out
+++ b/tests/result/telnet.pcap.out
@@ -17,7 +17,7 @@ Automa risk mask:     0/0 (search/found)
 Automa common alpns:  0/0 (search/found)
 Patricia risk mask:   2/0 (search/found)
 Patricia risk:        0/0 (search/found)
-Patricia protocols:   4/0 (search/found)
+Patricia protocols:   2/0 (search/found)
 
 Telnet	87	7418	1
 
diff --git a/tests/result/tftp.pcap.out b/tests/result/tftp.pcap.out
index 6dc8203f8..ad296a7a5 100644
--- a/tests/result/tftp.pcap.out
+++ b/tests/result/tftp.pcap.out
@@ -17,7 +17,7 @@ Automa risk mask:     0/0 (search/found)
 Automa common alpns:  0/0 (search/found)
 Patricia risk mask:   14/0 (search/found)
 Patricia risk:        0/0 (search/found)
-Patricia protocols:   16/0 (search/found)
+Patricia protocols:   14/0 (search/found)
 
 TFTP	107	31296	7
 
diff --git a/tests/result/threema.pcap.out b/tests/result/threema.pcap.out
index ea6d55301..06224a83b 100644
--- a/tests/result/threema.pcap.out
+++ b/tests/result/threema.pcap.out
@@ -18,7 +18,7 @@ Automa risk mask:     0/0 (search/found)
 Automa common alpns:  0/0 (search/found)
 Patricia risk mask:   12/0 (search/found)
 Patricia risk:        0/0 (search/found)
-Patricia protocols:   18/12 (search/found)
+Patricia protocols:   6/6 (search/found)
 
 Unknown	26	2494	2
 Threema	57	9084	4
diff --git a/tests/result/tinc.pcap.out b/tests/result/tinc.pcap.out
index 6595ada5b..1326b82da 100644
--- a/tests/result/tinc.pcap.out
+++ b/tests/result/tinc.pcap.out
@@ -19,7 +19,7 @@ Automa risk mask:     0/0 (search/found)
 Automa common alpns:  0/0 (search/found)
 Patricia risk mask:   8/0 (search/found)
 Patricia risk:        8/0 (search/found)
-Patricia protocols:   12/0 (search/found)
+Patricia protocols:   8/0 (search/found)
 
 TINC	317	352291	4
 
diff --git a/tests/result/tls-appdata.pcap.out b/tests/result/tls-appdata.pcap.out
index 56b3c0a84..3773b2f5f 100644
--- a/tests/result/tls-appdata.pcap.out
+++ b/tests/result/tls-appdata.pcap.out
@@ -17,7 +17,7 @@ Automa risk mask:     0/0 (search/found)
 Automa common alpns:  0/0 (search/found)
 Patricia risk mask:   4/0 (search/found)
 Patricia risk:        0/0 (search/found)
-Patricia protocols:   4/3 (search/found)
+Patricia protocols:   2/2 (search/found)
 
 TLS	120	119945	2
 
diff --git a/tests/result/tls_certificate_too_long.pcap.out b/tests/result/tls_certificate_too_long.pcap.out
index 4b0c62f13..a84e2b9c1 100644
--- a/tests/result/tls_certificate_too_long.pcap.out
+++ b/tests/result/tls_certificate_too_long.pcap.out
@@ -21,7 +21,7 @@ Automa risk mask:     11/0 (search/found)
 Automa common alpns:  16/16 (search/found)
 Patricia risk mask:   62/0 (search/found)
 Patricia risk:        0/0 (search/found)
-Patricia protocols:   47/29 (search/found)
+Patricia protocols:   41/27 (search/found)
 
 Unknown	13	5582	1
 DNS	26	2980	4
diff --git a/tests/result/tls_false_positives.pcapng.out b/tests/result/tls_false_positives.pcapng.out
index 8e77bb424..7966ab11a 100644
--- a/tests/result/tls_false_positives.pcapng.out
+++ b/tests/result/tls_false_positives.pcapng.out
@@ -17,7 +17,7 @@ Automa risk mask:     0/0 (search/found)
 Automa common alpns:  0/0 (search/found)
 Patricia risk mask:   2/0 (search/found)
 Patricia risk:        0/0 (search/found)
-Patricia protocols:   4/0 (search/found)
+Patricia protocols:   2/0 (search/found)
 
 Unknown	30	37313	1
 
diff --git a/tests/result/tls_missing_ch_frag.pcap.out b/tests/result/tls_missing_ch_frag.pcap.out
index b06a7245e..96f0a62c6 100644
--- a/tests/result/tls_missing_ch_frag.pcap.out
+++ b/tests/result/tls_missing_ch_frag.pcap.out
@@ -17,7 +17,7 @@ Automa risk mask:     0/0 (search/found)
 Automa common alpns:  0/0 (search/found)
 Patricia risk mask:   2/0 (search/found)
 Patricia risk:        0/0 (search/found)
-Patricia protocols:   4/0 (search/found)
+Patricia protocols:   2/0 (search/found)
 
 TLS	14	10082	1
 
diff --git a/tests/result/toca-boca.pcap.out b/tests/result/toca-boca.pcap.out
index f7880fe8f..2e3a8c901 100644
--- a/tests/result/toca-boca.pcap.out
+++ b/tests/result/toca-boca.pcap.out
@@ -18,7 +18,7 @@ Automa risk mask:     0/0 (search/found)
 Automa common alpns:  0/0 (search/found)
 Patricia risk mask:   42/0 (search/found)
 Patricia risk:        0/0 (search/found)
-Patricia protocols:   50/0 (search/found)
+Patricia protocols:   42/0 (search/found)
 
 TocaBoca	77	15576	21
 
diff --git a/tests/result/ultrasurf.pcap.out b/tests/result/ultrasurf.pcap.out
index aa4ad3bd9..2305d7473 100644
--- a/tests/result/ultrasurf.pcap.out
+++ b/tests/result/ultrasurf.pcap.out
@@ -17,7 +17,7 @@ Automa risk mask:     0/0 (search/found)
 Automa common alpns:  4/4 (search/found)
 Patricia risk mask:   6/0 (search/found)
 Patricia risk:        0/0 (search/found)
-Patricia protocols:   8/0 (search/found)
+Patricia protocols:   6/0 (search/found)
 
 TLS	5171	5127023	2
 UltraSurf	2971	2991918	1
diff --git a/tests/result/viber.pcap.out b/tests/result/viber.pcap.out
index 937b46d81..766435ca4 100644
--- a/tests/result/viber.pcap.out
+++ b/tests/result/viber.pcap.out
@@ -21,7 +21,7 @@ Automa risk mask:     0/0 (search/found)
 Automa common alpns:  9/9 (search/found)
 Patricia risk mask:   54/0 (search/found)
 Patricia risk:        0/0 (search/found)
-Patricia protocols:   41/18 (search/found)
+Patricia protocols:   39/17 (search/found)
 
 Unknown	3	194	1
 DNS	6	1093	3
diff --git a/tests/result/wa_video.pcap.out b/tests/result/wa_video.pcap.out
index b2a34d9e9..99168863b 100644
--- a/tests/result/wa_video.pcap.out
+++ b/tests/result/wa_video.pcap.out
@@ -19,7 +19,7 @@ Automa risk mask:     0/0 (search/found)
 Automa common alpns:  0/0 (search/found)
 Patricia risk mask:   16/0 (search/found)
 Patricia risk:        2/0 (search/found)
-Patricia protocols:   24/7 (search/found)
+Patricia protocols:   22/6 (search/found)
 
 Unknown	133	20568	1
 SSDP	8	1377	3
diff --git a/tests/result/wa_voice.pcap.out b/tests/result/wa_voice.pcap.out
index 33aa28cb4..08418a750 100644
--- a/tests/result/wa_voice.pcap.out
+++ b/tests/result/wa_voice.pcap.out
@@ -20,7 +20,7 @@ Automa risk mask:     0/0 (search/found)
 Automa common alpns:  14/14 (search/found)
 Patricia risk mask:   36/0 (search/found)
 Patricia risk:        2/0 (search/found)
-Patricia protocols:   46/11 (search/found)
+Patricia protocols:   44/10 (search/found)
 
 Unknown	2	120	1
 MDNS	10	1188	2
diff --git a/tests/result/waze.pcap.out b/tests/result/waze.pcap.out
index 7deec2eca..48e44f574 100644
--- a/tests/result/waze.pcap.out
+++ b/tests/result/waze.pcap.out
@@ -20,7 +20,7 @@ Automa risk mask:     1/0 (search/found)
 Automa common alpns:  0/0 (search/found)
 Patricia risk mask:   66/0 (search/found)
 Patricia risk:        0/0 (search/found)
-Patricia protocols:   50/20 (search/found)
+Patricia protocols:   46/20 (search/found)
 
 Unknown	10	786	1
 HTTP	65	64777	8
diff --git a/tests/result/websocket.pcap.out b/tests/result/websocket.pcap.out
index 0e6e84637..61d665dde 100644
--- a/tests/result/websocket.pcap.out
+++ b/tests/result/websocket.pcap.out
@@ -17,7 +17,7 @@ Automa risk mask:     0/0 (search/found)
 Automa common alpns:  0/0 (search/found)
 Patricia risk mask:   2/0 (search/found)
 Patricia risk:        0/0 (search/found)
-Patricia protocols:   4/0 (search/found)
+Patricia protocols:   2/0 (search/found)
 
 WebSocket	5	441	1
 
diff --git a/tests/result/wechat.pcap.out b/tests/result/wechat.pcap.out
index 4038881dd..a0f679107 100644
--- a/tests/result/wechat.pcap.out
+++ b/tests/result/wechat.pcap.out
@@ -21,7 +21,7 @@ Automa risk mask:     29/0 (search/found)
 Automa common alpns:  56/56 (search/found)
 Patricia risk mask:   168/0 (search/found)
 Patricia risk:        2/0 (search/found)
-Patricia protocols:   171/21 (search/found)
+Patricia protocols:   169/21 (search/found)
 
 Unknown	20	1320	1
 DNS	13	1075	8
diff --git a/tests/result/weibo.pcap.out b/tests/result/weibo.pcap.out
index 112179647..bd2c05af4 100644
--- a/tests/result/weibo.pcap.out
+++ b/tests/result/weibo.pcap.out
@@ -20,7 +20,7 @@ Automa risk mask:     2/0 (search/found)
 Automa common alpns:  3/3 (search/found)
 Patricia risk mask:   88/0 (search/found)
 Patricia risk:        0/0 (search/found)
-Patricia protocols:   83/10 (search/found)
+Patricia protocols:   80/8 (search/found)
 
 Unknown	23	4118	2
 DNS	6	630	3
diff --git a/tests/result/whatsapp_login_call.pcap.out b/tests/result/whatsapp_login_call.pcap.out
index 1fac7cc2f..83ca3a9cc 100644
--- a/tests/result/whatsapp_login_call.pcap.out
+++ b/tests/result/whatsapp_login_call.pcap.out
@@ -20,7 +20,7 @@ Automa risk mask:     3/0 (search/found)
 Automa common alpns:  0/0 (search/found)
 Patricia risk mask:   100/0 (search/found)
 Patricia risk:        2/0 (search/found)
-Patricia protocols:   75/37 (search/found)
+Patricia protocols:   73/37 (search/found)
 
 HTTP	11	726	3
 MDNS	8	952	4
diff --git a/tests/result/whatsapp_login_chat.pcap.out b/tests/result/whatsapp_login_chat.pcap.out
index 723d96b3b..d195aed75 100644
--- a/tests/result/whatsapp_login_chat.pcap.out
+++ b/tests/result/whatsapp_login_chat.pcap.out
@@ -18,7 +18,7 @@ Automa risk mask:     0/0 (search/found)
 Automa common alpns:  0/0 (search/found)
 Patricia risk mask:   8/0 (search/found)
 Patricia risk:        2/0 (search/found)
-Patricia protocols:   19/3 (search/found)
+Patricia protocols:   15/2 (search/found)
 
 MDNS	2	202	2
 DHCP	6	2052	1
diff --git a/tests/result/whatsapp_voice_and_message.pcap.out b/tests/result/whatsapp_voice_and_message.pcap.out
index 304569fef..42ec000e0 100644
--- a/tests/result/whatsapp_voice_and_message.pcap.out
+++ b/tests/result/whatsapp_voice_and_message.pcap.out
@@ -18,7 +18,7 @@ Automa risk mask:     0/0 (search/found)
 Automa common alpns:  0/0 (search/found)
 Patricia risk mask:   26/0 (search/found)
 Patricia risk:        0/0 (search/found)
-Patricia protocols:   28/8 (search/found)
+Patricia protocols:   18/8 (search/found)
 
 WhatsAppCall	44	5916	8
 WhatsApp	217	22139	5
diff --git a/tests/result/whois.pcapng.out b/tests/result/whois.pcapng.out
index 8bca9dd31..e1003ac45 100644
--- a/tests/result/whois.pcapng.out
+++ b/tests/result/whois.pcapng.out
@@ -18,7 +18,7 @@ Automa risk mask:     0/0 (search/found)
 Automa common alpns:  2/2 (search/found)
 Patricia risk mask:   8/0 (search/found)
 Patricia risk:        0/0 (search/found)
-Patricia protocols:   10/0 (search/found)
+Patricia protocols:   8/0 (search/found)
 
 TLS	7	2046	1
 Whois-DAS	16	4294	2
diff --git a/tests/result/wireguard.pcap.out b/tests/result/wireguard.pcap.out
index c64556e5f..485e8773c 100644
--- a/tests/result/wireguard.pcap.out
+++ b/tests/result/wireguard.pcap.out
@@ -17,7 +17,7 @@ Automa risk mask:     0/0 (search/found)
 Automa common alpns:  0/0 (search/found)
 Patricia risk mask:   2/0 (search/found)
 Patricia risk:        0/0 (search/found)
-Patricia protocols:   4/0 (search/found)
+Patricia protocols:   2/0 (search/found)
 
 WireGuard	2399	734182	1
 
diff --git a/tests/result/xiaomi.pcap.out b/tests/result/xiaomi.pcap.out
index 41a5ab13d..d7b583f10 100644
--- a/tests/result/xiaomi.pcap.out
+++ b/tests/result/xiaomi.pcap.out
@@ -17,7 +17,7 @@ Automa risk mask:     0/0 (search/found)
 Automa common alpns:  0/0 (search/found)
 Patricia risk mask:   14/0 (search/found)
 Patricia risk:        0/0 (search/found)
-Patricia protocols:   24/4 (search/found)
+Patricia protocols:   12/2 (search/found)
 
 Xiaomi	52	11467	7
 
diff --git a/tests/result/z3950.pcapng.out b/tests/result/z3950.pcapng.out
index 106e63c81..01d2771bb 100644
--- a/tests/result/z3950.pcapng.out
+++ b/tests/result/z3950.pcapng.out
@@ -18,7 +18,7 @@ Automa risk mask:     0/0 (search/found)
 Automa common alpns:  0/0 (search/found)
 Patricia risk mask:   4/0 (search/found)
 Patricia risk:        0/0 (search/found)
-Patricia protocols:   8/0 (search/found)
+Patricia protocols:   4/0 (search/found)
 
 Z3950	31	6308	2
 
diff --git a/tests/result/zoom.pcap.out b/tests/result/zoom.pcap.out
index 0886f3099..5c94ab630 100644
--- a/tests/result/zoom.pcap.out
+++ b/tests/result/zoom.pcap.out
@@ -20,7 +20,7 @@ Automa risk mask:     7/0 (search/found)
 Automa common alpns:  10/10 (search/found)
 Patricia risk mask:   56/0 (search/found)
 Patricia risk:        0/0 (search/found)
-Patricia protocols:   67/20 (search/found)
+Patricia protocols:   51/15 (search/found)
 
 DNS	2	205	1
 HTTP	6	952	1
diff --git a/tests/result/zoom2.pcap.out b/tests/result/zoom2.pcap.out
index 2c5996810..51e541e85 100644
--- a/tests/result/zoom2.pcap.out
+++ b/tests/result/zoom2.pcap.out
@@ -20,7 +20,7 @@ Automa risk mask:     1/0 (search/found)
 Automa common alpns:  0/0 (search/found)
 Patricia risk mask:   10/0 (search/found)
 Patricia risk:        0/0 (search/found)
-Patricia protocols:   11/8 (search/found)
+Patricia protocols:   5/5 (search/found)
 
 ICMP	27	1890	1
 Zoom	11950	9004950	4