diff options
45 files changed, 57 insertions, 45 deletions
diff --git a/src/include/ndpi_define.h.in b/src/include/ndpi_define.h.in index 2999a38f7..70107cae9 100644 --- a/src/include/ndpi_define.h.in +++ b/src/include/ndpi_define.h.in @@ -227,6 +227,7 @@ #endif /* NDPI_ENABLE_DEBUG_MESSAGES */ #define NDPI_EXCLUDE_PROTO(mod,flow) ndpi_exclude_protocol(mod, flow, NDPI_CURRENT_PROTO, __FILE__, __FUNCTION__, __LINE__) +#define NDPI_EXCLUDE_PROTO_EXT(mod,flow,proto) ndpi_exclude_protocol(mod, flow, proto, __FILE__, __FUNCTION__, __LINE__) /** * macro for getting the string len of a static string diff --git a/src/lib/protocols/mining.c b/src/lib/protocols/mining.c index c12203adb..eb5e651d9 100644 --- a/src/lib/protocols/mining.c +++ b/src/lib/protocols/mining.c @@ -67,7 +67,7 @@ static void ndpi_search_mining_udp(struct ndpi_detection_module_struct *ndpi_str } } - ndpi_exclude_protocol(ndpi_struct, flow, NDPI_PROTOCOL_MINING, __FILE__, __FUNCTION__, __LINE__); + NDPI_EXCLUDE_PROTO(ndpi_struct, flow); } /* ************************************************************************** */ @@ -159,7 +159,7 @@ static void ndpi_search_mining_tcp(struct ndpi_detection_module_struct *ndpi_str } } - ndpi_exclude_protocol(ndpi_struct, flow, NDPI_PROTOCOL_MINING, __FILE__, __FUNCTION__, __LINE__); + NDPI_EXCLUDE_PROTO(ndpi_struct, flow); } /* ************************************************************************** */ diff --git a/src/lib/protocols/smb.c b/src/lib/protocols/smb.c index c84196343..2633fc9b7 100644 --- a/src/lib/protocols/smb.c +++ b/src/lib/protocols/smb.c @@ -63,8 +63,8 @@ void ndpi_search_smb_tcp(struct ndpi_detection_module_struct *ndpi_struct, struc } } - ndpi_exclude_protocol(ndpi_struct, flow, NDPI_PROTOCOL_SMBV1, __FILE__, __FUNCTION__, __LINE__); - ndpi_exclude_protocol(ndpi_struct, flow, NDPI_PROTOCOL_SMBV23, __FILE__, __FUNCTION__, __LINE__); + NDPI_EXCLUDE_PROTO_EXT(ndpi_struct, flow, NDPI_PROTOCOL_SMBV1); + NDPI_EXCLUDE_PROTO_EXT(ndpi_struct, flow, NDPI_PROTOCOL_SMBV23); } diff --git a/src/lib/protocols/tls.c b/src/lib/protocols/tls.c index 11cc3f131..e827e97d1 100644 --- a/src/lib/protocols/tls.c +++ b/src/lib/protocols/tls.c @@ -1187,7 +1187,9 @@ static int ndpi_search_tls_udp(struct ndpi_detection_module_struct *ndpi_struct, packet->payload_packet_len = p_len; /* Restore */ if(no_dtls || change_cipher_found) { - NDPI_EXCLUDE_PROTO(ndpi_struct, flow); + NDPI_EXCLUDE_PROTO_EXT(ndpi_struct, flow, NDPI_PROTOCOL_DTLS); + flow->check_extra_packets = 0; + flow->extra_packets_func = NULL; return(0); /* That's all */ } else { return(1); /* Keep working */ diff --git a/tests/pcap/stun_dtls.pcapng b/tests/pcap/stun_dtls.pcapng Binary files differnew file mode 100644 index 000000000..6500908bc --- /dev/null +++ b/tests/pcap/stun_dtls.pcapng diff --git a/tests/result/1kxun.pcap.out b/tests/result/1kxun.pcap.out index 15b1a5136..cf4b172a9 100644 --- a/tests/result/1kxun.pcap.out +++ b/tests/result/1kxun.pcap.out @@ -6,7 +6,7 @@ Confidence Unknown : 14 (flows) Confidence Match by port : 5 (flows) Confidence Match by IP : 1 (flows) Confidence DPI : 177 (flows) -Num dissector calls: 5065 (25.71 diss/flow) +Num dissector calls: 5055 (25.66 diss/flow) Unknown 24 6428 14 DNS 2 378 1 diff --git a/tests/result/4in4tunnel.pcap.out b/tests/result/4in4tunnel.pcap.out index 32e7fb8e0..ca09383dd 100644 --- a/tests/result/4in4tunnel.pcap.out +++ b/tests/result/4in4tunnel.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 1 DPI Packets (UDP): 5 (5.00 pkts/flow) Confidence Unknown : 1 (flows) -Num dissector calls: 171 (171.00 diss/flow) +Num dissector calls: 167 (167.00 diss/flow) Unknown 5 850 1 diff --git a/tests/result/6in6tunnel.pcap.out b/tests/result/6in6tunnel.pcap.out index 527eb1113..1bce65624 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: 112 (112.00 diss/flow) +Num dissector calls: 111 (111.00 diss/flow) Unknown 2 212 1 diff --git a/tests/result/EAQ.pcap.out b/tests/result/EAQ.pcap.out index 5a778bb5b..9c79dfd58 100644 --- a/tests/result/EAQ.pcap.out +++ b/tests/result/EAQ.pcap.out @@ -3,7 +3,7 @@ Guessed flow protos: 0 DPI Packets (TCP): 12 (6.00 pkts/flow) DPI Packets (UDP): 116 (4.00 pkts/flow) Confidence DPI : 31 (flows) -Num dissector calls: 4102 (132.32 diss/flow) +Num dissector calls: 4044 (130.45 diss/flow) Google 23 11743 2 EAQ 174 10092 29 diff --git a/tests/result/anyconnect-vpn.pcap.out b/tests/result/anyconnect-vpn.pcap.out index 07a1d1ee5..13e20627a 100644 --- a/tests/result/anyconnect-vpn.pcap.out +++ b/tests/result/anyconnect-vpn.pcap.out @@ -1,13 +1,13 @@ Guessed flow protos: 12 DPI Packets (TCP): 161 (7.32 pkts/flow) -DPI Packets (UDP): 83 (2.24 pkts/flow) +DPI Packets (UDP): 82 (2.22 pkts/flow) DPI Packets (other): 10 (1.00 pkts/flow) Confidence Unknown : 2 (flows) Confidence Match by port : 5 (flows) Confidence Match by IP : 1 (flows) Confidence DPI : 61 (flows) -Num dissector calls: 1170 (16.96 diss/flow) +Num dissector calls: 1161 (16.83 diss/flow) Unknown 19 1054 2 DNS 32 3655 16 diff --git a/tests/result/collectd.pcap.out b/tests/result/collectd.pcap.out index 27b4ce8cf..2ec20dbfb 100644 --- a/tests/result/collectd.pcap.out +++ b/tests/result/collectd.pcap.out @@ -3,7 +3,7 @@ Guessed flow protos: 3 DPI Packets (UDP): 13 (1.62 pkts/flow) Confidence Match by port : 3 (flows) Confidence DPI : 5 (flows) -Num dissector calls: 378 (47.25 diss/flow) +Num dissector calls: 373 (46.62 diss/flow) collectd 81 109386 8 diff --git a/tests/result/dnscrypt-v1-and-resolver-pings.pcap.out b/tests/result/dnscrypt-v1-and-resolver-pings.pcap.out index 607c28e88..b929ac457 100644 --- a/tests/result/dnscrypt-v1-and-resolver-pings.pcap.out +++ b/tests/result/dnscrypt-v1-and-resolver-pings.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (UDP): 256 (1.04 pkts/flow) Confidence DPI : 245 (flows) -Num dissector calls: 21885 (89.33 diss/flow) +Num dissector calls: 21874 (89.28 diss/flow) DNScrypt 488 309562 245 diff --git a/tests/result/dnscrypt-v2.pcap.out b/tests/result/dnscrypt-v2.pcap.out index d18f7784b..320d67425 100644 --- a/tests/result/dnscrypt-v2.pcap.out +++ b/tests/result/dnscrypt-v2.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (UDP): 6 (2.00 pkts/flow) Confidence DPI : 3 (flows) -Num dissector calls: 351 (117.00 diss/flow) +Num dissector calls: 348 (116.00 diss/flow) 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 97e47edca..cdcaf1f3c 100644 --- a/tests/result/dnscrypt_skype_false_positive.pcapng.out +++ b/tests/result/dnscrypt_skype_false_positive.pcapng.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (UDP): 2 (2.00 pkts/flow) Confidence DPI : 1 (flows) -Num dissector calls: 118 (118.00 diss/flow) +Num dissector calls: 117 (117.00 diss/flow) DNScrypt 6 2380 1 diff --git a/tests/result/dtls_old_version.pcapng.out b/tests/result/dtls_old_version.pcapng.out index 6debea48d..dc68c55df 100644 --- a/tests/result/dtls_old_version.pcapng.out +++ b/tests/result/dtls_old_version.pcapng.out @@ -1,4 +1,4 @@ -Guessed flow protos: 1 +Guessed flow protos: 0 DPI Packets (UDP): 7 (7.00 pkts/flow) Confidence DPI : 1 (flows) diff --git a/tests/result/gnutella.pcap.out b/tests/result/gnutella.pcap.out index 31e305a35..266f8f5d0 100644 --- a/tests/result/gnutella.pcap.out +++ b/tests/result/gnutella.pcap.out @@ -7,7 +7,7 @@ Confidence Unknown : 595 (flows) Confidence Match by port : 1 (flows) Confidence Match by IP : 1 (flows) Confidence DPI : 163 (flows) -Num dissector calls: 64728 (85.17 diss/flow) +Num dissector calls: 64111 (84.36 diss/flow) Unknown 1423 119577 595 MDNS 18 1632 2 diff --git a/tests/result/gtp_false_positive.pcapng.out b/tests/result/gtp_false_positive.pcapng.out index 96fd44a2d..152530cef 100644 --- a/tests/result/gtp_false_positive.pcapng.out +++ b/tests/result/gtp_false_positive.pcapng.out @@ -3,7 +3,7 @@ Guessed flow protos: 3 DPI Packets (UDP): 7 (2.33 pkts/flow) Confidence Unknown : 1 (flows) Confidence Match by port : 2 (flows) -Num dissector calls: 373 (124.33 diss/flow) +Num dissector calls: 369 (123.00 diss/flow) Unknown 5 428 1 GTP 2 424 2 diff --git a/tests/result/http_ipv6.pcap.out b/tests/result/http_ipv6.pcap.out index a90b1a160..d5970d850 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: 234 (15.60 diss/flow) +Num dissector calls: 232 (15.47 diss/flow) Unknown 3 502 1 ntop 80 36401 4 diff --git a/tests/result/imo.pcap.out b/tests/result/imo.pcap.out index 45c7bafce..1d716b7cc 100644 --- a/tests/result/imo.pcap.out +++ b/tests/result/imo.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (UDP): 7 (3.50 pkts/flow) Confidence DPI : 2 (flows) -Num dissector calls: 274 (137.00 diss/flow) +Num dissector calls: 269 (134.50 diss/flow) IMO 100 35380 2 diff --git a/tests/result/iphone.pcap.out b/tests/result/iphone.pcap.out index 4edd7738c..133f184da 100644 --- a/tests/result/iphone.pcap.out +++ b/tests/result/iphone.pcap.out @@ -5,7 +5,7 @@ DPI Packets (UDP): 55 (1.77 pkts/flow) DPI Packets (other): 5 (1.00 pkts/flow) Confidence Unknown : 1 (flows) Confidence DPI : 50 (flows) -Num dissector calls: 563 (11.04 diss/flow) +Num dissector calls: 562 (11.02 diss/flow) Unknown 2 120 1 MDNS 17 7012 5 diff --git a/tests/result/kontiki.pcap.out b/tests/result/kontiki.pcap.out index bfe2f9f69..eaf2a0046 100644 --- a/tests/result/kontiki.pcap.out +++ b/tests/result/kontiki.pcap.out @@ -4,7 +4,7 @@ DPI Packets (UDP): 6 (1.50 pkts/flow) DPI Packets (other): 4 (1.00 pkts/flow) Confidence Unknown : 2 (flows) Confidence DPI : 6 (flows) -Num dissector calls: 308 (38.50 diss/flow) +Num dissector calls: 306 (38.25 diss/flow) Unknown 4 1696 2 Kontiki 3278 3852324 2 diff --git a/tests/result/nintendo.pcap.out b/tests/result/nintendo.pcap.out index 54016ff23..8819e4443 100644 --- a/tests/result/nintendo.pcap.out +++ b/tests/result/nintendo.pcap.out @@ -5,7 +5,7 @@ DPI Packets (UDP): 35 (2.33 pkts/flow) DPI Packets (other): 2 (1.00 pkts/flow) Confidence Match by IP : 6 (flows) Confidence DPI : 15 (flows) -Num dissector calls: 1310 (62.38 diss/flow) +Num dissector calls: 1295 (61.67 diss/flow) ICMP 30 2100 2 Nintendo 890 320242 12 diff --git a/tests/result/openvpn.pcap.out b/tests/result/openvpn.pcap.out index 64bf79daf..a45145c58 100644 --- a/tests/result/openvpn.pcap.out +++ b/tests/result/openvpn.pcap.out @@ -3,7 +3,7 @@ Guessed flow protos: 0 DPI Packets (TCP): 6 (6.00 pkts/flow) DPI Packets (UDP): 5 (2.50 pkts/flow) Confidence DPI : 3 (flows) -Num dissector calls: 394 (131.33 diss/flow) +Num dissector calls: 391 (130.33 diss/flow) OpenVPN 298 57111 3 diff --git a/tests/result/pps.pcap.out b/tests/result/pps.pcap.out index 4bf187ab9..027f65ff9 100644 --- a/tests/result/pps.pcap.out +++ b/tests/result/pps.pcap.out @@ -5,7 +5,7 @@ DPI Packets (UDP): 201 (4.57 pkts/flow) Confidence Unknown : 34 (flows) Confidence Match by port : 2 (flows) Confidence DPI : 71 (flows) -Num dissector calls: 6427 (60.07 diss/flow) +Num dissector calls: 6270 (58.60 diss/flow) Unknown 990 378832 34 HTTP 377 402676 46 diff --git a/tests/result/quic.pcap.out b/tests/result/quic.pcap.out index ecfdbf853..b6f5941be 100644 --- a/tests/result/quic.pcap.out +++ b/tests/result/quic.pcap.out @@ -3,7 +3,7 @@ Guessed flow protos: 1 DPI Packets (UDP): 12 (1.20 pkts/flow) Confidence Match by IP : 1 (flows) Confidence DPI : 9 (flows) -Num dissector calls: 208 (20.80 diss/flow) +Num dissector calls: 206 (20.60 diss/flow) GMail 413 254874 1 YouTube 85 76193 5 diff --git a/tests/result/radius_false_positive.pcapng.out b/tests/result/radius_false_positive.pcapng.out index 6b7f1d774..40d0d090f 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: 182 (182.00 diss/flow) +Num dissector calls: 173 (173.00 diss/flow) Unknown 10 7479 1 diff --git a/tests/result/raknet.pcap.out b/tests/result/raknet.pcap.out index 9151e07e6..a30ce79ea 100644 --- a/tests/result/raknet.pcap.out +++ b/tests/result/raknet.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (UDP): 24 (2.00 pkts/flow) Confidence DPI : 12 (flows) -Num dissector calls: 1404 (117.00 diss/flow) +Num dissector calls: 1392 (116.00 diss/flow) RakNet 66 9600 12 diff --git a/tests/result/rx.pcap.out b/tests/result/rx.pcap.out index 9875b4b2a..6fff4e8e0 100644 --- a/tests/result/rx.pcap.out +++ b/tests/result/rx.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (UDP): 10 (2.00 pkts/flow) Confidence DPI : 5 (flows) -Num dissector calls: 582 (116.40 diss/flow) +Num dissector calls: 577 (115.40 diss/flow) RX 132 26475 5 diff --git a/tests/result/sip_hello.pcapng.out b/tests/result/sip_hello.pcapng.out index 5f4797eb8..46964f6c2 100644 --- a/tests/result/sip_hello.pcapng.out +++ b/tests/result/sip_hello.pcapng.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (UDP): 9 (9.00 pkts/flow) Confidence DPI : 1 (flows) -Num dissector calls: 210 (210.00 diss/flow) +Num dissector calls: 203 (203.00 diss/flow) SIP 30 5592 1 diff --git a/tests/result/skype.pcap.out b/tests/result/skype.pcap.out index a982d27a8..8ddb2020a 100644 --- a/tests/result/skype.pcap.out +++ b/tests/result/skype.pcap.out @@ -7,7 +7,7 @@ Confidence Unknown : 61 (flows) Confidence Match by port : 27 (flows) Confidence Match by IP : 1 (flows) Confidence DPI : 204 (flows) -Num dissector calls: 31676 (108.11 diss/flow) +Num dissector calls: 31670 (108.09 diss/flow) Unknown 1575 272476 61 DNS 2 267 1 diff --git a/tests/result/skype_no_unknown.pcap.out b/tests/result/skype_no_unknown.pcap.out index 7028a1190..32ad91911 100644 --- a/tests/result/skype_no_unknown.pcap.out +++ b/tests/result/skype_no_unknown.pcap.out @@ -6,7 +6,7 @@ DPI Packets (other): 5 (1.00 pkts/flow) Confidence Unknown : 45 (flows) Confidence Match by port : 22 (flows) Confidence DPI : 200 (flows) -Num dissector calls: 25957 (97.22 diss/flow) +Num dissector calls: 25954 (97.21 diss/flow) Unknown 850 152468 45 DNS 2 267 1 diff --git a/tests/result/skype_udp.pcap.out b/tests/result/skype_udp.pcap.out index 6016d74f0..a7dd49ba9 100644 --- a/tests/result/skype_udp.pcap.out +++ b/tests/result/skype_udp.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (UDP): 2 (2.00 pkts/flow) Confidence DPI : 1 (flows) -Num dissector calls: 117 (117.00 diss/flow) +Num dissector calls: 116 (116.00 diss/flow) Skype_Teams 5 339 1 diff --git a/tests/result/starcraft_battle.pcap.out b/tests/result/starcraft_battle.pcap.out index 3ccd735df..8a368c2c3 100644 --- a/tests/result/starcraft_battle.pcap.out +++ b/tests/result/starcraft_battle.pcap.out @@ -6,7 +6,7 @@ DPI Packets (other): 1 (1.00 pkts/flow) Confidence Match by port : 8 (flows) Confidence Match by IP : 5 (flows) Confidence DPI : 39 (flows) -Num dissector calls: 1866 (35.88 diss/flow) +Num dissector calls: 1857 (35.71 diss/flow) DNS 26 2848 7 HTTP 450 294880 19 diff --git a/tests/result/stun_dtls.pcapng.out b/tests/result/stun_dtls.pcapng.out new file mode 100644 index 000000000..18641645a --- /dev/null +++ b/tests/result/stun_dtls.pcapng.out @@ -0,0 +1,9 @@ +Guessed flow protos: 0 + +DPI Packets (UDP): 4 (4.00 pkts/flow) +Confidence DPI : 1 (flows) +Num dissector calls: 134 (134.00 diss/flow) + +Google 33 6292 1 + + 1 UDP 192.168.12.169:49153 <-> 142.250.82.99:3478 [proto: 78.126/STUN.Google][ClearText][Confidence: DPI][cat: Web/5][18 pkts/2856 bytes <-> 15 pkts/3436 bytes][Goodput ratio: 74/82][2.12 sec][bytes ratio: -0.092 (Mixed)][IAT c2s/s2c min/avg/max/stddev: 8/0 88/153 699/625 177/222][Pkt Len c2s/s2c min/avg/max/stddev: 107/76 159/229 588/1240 107/297][PLAIN TEXT (BwlkYDtFJ)][Plen Bins: 0,6,57,21,6,0,0,0,0,0,0,0,0,0,0,0,0,6,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0] diff --git a/tests/result/stun_signal.pcapng.out b/tests/result/stun_signal.pcapng.out index 426da18fa..93df10bb3 100644 --- a/tests/result/stun_signal.pcapng.out +++ b/tests/result/stun_signal.pcapng.out @@ -5,7 +5,7 @@ DPI Packets (other): 2 (1.00 pkts/flow) Confidence DPI (partial) : 1 (flows) Confidence DPI (cache) : 2 (flows) Confidence DPI : 20 (flows) -Num dissector calls: 1846 (80.26 diss/flow) +Num dissector calls: 1818 (79.04 diss/flow) ICMP 53 5186 2 GoogleHangoutDuo 40 2720 4 diff --git a/tests/result/teams.pcap.out b/tests/result/teams.pcap.out index 860a57b90..8e52e12bf 100644 --- a/tests/result/teams.pcap.out +++ b/tests/result/teams.pcap.out @@ -7,7 +7,7 @@ Confidence Unknown : 1 (flows) Confidence Match by IP : 1 (flows) Confidence DPI (partial) : 1 (flows) Confidence DPI : 80 (flows) -Num dissector calls: 1164 (14.02 diss/flow) +Num dissector calls: 1140 (13.73 diss/flow) Unknown 4 456 1 DNS 10 1357 5 diff --git a/tests/result/teamviewer.pcap.out b/tests/result/teamviewer.pcap.out index 4c0e93893..39e8fc820 100644 --- a/tests/result/teamviewer.pcap.out +++ b/tests/result/teamviewer.pcap.out @@ -3,7 +3,7 @@ Guessed flow protos: 0 DPI Packets (TCP): 4 (4.00 pkts/flow) DPI Packets (UDP): 4 (4.00 pkts/flow) Confidence DPI : 2 (flows) -Num dissector calls: 159 (79.50 diss/flow) +Num dissector calls: 156 (78.00 diss/flow) TeamViewer 1298 704218 2 diff --git a/tests/result/telegram.pcap.out b/tests/result/telegram.pcap.out index 57abf22e1..e604bed62 100644 --- a/tests/result/telegram.pcap.out +++ b/tests/result/telegram.pcap.out @@ -3,7 +3,7 @@ Guessed flow protos: 5 DPI Packets (UDP): 93 (1.94 pkts/flow) Confidence Unknown : 2 (flows) Confidence DPI : 46 (flows) -Num dissector calls: 1678 (34.96 diss/flow) +Num dissector calls: 1652 (34.42 diss/flow) Unknown 304 72496 2 DNS 8 716 4 diff --git a/tests/result/tftp.pcap.out b/tests/result/tftp.pcap.out index 765bfcdb4..915ffae19 100644 --- a/tests/result/tftp.pcap.out +++ b/tests/result/tftp.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (UDP): 13 (1.86 pkts/flow) Confidence DPI : 7 (flows) -Num dissector calls: 302 (43.14 diss/flow) +Num dissector calls: 296 (42.29 diss/flow) TFTP 107 31296 7 diff --git a/tests/result/viber.pcap.out b/tests/result/viber.pcap.out index 4323817a0..dfd64287f 100644 --- a/tests/result/viber.pcap.out +++ b/tests/result/viber.pcap.out @@ -5,7 +5,7 @@ DPI Packets (UDP): 27 (1.93 pkts/flow) DPI Packets (other): 2 (1.00 pkts/flow) Confidence Match by IP : 4 (flows) Confidence DPI : 25 (flows) -Num dissector calls: 701 (24.17 diss/flow) +Num dissector calls: 699 (24.10 diss/flow) DNS 8 1267 4 MDNS 4 412 1 diff --git a/tests/result/webex.pcap.out b/tests/result/webex.pcap.out index e9bc2c5b2..206bd1007 100644 --- a/tests/result/webex.pcap.out +++ b/tests/result/webex.pcap.out @@ -5,7 +5,7 @@ DPI Packets (UDP): 17 (8.50 pkts/flow) Confidence Match by port : 1 (flows) Confidence Match by IP : 3 (flows) Confidence DPI : 53 (flows) -Num dissector calls: 1087 (19.07 diss/flow) +Num dissector calls: 1072 (18.81 diss/flow) HTTP 22 3182 2 TLS 106 11841 8 diff --git a/tests/result/weibo.pcap.out b/tests/result/weibo.pcap.out index 363cfeff9..2c5eb56ef 100644 --- a/tests/result/weibo.pcap.out +++ b/tests/result/weibo.pcap.out @@ -5,7 +5,7 @@ DPI Packets (UDP): 44 (3.14 pkts/flow) Confidence Match by port : 13 (flows) Confidence Match by IP : 8 (flows) Confidence DPI : 23 (flows) -Num dissector calls: 925 (21.02 diss/flow) +Num dissector calls: 904 (20.55 diss/flow) DNS 6 630 3 HTTP 19 2275 5 diff --git a/tests/result/wireguard.pcap.out b/tests/result/wireguard.pcap.out index ae3ea6e24..ea7cc9a95 100644 --- a/tests/result/wireguard.pcap.out +++ b/tests/result/wireguard.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (UDP): 4 (4.00 pkts/flow) Confidence DPI : 1 (flows) -Num dissector calls: 140 (140.00 diss/flow) +Num dissector calls: 138 (138.00 diss/flow) WireGuard 2399 734182 1 diff --git a/tests/result/zoom.pcap.out b/tests/result/zoom.pcap.out index 13948015b..4937c15a6 100644 --- a/tests/result/zoom.pcap.out +++ b/tests/result/zoom.pcap.out @@ -5,7 +5,7 @@ DPI Packets (UDP): 25 (1.47 pkts/flow) DPI Packets (other): 2 (1.00 pkts/flow) Confidence Match by IP : 2 (flows) Confidence DPI : 31 (flows) -Num dissector calls: 937 (28.39 diss/flow) +Num dissector calls: 936 (28.36 diss/flow) DNS 2 205 1 MDNS 1 87 1 diff --git a/tests/result/zoom2.pcap.out b/tests/result/zoom2.pcap.out index 007b4edea..58d153135 100644 --- a/tests/result/zoom2.pcap.out +++ b/tests/result/zoom2.pcap.out @@ -5,7 +5,7 @@ DPI Packets (UDP): 75 (25.00 pkts/flow) DPI Packets (other): 1 (1.00 pkts/flow) Confidence Match by IP : 3 (flows) Confidence DPI : 2 (flows) -Num dissector calls: 943 (188.60 diss/flow) +Num dissector calls: 871 (174.20 diss/flow) ICMP 27 1890 1 Zoom 11950 9004950 4 |