From 470eaa6ff388435d7233ff2680e3ea013068d1fe Mon Sep 17 00:00:00 2001 From: Ivan Nardi <12729895+IvanNardi@users.noreply.github.com> Date: Tue, 17 Jan 2023 11:38:39 +0100 Subject: [PATCH] Add Meraki Cloud protocol and improve other protocols (#1854) Avoid some LineCall and Jabber false positives. Detect Discord mid flows. Fix Bittorrent detection. --- src/include/ndpi_protocol_ids.h | 2 +- src/include/ndpi_protocols.h | 1 + src/lib/ndpi_main.c | 9 ++- src/lib/protocols/bittorrent.c | 4 +- src/lib/protocols/discord.c | 3 +- src/lib/protocols/jabber.c | 13 ++-- src/lib/protocols/line.c | 9 ++- src/lib/protocols/merakicloud.c | 62 ++++++++++++++++++ tests/pcap/discord_mid_flow.pcap | Bin 0 -> 4704 bytes tests/pcap/linecall_falsepositve.pcap | Bin 0 -> 17138 bytes tests/pcap/merakicloud.pcapng | Bin 0 -> 7628 bytes tests/result/1kxun.pcap.out | 2 +- tests/result/4in4tunnel.pcap.out | 2 +- tests/result/6in6tunnel.pcap.out | 2 +- tests/result/EAQ.pcap.out | 2 +- tests/result/KakaoTalk_chat.pcap.out | 2 +- tests/result/KakaoTalk_talk.pcap.out | 2 +- tests/result/Oscar.pcap.out | 2 +- tests/result/amqp.pcap.out | 2 +- tests/result/anyconnect-vpn.pcap.out | 2 +- tests/result/cassandra.pcap.out | 2 +- tests/result/collectd.pcap.out | 2 +- tests/result/dhcp-fuzz.pcapng.out | 2 +- tests/result/discord_mid_flow.pcap.out | 25 +++++++ tests/result/emotet.pcap.out | 2 +- tests/result/fastcgi.pcap.out | 2 +- tests/result/ftp-start-tls.pcap.out | 2 +- tests/result/ftp.pcap.out | 2 +- tests/result/ftp_failed.pcap.out | 2 +- tests/result/fuzz-2006-06-26-2594.pcap.out | 2 +- tests/result/fuzz-2006-09-29-28586.pcap.out | 2 +- tests/result/fuzz-2020-02-16-11740.pcap.out | 2 +- tests/result/gnutella.pcap.out | 2 +- tests/result/google_ssl.pcap.out | 2 +- tests/result/gtp_false_positive.pcapng.out | 2 +- tests/result/http_ipv6.pcap.out | 2 +- tests/result/imap-starttls.pcap.out | 2 +- tests/result/imap.pcap.out | 2 +- tests/result/imo.pcap.out | 2 +- tests/result/instagram.pcap.out | 2 +- tests/result/iphone.pcap.out | 2 +- tests/result/irc.pcap.out | 2 +- tests/result/kerberos.pcap.out | 2 +- tests/result/kontiki.pcap.out | 2 +- tests/result/line.pcap.out | 2 +- tests/result/linecall_falsepositve.pcap.out | 28 ++++++++ tests/result/log4j-webapp-exploit.pcap.out | 2 +- tests/result/lru_ipv6_caches.pcapng.out | 2 +- tests/result/merakicloud.pcapng.out | 25 +++++++ tests/result/mongo_false_positive.pcapng.out | 2 +- tests/result/mssql_tds.pcap.out | 2 +- tests/result/nest_log_sink.pcap.out | 2 +- tests/result/nintendo.pcap.out | 2 +- tests/result/nntp.pcap.out | 2 +- tests/result/openvpn.pcap.out | 2 +- tests/result/oracle12.pcapng.out | 2 +- tests/result/pop3.pcap.out | 2 +- tests/result/pop3_stls.pcap.out | 2 +- tests/result/pps.pcap.out | 2 +- tests/result/quic.pcap.out | 2 +- tests/result/quic_0RTT.pcap.out | 2 +- tests/result/radius_false_positive.pcapng.out | 2 +- tests/result/reasm_crash_anon.pcapng.out | 2 +- tests/result/reasm_segv_anon.pcapng.out | 2 +- tests/result/rsh.pcap.out | 2 +- tests/result/rsync.pcap.out | 2 +- tests/result/rtmp.pcap.out | 2 +- tests/result/sflow.pcap.out | 2 +- tests/result/sip_hello.pcapng.out | 2 +- tests/result/skype.pcap.out | 2 +- tests/result/skype_no_unknown.pcap.out | 2 +- tests/result/smb_frags.pcap.out | 2 +- tests/result/smbv1.pcap.out | 2 +- tests/result/smtp-starttls.pcap.out | 2 +- tests/result/smtp.pcap.out | 2 +- tests/result/soap.pcap.out | 2 +- tests/result/socks-http-example.pcap.out | 2 +- tests/result/starcraft_battle.pcap.out | 2 +- tests/result/stun.pcap.out | 2 +- tests/result/stun_signal.pcapng.out | 2 +- tests/result/telegram.pcap.out | 2 +- tests/result/telnet.pcap.out | 2 +- tests/result/threema.pcap.out | 2 +- tests/result/tinc.pcap.out | 2 +- .../result/tls_certificate_too_long.pcap.out | 2 +- tests/result/tls_false_positives.pcapng.out | 2 +- tests/result/toca-boca.pcap.out | 2 +- tests/result/viber.pcap.out | 2 +- tests/result/vnc.pcap.out | 2 +- tests/result/wa_video.pcap.out | 2 +- tests/result/waze.pcap.out | 2 +- tests/result/webex.pcap.out | 2 +- tests/result/weibo.pcap.out | 2 +- tests/result/whatsapp.pcap.out | 2 +- tests/result/whois.pcapng.out | 2 +- tests/result/wireguard.pcap.out | 2 +- tests/result/z3950.pcapng.out | 2 +- tests/result/zoom.pcap.out | 2 +- tests/result/zoom2.pcap.out | 2 +- tests/result/zoom_p2p.pcapng.out | 2 +- windows/nDPI.vcxproj | 1 + windows/nDPI.vcxproj.filters | 1 + 102 files changed, 255 insertions(+), 100 deletions(-) create mode 100644 src/lib/protocols/merakicloud.c create mode 100644 tests/pcap/discord_mid_flow.pcap create mode 100644 tests/pcap/linecall_falsepositve.pcap create mode 100644 tests/pcap/merakicloud.pcapng create mode 100644 tests/result/discord_mid_flow.pcap.out create mode 100644 tests/result/linecall_falsepositve.pcap.out create mode 100644 tests/result/merakicloud.pcapng.out diff --git a/src/include/ndpi_protocol_ids.h b/src/include/ndpi_protocol_ids.h index 856778dc8..379a1560e 100644 --- a/src/include/ndpi_protocol_ids.h +++ b/src/include/ndpi_protocol_ids.h @@ -94,7 +94,7 @@ typedef enum { NDPI_PROTOCOL_OCSP = 63, NDPI_PROTOCOL_VXLAN = 64, NDPI_PROTOCOL_IRC = 65, - NDPI_PROTOCOL_FREE_66 = 66, /* FREE */ + NDPI_PROTOCOL_MERAKI_CLOUD = 66, NDPI_PROTOCOL_JABBER = 67, NDPI_PROTOCOL_NATS = 68, NDPI_PROTOCOL_AMONG_US = 69, diff --git a/src/include/ndpi_protocols.h b/src/include/ndpi_protocols.h index d489b4cdf..9c768518e 100644 --- a/src/include/ndpi_protocols.h +++ b/src/include/ndpi_protocols.h @@ -236,6 +236,7 @@ void init_munin_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_in void init_elasticsearch_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id); void init_tuya_lp_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id); void init_tplink_shp_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id); +void init_merakicloud_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id); /* ndpi_main.c */ extern u_int32_t ndpi_ip_port_hash_funct(u_int32_t ip, u_int16_t port); diff --git a/src/lib/ndpi_main.c b/src/lib/ndpi_main.c index dd54356cf..bc53a7597 100644 --- a/src/lib/ndpi_main.c +++ b/src/lib/ndpi_main.c @@ -1322,10 +1322,10 @@ static void ndpi_init_protocol_defaults(struct ndpi_detection_module_struct *ndp "IRC", NDPI_PROTOCOL_CATEGORY_CHAT, ndpi_build_default_ports(ports_a, 194, 0, 0, 0, 0) /* TCP */, ndpi_build_default_ports(ports_b, 194, 0, 0, 0, 0) /* UDP */); - ndpi_set_proto_defaults(ndpi_str, 1 /* cleartext */, 0 /* nw proto */, NDPI_PROTOCOL_ACCEPTABLE, NDPI_PROTOCOL_FREE_66, - "Free66", NDPI_PROTOCOL_CATEGORY_NETWORK, + ndpi_set_proto_defaults(ndpi_str, 1 /* cleartext */, 0 /* nw proto */, NDPI_PROTOCOL_ACCEPTABLE, NDPI_PROTOCOL_MERAKI_CLOUD, + "MerakiCloud", NDPI_PROTOCOL_CATEGORY_NETWORK, ndpi_build_default_ports(ports_a, 0, 0, 0, 0, 0) /* TCP */, - ndpi_build_default_ports(ports_b, 5072, 0, 0, 0, 0) /* UDP */); + ndpi_build_default_ports(ports_b, 0, 0, 0, 0, 0) /* UDP */); ndpi_set_proto_defaults(ndpi_str, 1 /* cleartext */, 0 /* nw proto */, NDPI_PROTOCOL_ACCEPTABLE, NDPI_PROTOCOL_JABBER, "Jabber", NDPI_PROTOCOL_CATEGORY_WEB, ndpi_build_default_ports(ports_a, 0, 0, 0, 0, 0) /* TCP */, @@ -4762,6 +4762,9 @@ static int ndpi_callback_init(struct ndpi_detection_module_struct *ndpi_str) { /* TPLINK_SHP */ init_tplink_shp_dissector(ndpi_str, &a); + /* Meraki Cloud */ + init_merakicloud_dissector(ndpi_str, &a); + #ifdef CUSTOM_NDPI_PROTOCOLS #include "../../../nDPI-custom/custom_ndpi_main_init.c" #endif diff --git a/src/lib/protocols/bittorrent.c b/src/lib/protocols/bittorrent.c index c618ea905..cdb62e8db 100644 --- a/src/lib/protocols/bittorrent.c +++ b/src/lib/protocols/bittorrent.c @@ -454,6 +454,8 @@ static void ndpi_search_bittorrent(struct ndpi_detection_module_struct *ndpi_str struct ndpi_packet_struct *packet = &ndpi_struct->packet; char *bt_proto = NULL; + NDPI_LOG_DBG(ndpi_struct, "Search bittorrent\n"); + /* This is broadcast */ if(packet->iph) { if((packet->iph->saddr == 0xFFFFFFFF) || (packet->iph->daddr == 0xFFFFFFFF)) @@ -491,7 +493,7 @@ static void ndpi_search_bittorrent(struct ndpi_detection_module_struct *ndpi_str wireshark/epan/dissectors/packet-bt-utp.c */ - if(packet->payload_packet_len >= 23 /* min header size */) { + if(packet->payload_packet_len >= 20 /* min header size */) { if( (strncmp((const char*)packet->payload, bt_search, strlen(bt_search)) == 0) || (strncmp((const char*)packet->payload, bt_search1, strlen(bt_search1)) == 0) diff --git a/src/lib/protocols/discord.c b/src/lib/protocols/discord.c index 36ba8274e..eede88b86 100644 --- a/src/lib/protocols/discord.c +++ b/src/lib/protocols/discord.c @@ -70,7 +70,8 @@ void ndpi_search_discord(struct ndpi_detection_module_struct *ndpi_struct, } } - NDPI_EXCLUDE_PROTO(ndpi_struct, flow); + if (flow->packet_counter >= 5) + NDPI_EXCLUDE_PROTO(ndpi_struct, flow); } void init_discord_dissector(struct ndpi_detection_module_struct *ndpi_struct, diff --git a/src/lib/protocols/jabber.c b/src/lib/protocols/jabber.c index 54d13a6fb..7a8c3a3d7 100644 --- a/src/lib/protocols/jabber.c +++ b/src/lib/protocols/jabber.c @@ -78,6 +78,7 @@ void ndpi_search_jabber_tcp(struct ndpi_detection_module_struct *ndpi_struct, st if (flow->packet_counter > max_packets - 1) { ndpi_int_jabber_add_connection(ndpi_struct, flow, NDPI_PROTOCOL_JABBER, NDPI_CONFIDENCE_DPI); + return; } for (i = 0; i < NDPI_ARRAY_LENGTH(valid_patterns); ++i) { @@ -86,6 +87,8 @@ void ndpi_search_jabber_tcp(struct ndpi_detection_module_struct *ndpi_struct, st return; } } + NDPI_EXCLUDE_PROTO(ndpi_struct, flow); + return; } /* search for jabber here */ @@ -93,7 +96,7 @@ void ndpi_search_jabber_tcp(struct ndpi_detection_module_struct *ndpi_struct, st if (packet->payload_packet_len >= NDPI_STATICSTRING_LEN("payload, "payload[0], - "xmlns='http://jabber.org/protocol/caps'", packet->payload_packet_len) != NULL) + "xmlns='http://jabber.org/protocol/", packet->payload_packet_len) != NULL) { ndpi_int_jabber_add_connection(ndpi_struct, flow, NDPI_PROTOCOL_JABBER, NDPI_CONFIDENCE_DPI); return; @@ -128,14 +131,12 @@ void ndpi_search_jabber_tcp(struct ndpi_detection_module_struct *ndpi_struct, st /* search for subprotocols */ check_content_type_and_change_protocol(ndpi_struct, flow, 13); - return; } - } - - if (flow->packet_counter > max_packets) { - NDPI_EXCLUDE_PROTO(ndpi_struct, flow); return; } + + NDPI_EXCLUDE_PROTO(ndpi_struct, flow); + return; } diff --git a/src/lib/protocols/line.c b/src/lib/protocols/line.c index 64cb7253b..e7e7f422b 100644 --- a/src/lib/protocols/line.c +++ b/src/lib/protocols/line.c @@ -65,8 +65,13 @@ void ndpi_search_line(struct ndpi_detection_module_struct *ndpi_struct, if((u_int8_t)(flow->l4.udp.line_base_cnt[packet->packet_direction] + flow->l4.udp.line_pkts[packet->packet_direction]) == packet->payload[3]) { flow->l4.udp.line_pkts[packet->packet_direction] += 1; - if(flow->l4.udp.line_pkts[0] >= 4 && flow->l4.udp.line_pkts[1] >= 4) - ndpi_int_line_add_connection(ndpi_struct, flow); + if(flow->l4.udp.line_pkts[0] >= 4 && flow->l4.udp.line_pkts[1] >= 4) { + /* To avoid false positives: usually "base pkt numbers" per-direction are different */ + if(flow->l4.udp.line_base_cnt[0] != flow->l4.udp.line_base_cnt[1]) + ndpi_int_line_add_connection(ndpi_struct, flow); + else + NDPI_EXCLUDE_PROTO(ndpi_struct, flow); + } return; } } diff --git a/src/lib/protocols/merakicloud.c b/src/lib/protocols/merakicloud.c new file mode 100644 index 000000000..40fc1b5af --- /dev/null +++ b/src/lib/protocols/merakicloud.c @@ -0,0 +1,62 @@ +/* + * merakicloud.c + * + * Copyright (C) 2011-23 - ntop.org + * + * nDPI is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * nDPI is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with nDPI. If not, see . + * + */ + +#include "ndpi_protocol_ids.h" + +#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_MERAKI_CLOUD + +#include "ndpi_api.h" + +static void ndpi_int_merakicloud_add_connection(struct ndpi_detection_module_struct * const ndpi_struct, + struct ndpi_flow_struct * const flow) +{ + NDPI_LOG_INFO(ndpi_struct, "found MerakiCloud\n"); + ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_MERAKI_CLOUD, + NDPI_PROTOCOL_UNKNOWN, NDPI_CONFIDENCE_DPI); +} + +static void ndpi_search_merakicloud(struct ndpi_detection_module_struct *ndpi_struct, + struct ndpi_flow_struct *flow) +{ + struct ndpi_packet_struct * const packet = &ndpi_struct->packet; + + NDPI_LOG_DBG(ndpi_struct, "search MerakiCloud\n"); + + if((flow->c_port == ntohs(7351) || flow->s_port == ntohs(7351)) && + packet->payload_packet_len > 4 && + get_u_int32_t(packet->payload, 0) == ntohl(0xfef72891)) { + ndpi_int_merakicloud_add_connection(ndpi_struct, flow); + return; + } + NDPI_EXCLUDE_PROTO(ndpi_struct, flow); +} + +void init_merakicloud_dissector(struct ndpi_detection_module_struct *ndpi_struct, + u_int32_t *id) +{ + ndpi_set_bitmask_protocol_detection("MerakiCloud", ndpi_struct, *id, + NDPI_PROTOCOL_MERAKI_CLOUD, + ndpi_search_merakicloud, + NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_UDP_WITH_PAYLOAD, + SAVE_DETECTION_BITMASK_AS_UNKNOWN, + ADD_TO_DETECTION_BITMASK); + + *id += 1; +} diff --git a/tests/pcap/discord_mid_flow.pcap b/tests/pcap/discord_mid_flow.pcap new file mode 100644 index 0000000000000000000000000000000000000000..83bfc7721e136d6d3461e36547f406117e3d4413 GIT binary patch literal 4704 zcmb7`3ow-HAIIOd>(+(c{3BGzCCXyOw!8M?R*_3|b$66p$|Wf}N^Yw|Qim;0Div~0 zE#*&AoT&I8R!Rzya+FkiN>PzZIM4fzcjo{6=gfcReP-U7-I<;5=lOk}-|yMCy}taS z3_?NhH8X=CB=E(cwswccLJATAKBLd}!x!4-Q@q=!Sq^KqVvgplI}&UH??O0am-7eISA)&`j^4 zb)!4z%&m7vsA_XmRyR*yMs;GDnn7g50enWE+4X-iIr3OVT2Mt$CYpinRfmu%juM({ z`vJ=3&MC%CZSA4otynUZ^AmEb`aIgZnJ7$GuK%TyVGZwC+N2$^pSxi&E;1w&nnJzcya}d=PMiS_vrq&qHA-D%mrS`GaW%a-xyS0mVDTc9Ol=d z=rWy8?2V6&0i6!$x->#_8iaM<9jN=Ls@R-fA)(!iX6_<1r`&k7BJ0agMNlT5dxwxI z?oU{5G?dF7?!`^jnAMke`e+qp-?(weHzB`*;xhdkHBay0^bZvohW?g^q^nvL9X%y( zbYRK^ROL^Mo{iB%V0u6uPCuc%gkm-$5a`E!L4t+k^?o51e;(Nx);eTW;NI>gHyQb% zQgK_GQ<%vt{o9?nL~e;-?3^;7bF%NV!EcF4?PRNH^ERt@<9y`0l3&Au%7^R!Ao=Qb zdnNM+9Mwhhybr|YlwY$LWt&o+YQ?XZc2<^gV6;r zJ>v^bk49>>xk;sBqll4}v=a=MFK71qlLPJ9S?WQw!)%4_xAX+v6N8y*3_v#r^lTME za~gu3e=T(W)P>lbib?1^p_x-5ME+0tE@(ykZm1$C6VDwb)Fu2aSnee#m%FtKHx*8~ zy_>Z?J-SSF?dD!qq?GCRtgK<}B*Vsbt2lZ<`)N&!l%A= zb*<=Q{Ph)C#WhQYu4g9}ZyX=&Yby&WY0|9WA!3fDP~?-VT*sWHN17@U>Aqc9_oczz zS1XTqpT;8pm`DrPqTH-PfsgZPX2SUs+y3+FU50M^QO)xO-oj1=WJl%HVrfBkcQCRi z{Kp5N`&I)7*_woIi{02RYM@2!OBd^8&zDeSndb=ilT5qXjjo$dxn!#n)jMO%`=5fBdwyXx{ z#R63g66zM4-%+|1AEw`Wi__P<8DXBGYq;*Axppi+>ia@c@WFqebLuZoesT8PbmbD4!^Q^} z>*}?dkLw@)IsLY7bK2_;HlT9=y^avwP7kHCJ7GFqgwwUDb*Fe@e{(y=*&(Of5iK=t za>_mq_11iAi{$9)mx!I=BMQH4Z!ZVXtpMGc(7D?cU~~_d-adxYJ&GjO6rJC^IMe;d z0%Jx;vL>q5J;>XannBMz8(R9d>6HH6_gOiW4pxB91@vviCL|1-kZO2BRImvtC83>+ zW=aT6h}|$&ktI|S^}jRm+*8C%O<=hQl*@IRi<{b4Ek6*yq(Ao2WaDO8#@+n)WWKaV z=URMOKrY23NH|~7`1R$AeO-^av!*8E2)%iRW2RCeQ}!hh_>D#j4eblfGR}HkIUGd2 z={YU!ZqF|DN-bREl%0C2$Frj955-^e1>~QcexSss-1pUf2yQeUaN9?ySM5zu2doy@ zLH=djLGJFyv?hPGv}ZH)aK%JN`VeUf8$!n7n09m90@SXT(5U&*cFJd_Z?5 zbOQEa82va*KcIutdl<*wgkLzl{Q37mq1Q=0))pg!C$z#iC3Bl%jjxL}{XdE#^b)Jf I&hP>KZ(=a7zW@LL literal 0 HcmV?d00001 diff --git a/tests/pcap/linecall_falsepositve.pcap b/tests/pcap/linecall_falsepositve.pcap new file mode 100644 index 0000000000000000000000000000000000000000..fc3d4430df648b9b5bf2a99e7603cf4c587c4c64 GIT binary patch literal 17138 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 EzqFn{4*&oF literal 0 HcmV?d00001 diff --git a/tests/pcap/merakicloud.pcapng b/tests/pcap/merakicloud.pcapng new file mode 100644 index 0000000000000000000000000000000000000000..938966eaa9d92d6a690b0800381e5999d50e254a GIT binary patch literal 7628 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 5.36.141.228:54935 [VLAN: 1][proto: 58/Discord][IP: 58/Discord][Encrypted][Confidence: DPI][cat: Collaborative/15][30 pkts/3110 bytes <-> 10 pkts/930 bytes][Goodput ratio: 43/37][24.00 sec][bytes ratio: 0.540 (Upload)][IAT c2s/s2c min/avg/max/stddev: 42/77 846/1740 1000/4217 343/1555][Pkt Len c2s/s2c min/avg/max/stddev: 72/68 104/93 110/118 14/25][Plen Bins: 25,75,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0] diff --git a/tests/result/emotet.pcap.out b/tests/result/emotet.pcap.out index 3f32bb523..113ffcd4d 100644 --- a/tests/result/emotet.pcap.out +++ b/tests/result/emotet.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (TCP): 48 (8.00 pkts/flow) Confidence DPI : 6 (flows) -Num dissector calls: 183 (30.50 diss/flow) +Num dissector calls: 182 (30.33 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/fastcgi.pcap.out b/tests/result/fastcgi.pcap.out index e27ee2872..d180d6ed7 100644 --- a/tests/result/fastcgi.pcap.out +++ b/tests/result/fastcgi.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (TCP): 6 (6.00 pkts/flow) Confidence DPI : 1 (flows) -Num dissector calls: 146 (146.00 diss/flow) +Num dissector calls: 145 (145.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/ftp-start-tls.pcap.out b/tests/result/ftp-start-tls.pcap.out index 96d79a4e2..a3083eb19 100644 --- a/tests/result/ftp-start-tls.pcap.out +++ b/tests/result/ftp-start-tls.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (TCP): 17 (17.00 pkts/flow) Confidence DPI : 1 (flows) -Num dissector calls: 145 (145.00 diss/flow) +Num dissector calls: 144 (144.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/ftp.pcap.out b/tests/result/ftp.pcap.out index 1af6b3147..d70f9da87 100644 --- a/tests/result/ftp.pcap.out +++ b/tests/result/ftp.pcap.out @@ -3,7 +3,7 @@ Guessed flow protos: 1 DPI Packets (TCP): 49 (16.33 pkts/flow) Confidence Unknown : 1 (flows) Confidence DPI : 2 (flows) -Num dissector calls: 612 (204.00 diss/flow) +Num dissector calls: 606 (202.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/3/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/ftp_failed.pcap.out b/tests/result/ftp_failed.pcap.out index 3537298e0..4f50b03c3 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: 145 (145.00 diss/flow) +Num dissector calls: 144 (144.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/fuzz-2006-06-26-2594.pcap.out b/tests/result/fuzz-2006-06-26-2594.pcap.out index 0a217d4b1..1a26bd179 100644 --- a/tests/result/fuzz-2006-06-26-2594.pcap.out +++ b/tests/result/fuzz-2006-06-26-2594.pcap.out @@ -6,7 +6,7 @@ DPI Packets (other): 5 (1.00 pkts/flow) Confidence Unknown : 30 (flows) Confidence Match by port : 28 (flows) Confidence DPI : 193 (flows) -Num dissector calls: 5305 (21.14 diss/flow) +Num dissector calls: 5334 (21.25 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/180/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/fuzz-2006-09-29-28586.pcap.out b/tests/result/fuzz-2006-09-29-28586.pcap.out index c44b3f6ef..4e179b038 100644 --- a/tests/result/fuzz-2006-09-29-28586.pcap.out +++ b/tests/result/fuzz-2006-09-29-28586.pcap.out @@ -5,7 +5,7 @@ DPI Packets (other): 1 (1.00 pkts/flow) Confidence Unknown : 3 (flows) Confidence Match by port : 26 (flows) Confidence DPI : 11 (flows) -Num dissector calls: 928 (23.20 diss/flow) +Num dissector calls: 924 (23.10 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/87/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/fuzz-2020-02-16-11740.pcap.out b/tests/result/fuzz-2020-02-16-11740.pcap.out index c74e7c188..f26de27e1 100644 --- a/tests/result/fuzz-2020-02-16-11740.pcap.out +++ b/tests/result/fuzz-2020-02-16-11740.pcap.out @@ -5,7 +5,7 @@ DPI Packets (other): 7 (1.00 pkts/flow) Confidence Unknown : 19 (flows) Confidence Match by port : 3 (flows) Confidence DPI : 55 (flows) -Num dissector calls: 1725 (22.40 diss/flow) +Num dissector calls: 1741 (22.61 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/66/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/gnutella.pcap.out b/tests/result/gnutella.pcap.out index fd6e7d6d1..6d23fdea1 100644 --- a/tests/result/gnutella.pcap.out +++ b/tests/result/gnutella.pcap.out @@ -6,7 +6,7 @@ DPI Packets (other): 10 (1.00 pkts/flow) Confidence Unknown : 592 (flows) Confidence Match by port : 1 (flows) Confidence DPI : 167 (flows) -Num dissector calls: 65122 (85.69 diss/flow) +Num dissector calls: 65634 (86.36 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/1779/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/google_ssl.pcap.out b/tests/result/google_ssl.pcap.out index cf8dfa984..51ee57175 100644 --- a/tests/result/google_ssl.pcap.out +++ b/tests/result/google_ssl.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 1 DPI Packets (TCP): 28 (28.00 pkts/flow) Confidence Match by port : 1 (flows) -Num dissector calls: 206 (206.00 diss/flow) +Num dissector calls: 204 (204.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/3/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/gtp_false_positive.pcapng.out b/tests/result/gtp_false_positive.pcapng.out index c42dc2e04..34b25037d 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: 385 (128.33 diss/flow) +Num dissector calls: 388 (129.33 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/9/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/http_ipv6.pcap.out b/tests/result/http_ipv6.pcap.out index 04ca82d22..7e5ff435b 100644 --- a/tests/result/http_ipv6.pcap.out +++ b/tests/result/http_ipv6.pcap.out @@ -4,7 +4,7 @@ DPI Packets (TCP): 77 (5.92 pkts/flow) DPI Packets (UDP): 4 (2.00 pkts/flow) Confidence Match by port : 7 (flows) Confidence DPI : 8 (flows) -Num dissector calls: 142 (9.47 diss/flow) +Num dissector calls: 143 (9.53 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/21/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/imap-starttls.pcap.out b/tests/result/imap-starttls.pcap.out index 724ffa060..d5ff5fc21 100644 --- a/tests/result/imap-starttls.pcap.out +++ b/tests/result/imap-starttls.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (TCP): 19 (19.00 pkts/flow) Confidence DPI : 1 (flows) -Num dissector calls: 195 (195.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 zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/imap.pcap.out b/tests/result/imap.pcap.out index a887c0463..8d2ee448d 100644 --- a/tests/result/imap.pcap.out +++ b/tests/result/imap.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (TCP): 11 (11.00 pkts/flow) Confidence DPI : 1 (flows) -Num dissector calls: 195 (195.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 zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/imo.pcap.out b/tests/result/imo.pcap.out index 10598135e..62fc55777 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: 280 (140.00 diss/flow) +Num dissector calls: 282 (141.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/instagram.pcap.out b/tests/result/instagram.pcap.out index ce576a5f8..2969c38d7 100644 --- a/tests/result/instagram.pcap.out +++ b/tests/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: 1780 (46.84 diss/flow) +Num dissector calls: 1765 (46.45 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/24/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/iphone.pcap.out b/tests/result/iphone.pcap.out index 1a549df85..8fd37d6d8 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 Match by port : 1 (flows) Confidence DPI : 50 (flows) -Num dissector calls: 344 (6.75 diss/flow) +Num dissector calls: 345 (6.76 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/irc.pcap.out b/tests/result/irc.pcap.out index f47cd8437..7d9a7ee2c 100644 --- a/tests/result/irc.pcap.out +++ b/tests/result/irc.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (TCP): 7 (7.00 pkts/flow) Confidence DPI : 1 (flows) -Num dissector calls: 151 (151.00 diss/flow) +Num dissector calls: 150 (150.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/kerberos.pcap.out b/tests/result/kerberos.pcap.out index 1945aaf7c..2fe717725 100644 --- a/tests/result/kerberos.pcap.out +++ b/tests/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: 3741 (103.92 diss/flow) +Num dissector calls: 3712 (103.11 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/75/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/kontiki.pcap.out b/tests/result/kontiki.pcap.out index cfa0e041e..e1201cdb9 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: 312 (39.00 diss/flow) +Num dissector calls: 314 (39.25 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/6/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/line.pcap.out b/tests/result/line.pcap.out index e72173200..6f26d7ceb 100644 --- a/tests/result/line.pcap.out +++ b/tests/result/line.pcap.out @@ -3,7 +3,7 @@ Guessed flow protos: 0 DPI Packets (TCP): 13 (6.50 pkts/flow) DPI Packets (UDP): 40 (13.33 pkts/flow) Confidence DPI : 5 (flows) -Num dissector calls: 707 (141.40 diss/flow) +Num dissector calls: 710 (142.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/9/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/linecall_falsepositve.pcap.out b/tests/result/linecall_falsepositve.pcap.out new file mode 100644 index 000000000..9f3c5dcba --- /dev/null +++ b/tests/result/linecall_falsepositve.pcap.out @@ -0,0 +1,28 @@ +Guessed flow protos: 1 + +DPI Packets (UDP): 25 (25.00 pkts/flow) +Confidence Unknown : 1 (flows) +Num dissector calls: 296 (296.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) +LRU cache stun: 0/0/0 (insert/search/found) +LRU cache tls_cert: 0/0/0 (insert/search/found) +LRU cache mining: 0/1/0 (insert/search/found) +LRU cache msteams: 0/0/0 (insert/search/found) +LRU cache stun_zoom: 0/1/0 (insert/search/found) +Automa host: 0/0 (search/found) +Automa domain: 0/0 (search/found) +Automa tls cert: 0/0 (search/found) +Automa risk mask: 0/0 (search/found) +Automa common alpns: 0/0 (search/found) +Patricia risk mask: 2/0 (search/found) +Patricia risk: 0/0 (search/found) +Patricia protocols: 2/0 (search/found) + +Unknown 42 16442 1 + + + +Undetected flows: + 1 UDP 10.13.129.30:56295 <-> 10.10.214.6:5093 [VLAN: 265][proto: 0/Unknown][IP: 0/Unknown][ClearText][Confidence: Unknown][21 pkts/5987 bytes <-> 21 pkts/10455 bytes][Goodput ratio: 82/90][150.38 sec][bytes ratio: -0.272 (Download)][IAT c2s/s2c min/avg/max/stddev: 14/13 7519/7518 120047/120047 29055/29055][Pkt Len c2s/s2c min/avg/max/stddev: 191/298 285/498 473/732 130/147][PLAIN TEXT (L@AERgX)][Plen Bins: 0,0,0,0,33,0,0,16,0,0,0,0,0,16,0,0,28,0,0,0,0,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0] diff --git a/tests/result/log4j-webapp-exploit.pcap.out b/tests/result/log4j-webapp-exploit.pcap.out index 75ca0ee27..656aecd87 100644 --- a/tests/result/log4j-webapp-exploit.pcap.out +++ b/tests/result/log4j-webapp-exploit.pcap.out @@ -3,7 +3,7 @@ Guessed flow protos: 2 DPI Packets (TCP): 63 (9.00 pkts/flow) Confidence Unknown : 2 (flows) Confidence DPI : 5 (flows) -Num dissector calls: 416 (59.43 diss/flow) +Num dissector calls: 412 (58.86 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/6/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/lru_ipv6_caches.pcapng.out b/tests/result/lru_ipv6_caches.pcapng.out index 8d8ed3ca5..065c5cb0a 100644 --- a/tests/result/lru_ipv6_caches.pcapng.out +++ b/tests/result/lru_ipv6_caches.pcapng.out @@ -5,7 +5,7 @@ DPI Packets (UDP): 42 (4.67 pkts/flow) Confidence Unknown : 4 (flows) Confidence DPI (cache) : 2 (flows) Confidence DPI : 6 (flows) -Num dissector calls: 1208 (100.67 diss/flow) +Num dissector calls: 1216 (101.33 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/12/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/merakicloud.pcapng.out b/tests/result/merakicloud.pcapng.out new file mode 100644 index 000000000..2f0359b8b --- /dev/null +++ b/tests/result/merakicloud.pcapng.out @@ -0,0 +1,25 @@ +Guessed flow protos: 0 + +DPI Packets (UDP): 1 (1.00 pkts/flow) +Confidence DPI : 1 (flows) +Num dissector calls: 105 (105.00 diss/flow) +LRU cache ookla: 0/0/0 (insert/search/found) +LRU cache bittorrent: 0/0/0 (insert/search/found) +LRU cache zoom: 0/0/0 (insert/search/found) +LRU cache stun: 0/0/0 (insert/search/found) +LRU cache tls_cert: 0/0/0 (insert/search/found) +LRU cache mining: 0/0/0 (insert/search/found) +LRU cache msteams: 0/0/0 (insert/search/found) +LRU cache stun_zoom: 0/0/0 (insert/search/found) +Automa host: 0/0 (search/found) +Automa domain: 0/0 (search/found) +Automa tls cert: 0/0 (search/found) +Automa risk mask: 0/0 (search/found) +Automa common alpns: 0/0 (search/found) +Patricia risk mask: 2/0 (search/found) +Patricia risk: 2/0 (search/found) +Patricia protocols: 2/0 (search/found) + +MerakiCloud 44 6049 1 + + 1 UDP 2.36.234.133:47301 <-> 209.206.59.34:7351 [proto: 66/MerakiCloud][IP: 0/Unknown][ClearText][Confidence: DPI][cat: Network/14][22 pkts/3603 bytes <-> 22 pkts/2446 bytes][Goodput ratio: 74/62][400.21 sec][bytes ratio: 0.191 (Mixed)][IAT c2s/s2c min/avg/max/stddev: 198/199 19165/19166 25000/25010 10520/10521][Pkt Len c2s/s2c min/avg/max/stddev: 154/88 164/111 197/190 18/43][Plen Bins: 0,38,0,38,22,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0] diff --git a/tests/result/mongo_false_positive.pcapng.out b/tests/result/mongo_false_positive.pcapng.out index 575897f83..bcd682f77 100644 --- a/tests/result/mongo_false_positive.pcapng.out +++ b/tests/result/mongo_false_positive.pcapng.out @@ -2,7 +2,7 @@ Guessed flow protos: 1 DPI Packets (TCP): 26 (26.00 pkts/flow) Confidence Match by port : 1 (flows) -Num dissector calls: 401 (401.00 diss/flow) +Num dissector calls: 397 (397.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/mssql_tds.pcap.out b/tests/result/mssql_tds.pcap.out index 098986820..47c8bf62a 100644 --- a/tests/result/mssql_tds.pcap.out +++ b/tests/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: 280 (23.33 diss/flow) +Num dissector calls: 276 (23.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/nest_log_sink.pcap.out b/tests/result/nest_log_sink.pcap.out index c0df07973..851b473d5 100644 --- a/tests/result/nest_log_sink.pcap.out +++ b/tests/result/nest_log_sink.pcap.out @@ -4,7 +4,7 @@ DPI Packets (TCP): 130 (10.00 pkts/flow) DPI Packets (UDP): 2 (2.00 pkts/flow) Confidence Match by port : 1 (flows) Confidence DPI : 13 (flows) -Num dissector calls: 1765 (126.07 diss/flow) +Num dissector calls: 1753 (125.21 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/3/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/nintendo.pcap.out b/tests/result/nintendo.pcap.out index e02ad96cd..36a8b3f8c 100644 --- a/tests/result/nintendo.pcap.out +++ b/tests/result/nintendo.pcap.out @@ -6,7 +6,7 @@ DPI Packets (other): 2 (1.00 pkts/flow) Confidence Unknown : 5 (flows) Confidence Match by port : 1 (flows) Confidence DPI : 15 (flows) -Num dissector calls: 1250 (59.52 diss/flow) +Num dissector calls: 1255 (59.76 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/18/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/nntp.pcap.out b/tests/result/nntp.pcap.out index 61d020eba..3ce6eaabf 100644 --- a/tests/result/nntp.pcap.out +++ b/tests/result/nntp.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (TCP): 6 (6.00 pkts/flow) Confidence DPI : 1 (flows) -Num dissector calls: 124 (124.00 diss/flow) +Num dissector calls: 123 (123.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/openvpn.pcap.out b/tests/result/openvpn.pcap.out index 97d0f32bd..ccb63d7ee 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: 385 (128.33 diss/flow) +Num dissector calls: 384 (128.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/oracle12.pcapng.out b/tests/result/oracle12.pcapng.out index 66b742c81..c7aa44d74 100644 --- a/tests/result/oracle12.pcapng.out +++ b/tests/result/oracle12.pcapng.out @@ -2,7 +2,7 @@ Guessed flow protos: 1 DPI Packets (TCP): 20 (20.00 pkts/flow) Confidence Match by port : 1 (flows) -Num dissector calls: 282 (282.00 diss/flow) +Num dissector calls: 278 (278.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/pop3.pcap.out b/tests/result/pop3.pcap.out index a91d37329..3842932b3 100644 --- a/tests/result/pop3.pcap.out +++ b/tests/result/pop3.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (TCP): 10 (10.00 pkts/flow) Confidence DPI : 1 (flows) -Num dissector calls: 171 (171.00 diss/flow) +Num dissector calls: 169 (169.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/pop3_stls.pcap.out b/tests/result/pop3_stls.pcap.out index 16497e800..b7ce73eb4 100644 --- a/tests/result/pop3_stls.pcap.out +++ b/tests/result/pop3_stls.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (TCP): 18 (18.00 pkts/flow) Confidence DPI : 1 (flows) -Num dissector calls: 223 (223.00 diss/flow) +Num dissector calls: 219 (219.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/pps.pcap.out b/tests/result/pps.pcap.out index ace733243..62f0e180d 100644 --- a/tests/result/pps.pcap.out +++ b/tests/result/pps.pcap.out @@ -5,7 +5,7 @@ DPI Packets (UDP): 196 (4.45 pkts/flow) Confidence Unknown : 29 (flows) Confidence Match by port : 2 (flows) Confidence DPI : 76 (flows) -Num dissector calls: 5710 (53.36 diss/flow) +Num dissector calls: 5739 (53.64 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/93/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/quic.pcap.out b/tests/result/quic.pcap.out index b043c9f3f..d7bd438c5 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 port : 1 (flows) Confidence DPI : 9 (flows) -Num dissector calls: 208 (20.80 diss/flow) +Num dissector calls: 209 (20.90 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/3/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/quic_0RTT.pcap.out b/tests/result/quic_0RTT.pcap.out index 5f54739a4..51f147760 100644 --- a/tests/result/quic_0RTT.pcap.out +++ b/tests/result/quic_0RTT.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (UDP): 4 (2.00 pkts/flow) Confidence DPI : 2 (flows) -Num dissector calls: 183 (91.50 diss/flow) +Num dissector calls: 184 (92.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/radius_false_positive.pcapng.out b/tests/result/radius_false_positive.pcapng.out index cce006ad0..7b05fa646 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 Match by port : 1 (flows) -Num dissector calls: 198 (198.00 diss/flow) +Num dissector calls: 199 (199.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/3/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/reasm_crash_anon.pcapng.out b/tests/result/reasm_crash_anon.pcapng.out index 1abdea29e..cd6f93340 100644 --- a/tests/result/reasm_crash_anon.pcapng.out +++ b/tests/result/reasm_crash_anon.pcapng.out @@ -2,7 +2,7 @@ Guessed flow protos: 1 DPI Packets (TCP): 33 (33.00 pkts/flow) Confidence Unknown : 1 (flows) -Num dissector calls: 315 (315.00 diss/flow) +Num dissector calls: 311 (311.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/reasm_segv_anon.pcapng.out b/tests/result/reasm_segv_anon.pcapng.out index 1dc811455..df64159ab 100644 --- a/tests/result/reasm_segv_anon.pcapng.out +++ b/tests/result/reasm_segv_anon.pcapng.out @@ -2,7 +2,7 @@ Guessed flow protos: 1 DPI Packets (TCP): 33 (33.00 pkts/flow) Confidence Match by port : 1 (flows) -Num dissector calls: 251 (251.00 diss/flow) +Num dissector calls: 249 (249.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/rsh.pcap.out b/tests/result/rsh.pcap.out index 3e5b3cb10..d30b283f0 100644 --- a/tests/result/rsh.pcap.out +++ b/tests/result/rsh.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (TCP): 12 (6.00 pkts/flow) Confidence DPI : 2 (flows) -Num dissector calls: 286 (143.00 diss/flow) +Num dissector calls: 284 (142.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/rsync.pcap.out b/tests/result/rsync.pcap.out index 6b383384a..770427701 100644 --- a/tests/result/rsync.pcap.out +++ b/tests/result/rsync.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (TCP): 9 (9.00 pkts/flow) Confidence DPI : 1 (flows) -Num dissector calls: 164 (164.00 diss/flow) +Num dissector calls: 162 (162.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/rtmp.pcap.out b/tests/result/rtmp.pcap.out index e009962e9..f69880991 100644 --- a/tests/result/rtmp.pcap.out +++ b/tests/result/rtmp.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (TCP): 8 (8.00 pkts/flow) Confidence DPI : 1 (flows) -Num dissector calls: 146 (146.00 diss/flow) +Num dissector calls: 145 (145.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/sflow.pcap.out b/tests/result/sflow.pcap.out index 4b3d418ab..0733ed674 100644 --- a/tests/result/sflow.pcap.out +++ b/tests/result/sflow.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (UDP): 2 (2.00 pkts/flow) Confidence DPI : 1 (flows) -Num dissector calls: 105 (105.00 diss/flow) +Num dissector calls: 106 (106.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/sip_hello.pcapng.out b/tests/result/sip_hello.pcapng.out index a1b689827..d9a6ddbca 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: 208 (208.00 diss/flow) +Num dissector calls: 209 (209.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/skype.pcap.out b/tests/result/skype.pcap.out index 042799cf6..a3ead888e 100644 --- a/tests/result/skype.pcap.out +++ b/tests/result/skype.pcap.out @@ -6,7 +6,7 @@ DPI Packets (other): 5 (1.00 pkts/flow) Confidence Unknown : 59 (flows) Confidence Match by port : 28 (flows) Confidence DPI : 206 (flows) -Num dissector calls: 27117 (92.55 diss/flow) +Num dissector calls: 26899 (91.81 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/261/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/skype_no_unknown.pcap.out b/tests/result/skype_no_unknown.pcap.out index 044f32aa2..afbed172e 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 : 44 (flows) Confidence Match by port : 22 (flows) Confidence DPI : 201 (flows) -Num dissector calls: 22551 (84.46 diss/flow) +Num dissector calls: 22405 (83.91 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/198/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/smb_frags.pcap.out b/tests/result/smb_frags.pcap.out index 047163150..133848d5f 100644 --- a/tests/result/smb_frags.pcap.out +++ b/tests/result/smb_frags.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (TCP): 5 (5.00 pkts/flow) Confidence DPI : 1 (flows) -Num dissector calls: 146 (146.00 diss/flow) +Num dissector calls: 145 (145.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/smbv1.pcap.out b/tests/result/smbv1.pcap.out index c6c1e2a00..2f370004e 100644 --- a/tests/result/smbv1.pcap.out +++ b/tests/result/smbv1.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (TCP): 3 (3.00 pkts/flow) Confidence DPI : 1 (flows) -Num dissector calls: 148 (148.00 diss/flow) +Num dissector calls: 147 (147.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/smtp-starttls.pcap.out b/tests/result/smtp-starttls.pcap.out index 486224b15..6a8aad849 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: 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 zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/smtp.pcap.out b/tests/result/smtp.pcap.out index 8eb99708f..1467f53b7 100644 --- a/tests/result/smtp.pcap.out +++ b/tests/result/smtp.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (TCP): 11 (11.00 pkts/flow) Confidence DPI : 1 (flows) -Num dissector calls: 189 (189.00 diss/flow) +Num dissector calls: 186 (186.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/soap.pcap.out b/tests/result/soap.pcap.out index 2236f2ce1..09397d44c 100644 --- a/tests/result/soap.pcap.out +++ b/tests/result/soap.pcap.out @@ -3,7 +3,7 @@ Guessed flow protos: 2 DPI Packets (TCP): 20 (6.67 pkts/flow) Confidence Match by port : 1 (flows) Confidence DPI : 2 (flows) -Num dissector calls: 360 (120.00 diss/flow) +Num dissector calls: 357 (119.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/socks-http-example.pcap.out b/tests/result/socks-http-example.pcap.out index d574898b3..dec8e6059 100644 --- a/tests/result/socks-http-example.pcap.out +++ b/tests/result/socks-http-example.pcap.out @@ -3,7 +3,7 @@ Guessed flow protos: 1 DPI Packets (TCP): 29 (9.67 pkts/flow) Confidence Match by port : 1 (flows) Confidence DPI : 2 (flows) -Num dissector calls: 455 (151.67 diss/flow) +Num dissector calls: 451 (150.33 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/3/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/starcraft_battle.pcap.out b/tests/result/starcraft_battle.pcap.out index a347acef9..88694d67c 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 Unknown : 1 (flows) Confidence Match by port : 12 (flows) Confidence DPI : 39 (flows) -Num dissector calls: 1410 (27.12 diss/flow) +Num dissector calls: 1411 (27.13 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/39/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/stun.pcap.out b/tests/result/stun.pcap.out index 7e1dc7c26..e17edf2ff 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: 567 (141.75 diss/flow) +Num dissector calls: 569 (142.25 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/stun_signal.pcapng.out b/tests/result/stun_signal.pcapng.out index 16c5f7183..bbcb077b5 100644 --- a/tests/result/stun_signal.pcapng.out +++ b/tests/result/stun_signal.pcapng.out @@ -4,7 +4,7 @@ DPI Packets (UDP): 72 (3.43 pkts/flow) DPI Packets (other): 2 (1.00 pkts/flow) Confidence DPI (partial) : 1 (flows) Confidence DPI : 22 (flows) -Num dissector calls: 2255 (98.04 diss/flow) +Num dissector calls: 2270 (98.70 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/24/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/telegram.pcap.out b/tests/result/telegram.pcap.out index 5c3968188..9b814ab1a 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: 1576 (32.83 diss/flow) +Num dissector calls: 1578 (32.88 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/6/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/telnet.pcap.out b/tests/result/telnet.pcap.out index b3a662978..b45fc3b0c 100644 --- a/tests/result/telnet.pcap.out +++ b/tests/result/telnet.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (TCP): 33 (33.00 pkts/flow) Confidence DPI : 1 (flows) -Num dissector calls: 145 (145.00 diss/flow) +Num dissector calls: 144 (144.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/threema.pcap.out b/tests/result/threema.pcap.out index ba12fa1d2..233c5a464 100644 --- a/tests/result/threema.pcap.out +++ b/tests/result/threema.pcap.out @@ -3,7 +3,7 @@ Guessed flow protos: 2 DPI Packets (TCP): 66 (11.00 pkts/flow) Confidence Unknown : 2 (flows) Confidence DPI : 4 (flows) -Num dissector calls: 1208 (201.33 diss/flow) +Num dissector calls: 1186 (197.67 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/6/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/tinc.pcap.out b/tests/result/tinc.pcap.out index 87664acc1..94670abc6 100644 --- a/tests/result/tinc.pcap.out +++ b/tests/result/tinc.pcap.out @@ -4,7 +4,7 @@ DPI Packets (TCP): 19 (9.50 pkts/flow) DPI Packets (UDP): 2 (1.00 pkts/flow) Confidence DPI (cache) : 2 (flows) Confidence DPI : 2 (flows) -Num dissector calls: 502 (125.50 diss/flow) +Num dissector calls: 496 (124.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/tls_certificate_too_long.pcap.out b/tests/result/tls_certificate_too_long.pcap.out index 03025f5d4..5025ec757 100644 --- a/tests/result/tls_certificate_too_long.pcap.out +++ b/tests/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: 569 (16.26 diss/flow) +Num dissector calls: 565 (16.14 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/6/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/tls_false_positives.pcapng.out b/tests/result/tls_false_positives.pcapng.out index ebff2f8be..8d13921e8 100644 --- a/tests/result/tls_false_positives.pcapng.out +++ b/tests/result/tls_false_positives.pcapng.out @@ -2,7 +2,7 @@ Guessed flow protos: 1 DPI Packets (TCP): 30 (30.00 pkts/flow) Confidence Unknown : 1 (flows) -Num dissector calls: 401 (401.00 diss/flow) +Num dissector calls: 397 (397.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/toca-boca.pcap.out b/tests/result/toca-boca.pcap.out index c4f6b2767..22e25061e 100644 --- a/tests/result/toca-boca.pcap.out +++ b/tests/result/toca-boca.pcap.out @@ -3,7 +3,7 @@ Guessed flow protos: 4 DPI Packets (UDP): 21 (1.00 pkts/flow) Confidence Match by port : 4 (flows) Confidence DPI : 17 (flows) -Num dissector calls: 433 (20.62 diss/flow) +Num dissector calls: 437 (20.81 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/12/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/viber.pcap.out b/tests/result/viber.pcap.out index 4ebcf9592..3672b716c 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 port : 4 (flows) Confidence DPI : 25 (flows) -Num dissector calls: 518 (17.86 diss/flow) +Num dissector calls: 515 (17.76 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/12/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/vnc.pcap.out b/tests/result/vnc.pcap.out index 0e8b3667d..fafb93850 100644 --- a/tests/result/vnc.pcap.out +++ b/tests/result/vnc.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (TCP): 10 (5.00 pkts/flow) Confidence DPI : 2 (flows) -Num dissector calls: 246 (123.00 diss/flow) +Num dissector calls: 244 (122.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/wa_video.pcap.out b/tests/result/wa_video.pcap.out index 8dbcfe738..fde3f1fe0 100644 --- a/tests/result/wa_video.pcap.out +++ b/tests/result/wa_video.pcap.out @@ -4,7 +4,7 @@ DPI Packets (TCP): 33 (33.00 pkts/flow) DPI Packets (UDP): 13 (1.00 pkts/flow) Confidence Unknown : 1 (flows) Confidence DPI : 13 (flows) -Num dissector calls: 495 (35.36 diss/flow) +Num dissector calls: 491 (35.07 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/3/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/waze.pcap.out b/tests/result/waze.pcap.out index b8511bf46..9a9d55b8b 100644 --- a/tests/result/waze.pcap.out +++ b/tests/result/waze.pcap.out @@ -5,7 +5,7 @@ DPI Packets (UDP): 1 (1.00 pkts/flow) Confidence Unknown : 1 (flows) Confidence Match by port : 9 (flows) Confidence DPI : 23 (flows) -Num dissector calls: 338 (10.24 diss/flow) +Num dissector calls: 337 (10.21 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/30/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/webex.pcap.out b/tests/result/webex.pcap.out index 526db6027..752238b05 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 Unknown : 1 (flows) Confidence Match by port : 3 (flows) Confidence DPI : 53 (flows) -Num dissector calls: 315 (5.53 diss/flow) +Num dissector calls: 316 (5.54 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/12/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/weibo.pcap.out b/tests/result/weibo.pcap.out index cab8e87ad..d1db68ee7 100644 --- a/tests/result/weibo.pcap.out +++ b/tests/result/weibo.pcap.out @@ -4,7 +4,7 @@ DPI Packets (TCP): 100 (3.33 pkts/flow) DPI Packets (UDP): 44 (3.14 pkts/flow) Confidence Match by port : 21 (flows) Confidence DPI : 23 (flows) -Num dissector calls: 562 (12.77 diss/flow) +Num dissector calls: 564 (12.82 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/63/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/whatsapp.pcap.out b/tests/result/whatsapp.pcap.out index af25bd911..e00361232 100644 --- a/tests/result/whatsapp.pcap.out +++ b/tests/result/whatsapp.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (TCP): 344 (4.00 pkts/flow) Confidence DPI : 86 (flows) -Num dissector calls: 11954 (139.00 diss/flow) +Num dissector calls: 11868 (138.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/whois.pcapng.out b/tests/result/whois.pcapng.out index 0e14a6bda..9573c7378 100644 --- a/tests/result/whois.pcapng.out +++ b/tests/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: 177 (59.00 diss/flow) +Num dissector calls: 175 (58.33 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/3/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/wireguard.pcap.out b/tests/result/wireguard.pcap.out index 7808d6392..c596fa9a4 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: 144 (144.00 diss/flow) +Num dissector calls: 145 (145.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/z3950.pcapng.out b/tests/result/z3950.pcapng.out index 473a4c8f5..68f367d24 100644 --- a/tests/result/z3950.pcapng.out +++ b/tests/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: 453 (226.50 diss/flow) +Num dissector calls: 445 (222.50 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/3/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/zoom.pcap.out b/tests/result/zoom.pcap.out index b3d8f7490..8fe31a4e5 100644 --- a/tests/result/zoom.pcap.out +++ b/tests/result/zoom.pcap.out @@ -5,7 +5,7 @@ DPI Packets (UDP): 23 (1.35 pkts/flow) DPI Packets (other): 2 (1.00 pkts/flow) Confidence Match by port : 2 (flows) Confidence DPI : 31 (flows) -Num dissector calls: 653 (19.79 diss/flow) +Num dissector calls: 650 (19.70 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/6/0 (insert/search/found) LRU cache zoom: 7/0/0 (insert/search/found) diff --git a/tests/result/zoom2.pcap.out b/tests/result/zoom2.pcap.out index 55bf63035..8605931b6 100644 --- a/tests/result/zoom2.pcap.out +++ b/tests/result/zoom2.pcap.out @@ -4,7 +4,7 @@ DPI Packets (TCP): 8 (8.00 pkts/flow) DPI Packets (UDP): 15 (5.00 pkts/flow) DPI Packets (other): 1 (1.00 pkts/flow) Confidence DPI : 5 (flows) -Num dissector calls: 476 (95.20 diss/flow) +Num dissector calls: 479 (95.80 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 1/0/0 (insert/search/found) diff --git a/tests/result/zoom_p2p.pcapng.out b/tests/result/zoom_p2p.pcapng.out index e3fe5bf4e..bc3e0ecb6 100644 --- a/tests/result/zoom_p2p.pcapng.out +++ b/tests/result/zoom_p2p.pcapng.out @@ -4,7 +4,7 @@ DPI Packets (UDP): 88 (8.80 pkts/flow) DPI Packets (other): 2 (1.00 pkts/flow) Confidence DPI (partial cache): 4 (flows) Confidence DPI : 8 (flows) -Num dissector calls: 1079 (89.92 diss/flow) +Num dissector calls: 1083 (90.25 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/12/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/windows/nDPI.vcxproj b/windows/nDPI.vcxproj index 1cb0ce836..09da6e5fa 100644 --- a/windows/nDPI.vcxproj +++ b/windows/nDPI.vcxproj @@ -167,6 +167,7 @@ + diff --git a/windows/nDPI.vcxproj.filters b/windows/nDPI.vcxproj.filters index b3e28e89a..baa18660d 100644 --- a/windows/nDPI.vcxproj.filters +++ b/windows/nDPI.vcxproj.filters @@ -143,6 +143,7 @@ +