From c807d84054f605202bd9633092b16627a8a5e790 Mon Sep 17 00:00:00 2001 From: Vladimir Gavrilov <105977161+0xA50C1A1@users.noreply.github.com> Date: Sat, 27 Jan 2024 23:19:34 +0300 Subject: [PATCH] Fix RESP detection (#2289) * Rename redis_net.c to resp.c * Fix RESP detection --- doc/protocols.rst | 8 ++ src/include/ndpi_private.h | 2 +- src/include/ndpi_protocol_ids.h | 2 +- src/include/ndpi_typedefs.h | 3 - src/lib/ndpi_main.c | 8 +- src/lib/protocols/redis_net.c | 94 ------------------ src/lib/protocols/resp.c | 81 +++++++++++++++ tests/cfgs/caches_cfg/result/ookla.pcap.out | 2 +- tests/cfgs/caches_cfg/result/teams.pcap.out | 2 +- tests/cfgs/default/pcap/resp.pcap | Bin 0 -> 93546 bytes tests/cfgs/default/result/1kxun.pcap.out | 2 +- .../default/result/KakaoTalk_chat.pcap.out | 2 +- .../default/result/KakaoTalk_talk.pcap.out | 2 +- tests/cfgs/default/result/Oscar.pcap.out | 2 +- tests/cfgs/default/result/amqp.pcap.out | 2 +- .../default/result/anyconnect-vpn.pcap.out | 2 +- .../result/bittorrent_tcp_miss.pcapng.out | 2 +- .../default/result/cloudflare-warp.pcap.out | 2 +- tests/cfgs/default/result/emotet.pcap.out | 2 +- tests/cfgs/default/result/fastcgi.pcap.out | 2 +- .../default/result/ftp-start-tls.pcap.out | 2 +- tests/cfgs/default/result/ftp.pcap.out | 2 +- tests/cfgs/default/result/ftp_failed.pcap.out | 2 +- .../result/fuzz-2006-06-26-2594.pcap.out | 2 +- .../result/fuzz-2006-09-29-28586.pcap.out | 2 +- tests/cfgs/default/result/google_ssl.pcap.out | 2 +- .../default/result/imap-starttls.pcap.out | 2 +- tests/cfgs/default/result/imap.pcap.out | 2 +- tests/cfgs/default/result/instagram.pcap.out | 2 +- tests/cfgs/default/result/irc.pcap.out | 2 +- .../default/result/iso9506-1-mms.pcap.out | 2 +- tests/cfgs/default/result/jabber.pcap.out | 2 +- tests/cfgs/default/result/kerberos.pcap.out | 2 +- .../result/log4j-webapp-exploit.pcap.out | 2 +- .../result/mongo_false_positive.pcapng.out | 2 +- tests/cfgs/default/result/mssql_tds.pcap.out | 2 +- .../default/result/nest_log_sink.pcap.out | 2 +- tests/cfgs/default/result/ookla.pcap.out | 2 +- tests/cfgs/default/result/openvpn.pcap.out | 2 +- tests/cfgs/default/result/oracle12.pcapng.out | 2 +- .../ossfuzz_seed_fake_traces_2.pcapng.out | 2 +- tests/cfgs/default/result/pop3.pcap.out | 2 +- tests/cfgs/default/result/pop3_stls.pcap.out | 2 +- tests/cfgs/default/result/protobuf.pcap.out | 2 +- tests/cfgs/default/result/raft.pcap.out | 2 +- .../result/reasm_crash_anon.pcapng.out | 2 +- .../default/result/reasm_segv_anon.pcapng.out | 2 +- tests/cfgs/default/result/resp.pcap.out | 28 ++++++ tests/cfgs/default/result/riot.pcapng.out | 2 +- tests/cfgs/default/result/rsh.pcap.out | 2 +- tests/cfgs/default/result/rtmp.pcap.out | 2 +- .../cfgs/default/result/s7comm-plus.pcap.out | 2 +- tests/cfgs/default/result/s7comm.pcap.out | 2 +- .../cfgs/default/result/shadowsocks.pcap.out | 2 +- tests/cfgs/default/result/skype.pcap.out | 2 +- .../default/result/skype_no_unknown.pcap.out | 2 +- tests/cfgs/default/result/smb_frags.pcap.out | 2 +- tests/cfgs/default/result/smbv1.pcap.out | 2 +- .../default/result/smtp-starttls.pcap.out | 2 +- tests/cfgs/default/result/smtp.pcap.out | 2 +- tests/cfgs/default/result/soap.pcap.out | 2 +- .../default/result/starcraft_battle.pcap.out | 2 +- tests/cfgs/default/result/teams.pcap.out | 2 +- .../result/telegram_videocall.pcapng.out | 2 +- tests/cfgs/default/result/telnet.pcap.out | 2 +- tests/cfgs/default/result/threema.pcap.out | 2 +- tests/cfgs/default/result/tinc.pcap.out | 2 +- .../result/tls_certificate_too_long.pcap.out | 2 +- .../result/tls_false_positives.pcapng.out | 2 +- tests/cfgs/default/result/viber.pcap.out | 2 +- tests/cfgs/default/result/wa_video.pcap.out | 2 +- tests/cfgs/default/result/waze.pcap.out | 2 +- tests/cfgs/default/result/whatsapp.pcap.out | 2 +- tests/cfgs/default/result/whois.pcapng.out | 2 +- tests/cfgs/default/result/z3950.pcapng.out | 2 +- tests/cfgs/default/result/zoom.pcap.out | 2 +- .../result/ookla.pcap.out | 2 +- .../disable_protocols/result/soap.pcap.out | 2 +- .../enable_payload_stat/result/1kxun.pcap.out | 2 +- .../ip_lists_disable/result/1kxun.pcap.out | 2 +- windows/nDPI.vcxproj | 2 +- windows/nDPI.vcxproj.filters | 2 +- 82 files changed, 196 insertions(+), 176 deletions(-) delete mode 100644 src/lib/protocols/redis_net.c create mode 100644 src/lib/protocols/resp.c create mode 100644 tests/cfgs/default/pcap/resp.pcap create mode 100644 tests/cfgs/default/result/resp.pcap.out diff --git a/doc/protocols.rst b/doc/protocols.rst index 5dfef92a7..68e731af2 100644 --- a/doc/protocols.rst +++ b/doc/protocols.rst @@ -32,6 +32,14 @@ A Remote Procedure Call protocol over HTTP from Microsoft. References: `Protocol Specs: . - * - */ - -#include "ndpi_protocol_ids.h" - -#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_REDIS - -#include "ndpi_api.h" -#include "ndpi_private.h" - - -static void ndpi_int_redis_add_connection(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow) { - ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_REDIS, NDPI_PROTOCOL_UNKNOWN, NDPI_CONFIDENCE_DPI); -} - - -static void ndpi_check_redis(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow) { - struct ndpi_packet_struct *packet = &ndpi_struct->packet; - - /* Break after 10 packets. */ - if(flow->packet_counter > 10) { - NDPI_EXCLUDE_PROTO(ndpi_struct, flow); - return; - } - - if(packet->packet_direction == 0) - flow->redis_s2d_first_char = packet->payload[0]; - else - flow->redis_d2s_first_char = packet->payload[0]; - - if((flow->redis_s2d_first_char != '\0') && (flow->redis_d2s_first_char != '\0')) { - /* - *1 - $4 - PING - +PONG - *3 - $3 - SET - $19 - dns.cache.127.0.0.1 - $9 - localhost - +OK - */ - - if(((flow->redis_s2d_first_char == '*') - && ((flow->redis_d2s_first_char == '+') || (flow->redis_d2s_first_char == ':'))) - || ((flow->redis_d2s_first_char == '*') - && ((flow->redis_s2d_first_char == '+') || (flow->redis_s2d_first_char == ':')))) { - NDPI_LOG_INFO(ndpi_struct, "Found Redis\n"); - ndpi_int_redis_add_connection(ndpi_struct, flow); - } else { - NDPI_EXCLUDE_PROTO(ndpi_struct, flow); - } - } else - return; /* Too early */ -} - -static void ndpi_search_redis(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow) { - NDPI_LOG_DBG(ndpi_struct, "search Redis\n"); - - ndpi_check_redis(ndpi_struct, flow); -} - - -void init_redis_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id) -{ - ndpi_set_bitmask_protocol_detection("Redis", ndpi_struct, *id, - NDPI_PROTOCOL_REDIS, - ndpi_search_redis, - NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION, - SAVE_DETECTION_BITMASK_AS_UNKNOWN, - ADD_TO_DETECTION_BITMASK); - - *id += 1; -} diff --git a/src/lib/protocols/resp.c b/src/lib/protocols/resp.c new file mode 100644 index 000000000..330124bea --- /dev/null +++ b/src/lib/protocols/resp.c @@ -0,0 +1,81 @@ +/* + * resp.c + * + * Redis Serialization Protocol + * + * Copyright (C) 2024 - ntop.org + * Copyright (C) 2024 - V.G + * + * This file is part of nDPI, an open source deep packet inspection + * library based on the OpenDPI and PACE technology by ipoque GmbH + * + * nDPI is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * nDPI is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with nDPI. If not, see . + * + */ + +#include "ndpi_protocol_ids.h" + +#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_RESP + +#include "ndpi_api.h" +#include "ndpi_private.h" + +static void ndpi_search_resp(struct ndpi_detection_module_struct *ndpi_struct, + struct ndpi_flow_struct *flow) +{ + struct ndpi_packet_struct const * const packet = &ndpi_struct->packet; + + NDPI_LOG_DBG(ndpi_struct, "search RESP\n"); + + if (packet->payload_packet_len < 10) + goto exclude; + + switch(packet->payload[0]) + { + case '*': + case '$': + case '~': + break; + default: + goto exclude; + } + + u_int8_t offset = 1; + while (offset < 4 && packet->payload[offset] != '\r') + { + if (!ndpi_isdigit(packet->payload[offset])) + goto exclude; + offset++; + } + + if (memcmp(&packet->payload[offset], "\r\n", 2) == 0) { + NDPI_LOG_INFO(ndpi_struct, "found RESP\n"); + ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_RESP, + NDPI_PROTOCOL_UNKNOWN, NDPI_CONFIDENCE_DPI); + } + +exclude: + NDPI_EXCLUDE_PROTO(ndpi_struct, flow); +} + +void init_resp_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id) +{ + ndpi_set_bitmask_protocol_detection("RESP", ndpi_struct, *id, + NDPI_PROTOCOL_RESP, + ndpi_search_resp, + NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION, + SAVE_DETECTION_BITMASK_AS_UNKNOWN, + ADD_TO_DETECTION_BITMASK); + *id += 1; +} diff --git a/tests/cfgs/caches_cfg/result/ookla.pcap.out b/tests/cfgs/caches_cfg/result/ookla.pcap.out index 538cacab9..7367c6f04 100644 --- a/tests/cfgs/caches_cfg/result/ookla.pcap.out +++ b/tests/cfgs/caches_cfg/result/ookla.pcap.out @@ -3,7 +3,7 @@ Guessed flow protos: 1 DPI Packets (TCP): 40 (6.67 pkts/flow) Confidence Match by port : 1 (flows) Confidence DPI : 5 (flows) -Num dissector calls: 562 (93.67 diss/flow) +Num dissector calls: 559 (93.17 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/3/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/caches_cfg/result/teams.pcap.out b/tests/cfgs/caches_cfg/result/teams.pcap.out index 9ce096c21..6a16cb21c 100644 --- a/tests/cfgs/caches_cfg/result/teams.pcap.out +++ b/tests/cfgs/caches_cfg/result/teams.pcap.out @@ -6,7 +6,7 @@ DPI Packets (other): 1 (1.00 pkts/flow) Confidence Unknown : 1 (flows) Confidence Match by port : 2 (flows) Confidence DPI : 80 (flows) -Num dissector calls: 530 (6.39 diss/flow) +Num dissector calls: 529 (6.37 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/9/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/pcap/resp.pcap b/tests/cfgs/default/pcap/resp.pcap new file mode 100644 index 0000000000000000000000000000000000000000..b49c172cea97f06ab677a96b9cf8d504ca0b3e05 GIT binary patch literal 93546 zcmeHwZH!#kdEQ7CMTrVqDot$xb)88YnOdF>nT{ln+c`d_^I!&|-g|BtZcyDvWVx7oV1{5o2G8a?ro z81vaTzOTmod$BS91zNv+``A5qpZFlgc#j(I8*G_l{qnmGRj#5neiAJ%z3~Ip;wz~w zK7tmXvn}3XiziMWJ#zfXqem`We(t&R&tE)xgkAjP-wX$xAjjFtAw`bYV&u3Ca(wUh zvC7-ud8h6I&HpS&afdB#{rI8E-+y;Sec~;?d#iFkTYU2qsVzQIdHeD&*%lYs;)ye7 z-*@!LiPQMc@za<<(CQAnelYO+-q9oHPCkLZojH1BVZGlP;ERQ(*WL8}4*rB^&zaOFCl8}^ztwtf6Go~nDR zt?qK*)%uM!JaiUc<1^Uo@d3Qu>NdR%{bkVe8oC|l4;;<$51b)oOontr!U+Tho77*)9N{F_?vLBG{qRsRZ?9#2n+Qk>x! zmY&UwT6#+;JlI=l_`@!l;w0G|ug8fM6%(P>8koA@_E+)$6p}rKQGnmN{=g$EeE>aP zxn8Y%joL8qs;xn_Q`@XI*2u}#!5Y4y*mi5}YTxViy};`ZYJ-;Ft@dCD;|M7*uw=p6o)gJc+7$j=tY+N}WV8bLBV zn99!A@!ZTJnaj>=-Uen(*?+=NEEN5P6#%5BltKX#15Yh1TAr>2fbE4v{hWgS6oTQa zg)2bH@c<-R8;96~2Ia(lSOa98vVym)GIkcEs#=D=k zV4>FRw7U4&^@B#g)uWUrRxL?RdCQnK3yV$SZ{Ht6TvUgVrK34@D{4-mYb7v(FxH$} zh%O}Fj0%{%u$Z-yR6Qvc*5#STrIZN~H^$7GAYDFyOpG9%m;8#gzvx! z5&c6BgFqOA9YQV*Y-wc`8X+NTM;fGjTmIF|udqsaFK5tn*N2S_V*&yKMbK(2`@=zR zI9T@kO%Ebu`CPjU?g-Yrb`QfRE3%h-fyx|*$Pj-f`)Ce3(g#UXc9O})vAC9mFq~Y+ zhY%`)7fNbImwec9fs_FZLMwF91jdYyp8=lty-yC&(Q?m+@wIub)^0BcYqfqe;NP(T z7)8(T243WWA)E@Y>A}v9EdUKS!$Vt5uZ@+%5@0Y9V`q@iX{O2E-MSPrMzMPsR{hH84a}GGTYz>iIooXJ}M* zxjV~}7VeKK`h0tui>g8?;;Vc%$M|d!Q+1YxU z^)vxvgJS{4Pa{5M6)5DXHyF5x<#-TTj7XQFS8LFFvF@E=!~ITA@Z$kF<6auzu3Y%k zvL~!yZ==@&PYy&)6+uduK`m*7}Q~A@;@LmnVq1$qf)=8em9m* z{oXg;`}JQzg7y!c1noDG?_6YyznGuvd`RUwe?FS){Q9q`>}g7_Q?q96CWWTVKyXpmBABX6#-sda8e>p{Xhy3 zQvQ$~Ws)Cc-b=LuNr1svGXVyA0!#~s9h4yLNCaWZ?K3S}WsljcH~SF+FxjoX$5NDp z+8#|eHy;+0_ZaE89!hHGf?{jN(4ht+9to#eLq}4T6ioApnLBHRa=eyovyXA0)hCCl z>PM+C@Q0IjNM<<<1@X*sZ8%^$JU=L`*>7R7;di^9$pzU+qSb8}L@f0Y#&BezLT}IY zjm7gba7rx7je*X2Fbt>&8R*hTfB2QHnAj?X|7owjZ`OVt*C`kwC!vM zP-4M`(`O(QAM*Pupy2mdD1;KXn%6!ElfdexP_-%+i?>>Qw4*eMjQu6tFkD!AWqAwll4b%Edx zGZ-{QfY25Dv^sKApxN(*u^u$A(f4jj3gjf3FCLN`fI}gjQU|45okw=E#v25seyf9W z1j;E^HDdSH+kWGQE?AAqD_*yVOh|WP-maudSxeYX7DbbqZ@eH##Li_c&;g<_fhtqb zwB9%L#VjNAbs}IPiKv2gD1d2UB-F zZO{%{9oiPed;*c9VX|U9u30NyNP$StoFqLVt)`gqWG&FLeNJH{B~a{~Fz92SF}6|2 zlP($MJzG8+FMr0{X)1Xy=BqF-4Q|ERku>#L&TpyX2zF@E=G6R?_>0!6mB3G&iUe&7 z+@~Q}40DVo$L}7_pI&C_KOO*ubEDWJw%}=Cr1DXYtD(nV_6tmVr7F;kh zdH+x3<~r|DTSs3{<~r|w8@bL;rR6%m_ufO5uRmH*pZLDcN55J*#umSGe>B&5_uG=| z{JF2$eVtEZU*|Vtn=HqxX2ELX&<0@gQqs3xQ&Cu|SB$_3tB8@ppV3O&NKlo^XJi33 zT2FK5R2ip|oKQ3|hyViF?0B6zOXIcM$)Sb%DJhzwjKt^BTO~=-{T!A(4O_v%IZ3r2 z0G-k{nb|{V2UN-SS>FxrE@~UaSTGCcG=`9$=~VBj9BV1)fKy#}O0kI_;45neIa)k4 zwB3j{tyZh^Ln}Q}*&)h2Y#~d{(g=u_0qjX|E@`TRMD^9ar?hCz=XOQ#jj~0=-f_sB zi~~jxoD>SpB=IhD%_OX+aS^23LIxRmTVmb#_Xq?g@>}$WU(;-f?6FgbqN9?s^MYfE z^t0~bz%$y05szhCL-I~1vWNs=Tt{8IVvj|&Ol%{S`z4VDZf<(@A&w@{Rt*6&MUoRz zwo^eSW9v<`My*)`KD4P~n`QBa^s1d7tKLfbKD*%iPb?mVhFR;O^4v6{h^gY@gnqx) zT1gvKo?I-(?vx>=(q=!)4O?NQ0f;s!4I%_c=^})q$Hdh~gr&D^HS|FN9Fllc9*SH<2al)qI6Ub|gg^Vj8+kD$7a&54NpS8+~A z6LEY-^J^&4>*#YrkTD1bk5#W+RuzorFI-r=PkOLbP_p-rTeUFJETOh;92^=_Zfv-d5m>MK>XoiR5aY5qI3|PTM zhzG`v%g+Q#en7)~`GE)*h`<+_kOCe)2+7&lcF7N{ER$t(IDv+8j9&O^_WjF1$AAJz z1(}_53hkAoezg`#otDkcf?xL1X=;|~PJ`0Ea7Le1-v%9GeKM z?IxQol1MBdY$PknvJHX2NTJABQlX*Glq+B?Mt_<=;km2Vt}LB@j)oJm&9DOd1J+Yu zx_me{0bOk2M^@nwWUR!XO>R+QVhC!rtVf#?#u_70_bSR@TsW?#?UO|fp6-IUfL&M* zhe2=*C%A-O$qFB{0!QT?Utnv-u0X6^vfc9WjS~|0k|VwmYo7ZXy`y?E*BwOyUEH3P5!8`#!Q$IKRp z8+I2NNCC+(aAja}w8F;|se*DH%r*N#VX#o6-NGgT(vkYYv6nJ^1X||CNx(Ab_qSjm z_q}GTkA~O|6-{1@LX0xi2?f>qG_X!{Hp?=EWO{7W8ra@N?}lJDu?{gf(;?4P-^}ig zwS(0YxwV7$s@lQdNz@LWc+Wa&2mgUnJNPY}lkzlM{6DB2{FA3D>JzUWeCpp--o+OG z)8R<%AX<~!!5d$V)(+~e04BM$?KJ=#7?NPuqS{~3>aNh=p3=%Q`-wzG_EL;znjv$` zG|{7S0Vl?6A$LQb%p9jg)L~bJ-eigxNm|4r;b=veh%e>3`J?v2hn&@t!ncXh8pv+A zxRiTc2CTv^w0XXRf{U`G9j)1@ORYZTW?4gx9`B*pT{d88yctc`Kk40UH3ml5cZV$< ztuyQjeJGc^G@OvH%z4Gz4@{NiE8&`ubHc%lUkjAvVoYXDN9t%2P*THqj6{Ucq*#dB zOOlLTiGrB%*HCbx0KaJ;9;>fkQhK`}wcLULq1?QOX5bax>PX$X619TF5(4edL<~_A zkq3R{mp!5r0o>BTtz`Uy;Jb7G7iwlNCCXDKG=YE&NH=w;0km-oZM&y$1Q2wV0F{ks zDP+a~Q+)S>0H+Dvj<*tXH@JaGsDM`=Sy0Gli0HWx{ayg}?o z@&K#QIwrG9K*uM;V2g5qRjcuXJ(al#6pbYuBggYH?VYANCV;eKGU`gxwBh$Q#epMD zMPhPb)-~(oaW`MU<(ZCp8WYjTUOJjz>YC39Km|xQb$zRfwNNwWH`+BFB*)@K%r0%S zizk$#Z^Kx*G4GXd0jM)-7}0)~WX(sc9ER&g&+F>@|8yJ>6LtVANlXW*qQ}x~pO*9C zdV-eq)?n1_s-RNHm_kdu*QxbDco&|sIB!0vMQL8+cJ!5&*H#xk5sr&8pTsqGobs9v zV#2yx+s^ev2V?{nh5=*flaAjUszXx>XAVL8@ZvxH`W7<^x)7XB06uAHhh(8-B=5kt za`O&q+>!C~1R@!Mx(nC_!KBJEOkbAl3oREa_RktmsdNNUz(vBWMoDI|38zP7^kj&P z103}T@YVEI84iXV-9^a6#~Q;U4Il|Pm2BI_u(jQ{EF;OKw6E+V5yo__Lw zgi`@0!FsLN#3jqN(p~%zvr=xWSl5NcRG&pZ94+gVp7>Ku5U;oOzCrv;DN@r{(u9*i zq!rjf_EMdq`LK7fBt2x>6*iMhuJA-XNzfs*(=5T@Kl5mlV&G!x8msyH(!Hi25l-JlpOg1}V0#(B&EXs})ygC%zG663+P?w-v#!spn` zD32510yH~yxgjVA>OS=`91RiKc&Q*i$rXxryWr1Y38A$na7ZZ5c}2+ z&Lwj<@aEGDlbi9~<1h!z1q2XDsy8Yl;hYjYCZUIXdL=d8>|fABFFlA}@rh~Xn4-}{ zk5VGg*o#yZt9n2)qZlZV`S4ud$&l0hhuX z{SxK9X$p|a%yH@SiAWURo0s{)G#r^Bv=IZ)ZKc*~V}D+s<`rg@6~sy_t|v5?j8B5! zgEp>RQ3o!{IweDs3#L2n8;@PUA|V+5RD&%!0@$kh%qmV8YhGw?2wn;!y!!PmZvz2V zpih`H%LuJ1#?l5TVw$*J6xU*Kg9q_`FSZ@j! zgYQj$Z(@EjRz#A2AYMF&njo1QVz%zGKGqwr=bsgD{0tt6aVZa;Y1MFgeH13Z&Kst9 zzA(~aCSkN*y}ca}i=Dq?hZR8?-MSQngfJem9+PM4BZ|?Usw!`ZlxXzD*s;WJoDL04 zV)rpu39*r>*45L<)+AF$B~kMU=pRrldKEi&IQ~rjp2>HpJ(K@3xo7hFVeFZFciNuG z=h5Q1hb!t6-!u8}W0fCci+4X4-7|Upu+{uu2Le zC|p7mAT0S1LVTKIL4l3y-K@2twnd?V#wi+iVX~*N#*m1*GMdpHZyaSLBuz~Dq2Y}^ zQxG^_qEeKmjq@NUvVFREB?aIyBuOW0_e%_j5=p-K2(?oo+7nI8@yj4y-1^ESSaSQ% z^l))E7z?;)uJ|G@QpJFP$-uF2m&)kisf>yUaiZdf#bwZNPEzsUFBC7JSkx%#(G(=^ zhgX0UEi;|8w%85+gBD(+=L6D#Y=y;C(iFy}4vqZDC40Z zM(y~Qgm-dMW=P)+b`Tv6ca1utLznJHD$&P=t!SIGL%u*A4*7lv&$TsNfZXsqymq0A zAfLY;RO|j=ty)7UF9_6K2PiRZtsuzDOO&14j&);l`2iJVx>>()v(|6b>TPe?JUgB= z*=`^=Cb@wVdD6^=ETFOA5=LtBGdf&tMabEQ8Sop=ts>4CGXaa{L{yWoEH-?Z;>NwZ zvk(xFodRQQ=7s#&%zY|0^I9@Cv-*SE$L{?=EH-n2Ew&@aUm{RK}nFB z&)EeIQqRO<_R#$}SkAo=BgQbGfhSP42mFDP;^I$PRay#%=EF9GfuIf#pooK9Y3@n1 z3dmx1q%xH1c`n_P@^v*hnWIxvkV$&FEI8U|aC3?IXh~x&sZu$6=a91be>-XO2bW>i_|qCKL%Sp2TOym!Nt6`{3=_bo41+An z#Vp_p3Cl&U1mNly@!Pq2=sB#FHe=Y*46S1ar1CTd!ok?0Z5c?@Zv>jRccaJT`J%kd-E*$K2XDPUQ^gAB}}3HW-bnYl<*1R-x^;*M|Va&;&|~ zy*p^Gl-)+*7>kj1;p?l-Ul^UVOge~*@3seOm8cLbN`*u~nESA@wppFQcx)kPeN*48 zZt{(wczg+sASXd^zZHand+Mv^%2Q=P6Q5ExgHC1>sMq$?{VNnQcAPMn#p`joO>wX0 z+EHdAz@4e*J(PEbRJnCXPvZCMUbRu{qB5yEz~$1_HGjQ2So5mHpXz!G-_*S-?#*dd z1HZcNRcisah^R+!w|Fpkta|0Ls#Q9F;lk3@tGazDO(Lx(pr|Rrxk?6Xh4D`&ug%NS z;J2*^DnY!{I5x>ks>W-%J`5PocR7lzSAGj~2S#XjgQLLv%GeT%AjN7B4v)C&(L>Bg z)NNHd(zBEYGqOZE1Ft{2tBigWJwyyH6AD{&0xC%l#tv~LhPtJ zJeWo;6&o3EP6j>Y%L|PHT`R_u>$#WHj136JOQ|7DnrBBEW#DUDumsOoIZE~#!vup0 zz9#gcJh>Q_f#g$;G8E0hk2es#8zjV1c#Sn5lo#<$f{I~07fvX01xsGB?!92Mi`CXB zLQATU_T{MzDu=GwLf}j@y|iGrkGn=F8ALwf0X4A8f1uBw;7py#C}#<@x4yQ#dL|kH z(+zAn_jK{4w0-SvV_Z~*axx6w_()IVQ8Uynxc=(o2ab0FU8w+*nUo5|P#pt8(JLrU zz%SCN5Q{%`kPZtR&H#sS1g16ej4WFk)zISz6;+a!XWWr^gOk*#t<{rW&u_^2E$lNk zrU@Jd!rZZt1gNXlRqEDMfNeU%&=&(LG1vlVnuVU`05DIX12+HN2*4Q=Vs2iuD_zl= zLV-Jb!vK^S6I*k^76k=(X1sjJ?5K>TvuW?<+_7}6_z3BUta8+`SxtbGPXiKVDu%2B z_bS;bi~#P0jDSv^7HY#tQz8Poks)+_)Xz+gja}q0NdSw`K(|5&T@p22$q}%^1Z_e1 z6qeYbFCrw0#Z}nSU0x>@yFF!+uei)%IMaZqTC*vdewsvfN# zh9XC_J$7n%IFRoiH#WTqF|#TYQWn)oj$_#OP68{DdLU4Mw7aW;O64o5qa+2D5EvJn zgo$^4|kYF|I2K=U_>rsCVx$Jgi1wDr!g;d?dzRz&Y1x zP~(}8o;;q2M?A;~QNMlmLm!N$7}aQI41kt1@iK$V3dDy4ct0b~j??5G6?>MA#!a1z zpq0S&#em#g5`LASmG<3j{>aV70{z$ZyCdA?lm#Y3O&|n}o^~Uog~JniK2?RX28t51 z=#dL^L@NbtwWg%&$QTs$aR;zqR@k$1(Z1?KVuv;iUI57KjUM|i$_Ns|d(r2Kkc4Ey zWd0Tlm<|*nZ|9S4j(D3f1DxHxgUwN-CUXxe0ZhuI?~bC>V0qkK8~6%}Vz8_t@-w{s z2%J`Hs8kB3Unt_s=&Olhf(UqdYt`%akd7oR*$Dogt7jvDB+@a{c!vAM_6b&KoNdEO zvJsp-T^{L!11g!$D8z$1X_Yb8AI1!;1~4Mkynia8Gt) zp^RwaC>RmVv9FRT!O;dNC+__2>(Jb!ITw=YG6Nr4$}X%CqW_Gk7< z>Tto}ZcU(?5K6s`-Rj-Oric!tF5*H^ltei2HwDFb%lJW{jCp@+wO{K=;lzYYBJ`FY z{yWa1j+EkZlZQ<`W+UU?fYZcbO`0wK3FGus-Xx zfvQYXLyxK5tf+Q0kpnCbO(BdjEYjpbX+f>QQ$7vGy+Fz6OM#ylid+F60sG)P1FWDAI!`+0nqiF- z9m!fRMuHtCu}#a`%+JlWBqd?W4&=lf59q(371+uEOtf_LEmHcCK|s)S@2M<|wRm6y zD}c*c&EA9*GL7K6ylRRJnkfX?g%bfL#%sXdP74ORszpADZgRvH6sFl5#wb%ESW9gb zE2vfSw{lQ*qW5VEIHoc!RTrBXZR@BK7wB4mCE<5^ZIA0Q+LpxXVGXd;6PZwFZy4G) zLKOb#BTFB@swa#vRDZD2SLau$@GI~pJG@d%-=~Dhcmm&l&Og)des!kbZza$4`=gg` zAA84dq@C&a(i4X&|Mi^}^@*S9_s*|X&a%a~z8*c(?~h)RbG$EoGkT^U2!i>gZYRW& zHS0m^7HjmWeJJ_K!VAEJXfv%cU6BxcF-8em7`?$COquX~R#&mLooAgAloT-GKV)4P zVokq;F3lK;=;0V;VEmaqIHP2X4zA#4EKqfgSFB-RlrfjgD-M1xXXNg)g;n02K zXaEOs>;;O{NjMNOVjoz-i8w2$1d}>0S@A^I zh~jN=7D^rcK=fdFmG!-;~y8+SDE*bw5VggWi91}`0 zj^p-UZY>9@eaamn|S-UI38@-TQU4c=-4Lz z#g6DJ$boaAb9?HPA%)S(uh4T(>QnuFY*!O8w8)8d35PcCtTv^Q&CO^BdU)jJix7c< zKMZr9)GlENz|Gd#9SxL{NS&8>--hwkvSJxxwIT4yS0uNRGVJEb5s)>50XC9f^kH3?QoeDP{oaWs_4_rLDRJ7AG|RK+xNX`{DD=@u_*c+z zl4h!cAsY;hTq=vf9(G#X=blyuh%xkkf{1s{y*P(e4E>AA82X(bMGXD>P7M7!axc!` z&5xl!rDEuR7LB3b`O%aZ`V#NLB%2R#$g$>+an}Zb*?YL=Y*-i6#X?8S6T0c~8ce(t z)?n(_w@@JJv_c&y?IyRqMmiu9rEdTv_k|pYCd00JYA1+ji81#?vsck%tFeZ&L2)dW z5N86@0)0(qW2}Y*rkO?q9v3s|wV_IJ`-t zM-y=qJfpA|xt3dPZ$mB@z%10z(+$dW40Y|90-n^gkaV&r1=Y5Oty20lY)U;*DWqC5 zIxZ%+q!UaG46hZsWQ05gkc%tilEw;fq}6SD8)zsrRWN!sYyQBI=WAy?J8sOE!!cG- zSnl_kfE|%|z?f4K4_Sd(u1^Z_N?J1^jrIibQYJJ3ZXk02BX(LX05~pQ#f`G&f z8dt(rHu333SU~nP7~01H+S5>siHjFNC57kd^vsT*@cFRJJegJ|lTQZ*r>GQDCR7ro zumpu_#DKFZil8ChEfT|DriJ>`n=aItn(oC*SFi2rlr3y)S!wFS6H0}?ld_PZ;3i-a zOi>mrrNAYA{Y8B{hziBxFA;AFgGvMiz{TMKHTw0fQZ6kmk4W6yF(^1RJ3O8iZ8~T* zQOeos(1s;Eaa@jDfEKA)LZy*bJ?OdyXd|N*PB$LMKlaBpA6-d`A&>M0Fw|+`KuAkW z!O(IA35f$bZu7zihbOV4*>CE+-vLi<=kg4PmVIwUf+YvE+zu_F^m;2zuRi3VRwN-l zDOR@GiKNg{5EGE)*n_boezS26UI>);duf*vUrQDp1D>_R&%Fc>ZY zGEX{v4OWONNPxe%_R&<$ezSNW6)HQWcjiI@k}@KM3atroR?e?k{RDD?IynfN0D>r|fxu&q?QD@kt%aMlev5kmm(8=|VO(&?)NK+l zsyg?*sghC{fnr-j?T8&pazsqVa7j``p7zz)>uIn!8#>w?*1d-&=t6jq)I!wr2L8xY z)Hw%XmUMvEu^UAU>>`Izkzq^v9w2fdw-wJ_y>?~k{Bu_|C%BI5n3!W^O(dolTK^z; z8zCQ_fPv+YutoyTEIULiKXhYwISc${yV&f?5M~ApH>Wj|exQx(8YM`jd3a%Qzac-9 zA*hvJX?g9YxvG-nqC`1jZ0hzhsTNjS@0*+)kK93Rf5+7JBdu9VBD1nbAn_cFB~^LD zT@4nWXq8d`Uj4;u79_YcJtRyBL8H<{veJx(g$4*s; zSTy9K+aAxmVP|};gauSIk4=h=FJz9^c0-WYI{M(|?Nq@^Nz%SC6v0^S-Y{6BeRy#2 z*=QB$O5}#A{nD`o%1$Vf$$*sjaFE4F2q8;RP{d1y4FI_#4YJ)3NSsMq=y=6}eIpTA$r0AcD6nZ_tN06t3hTbn0C{SX%S`7AoA; z;Vv`{x#E%l%(p%HWd0>UXm9KX)~YM2^t{WJpn$<7>~5`btBx5d6l#QK@;GUMwnowd z&%`$y)Z_rG5#qy{q|U||v%9ghm`--ZO=Q5p>%PYghX${?RtAM5!4xh?UQS4nfK!dB zHoiB%L6nk3jYZ5nO766a)d@?tnyr-;yK{kH#ibL49IEbUz76am2D46e%L|!jqNeZ& zzFL?7B{8;XQ8LE#oX`Y3fRU_$VN51Mgobgjt3E=$u)@PjM&V)L`t_~eu)j*E!8b&V zNJNFuBXJZ?b?ixH-u7q45xLDEZyj#ZtayH;a73LIGkmc+Fs>&XPj;3SQ#O!+$;DlRJjY+jj zt_c|`bEl4tO6|+7s~{R~%T;$<=wnS{Vu)X3N4Qyf=|jfd`gEXfhP6DqXSI&3{t*CH z;0uoy6)HN0o=H#A6d!Hp2|4#$VG9_qhGQJNEc_)g@DULOMa7;`LTpoDIJu>ZZ6D!H zED_qHdeI!_cmoXxcpe~tCNM)tsfYN1WqY{TH@vi!xH$op!)BEOI~SUU$hk*sDod5h(|3-j7XNW-i;tkiXLaHIsrLD2aU9MP zQHLoAeGVSm|K$HZT)Bky`H2_ySN>LIiR~Y5L<;*c+E2am#}C|or1JL5KQ4v+7r(?l z7Cw6U`DczEVZ(obhI7vGc}NZXH=+ao;|IR6@Sc~Wq&WZl-4`!@>0z|^Bj0}@uf-oy zE&lUZi-(gfZoOAp{LF(7+7=U&KU?{bntUrZ`Ipt?k5%4Y_+K*lmp+ThKmQ{b3nQh5gb@{^d&2P)5~*~FKUvpK`1eBl>mHlO+2srIK&E?oYIZZ<%( zISct$)RbP0P3a8C{%Uj~KmESDFMj58k6@sW{`-e2AIBj1Nf7BHcmAqs@zbd-l1NvD zNS}X_EmCEYNGfU?5{VuC?AIQud<>oNlc2~ml@BY5T#K#mtDwjwQsfuDB@}u2*H5)S z|6~f;*~u&DB!@o7)NEdf&E^v5^Q9<#K7a1+i!cBB-$0Aq|M)|BEk3MTc=g`0M z+9Pjr$g0JMT@?AkX=(A$pN1_a2ywP@NfBZtMu;z=)n{)%TzUJ|*M$&Y{MA$KFP!EW jPdY6o*6{3|A68@hwb&S+#Tb7-I_oc-z5C)9fA#+ZP7~fL literal 0 HcmV?d00001 diff --git a/tests/cfgs/default/result/1kxun.pcap.out b/tests/cfgs/default/result/1kxun.pcap.out index afc63273b..bccc4df43 100644 --- a/tests/cfgs/default/result/1kxun.pcap.out +++ b/tests/cfgs/default/result/1kxun.pcap.out @@ -5,7 +5,7 @@ DPI Packets (UDP): 120 (1.21 pkts/flow) Confidence Unknown : 14 (flows) Confidence Match by port : 6 (flows) Confidence DPI : 177 (flows) -Num dissector calls: 4933 (25.04 diss/flow) +Num dissector calls: 4925 (25.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/60/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/KakaoTalk_chat.pcap.out b/tests/cfgs/default/result/KakaoTalk_chat.pcap.out index 49ac805d9..8fdd9323f 100644 --- a/tests/cfgs/default/result/KakaoTalk_chat.pcap.out +++ b/tests/cfgs/default/result/KakaoTalk_chat.pcap.out @@ -5,7 +5,7 @@ DPI Packets (UDP): 36 (2.00 pkts/flow) DPI Packets (other): 1 (1.00 pkts/flow) Confidence Match by port : 5 (flows) Confidence DPI : 33 (flows) -Num dissector calls: 571 (15.03 diss/flow) +Num dissector calls: 568 (14.95 diss/flow) LRU cache ookla: 0/1/0 (insert/search/found) LRU cache bittorrent: 0/15/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/KakaoTalk_talk.pcap.out b/tests/cfgs/default/result/KakaoTalk_talk.pcap.out index 84fb1676f..24f6f6225 100644 --- a/tests/cfgs/default/result/KakaoTalk_talk.pcap.out +++ b/tests/cfgs/default/result/KakaoTalk_talk.pcap.out @@ -5,7 +5,7 @@ DPI Packets (UDP): 10 (2.00 pkts/flow) Confidence Match by port : 8 (flows) Confidence DPI : 11 (flows) Confidence Match by IP : 1 (flows) -Num dissector calls: 1196 (59.80 diss/flow) +Num dissector calls: 1192 (59.60 diss/flow) LRU cache ookla: 0/2/0 (insert/search/found) LRU cache bittorrent: 0/27/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/Oscar.pcap.out b/tests/cfgs/default/result/Oscar.pcap.out index bb608bdf3..ccf34a077 100644 --- a/tests/cfgs/default/result/Oscar.pcap.out +++ b/tests/cfgs/default/result/Oscar.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 1 DPI Packets (TCP): 21 (21.00 pkts/flow) Confidence Match by port : 1 (flows) -Num dissector calls: 262 (262.00 diss/flow) +Num dissector calls: 261 (261.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/3/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/amqp.pcap.out b/tests/cfgs/default/result/amqp.pcap.out index ade7a1253..91aecd194 100644 --- a/tests/cfgs/default/result/amqp.pcap.out +++ b/tests/cfgs/default/result/amqp.pcap.out @@ -1,6 +1,6 @@ DPI Packets (TCP): 9 (3.00 pkts/flow) Confidence DPI : 3 (flows) -Num dissector calls: 386 (128.67 diss/flow) +Num dissector calls: 383 (127.67 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/anyconnect-vpn.pcap.out b/tests/cfgs/default/result/anyconnect-vpn.pcap.out index d0c42fd9e..e68955e7e 100644 --- a/tests/cfgs/default/result/anyconnect-vpn.pcap.out +++ b/tests/cfgs/default/result/anyconnect-vpn.pcap.out @@ -6,7 +6,7 @@ DPI Packets (other): 10 (1.00 pkts/flow) Confidence Unknown : 2 (flows) Confidence Match by port : 6 (flows) Confidence DPI : 61 (flows) -Num dissector calls: 866 (12.55 diss/flow) +Num dissector calls: 861 (12.48 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/24/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/bittorrent_tcp_miss.pcapng.out b/tests/cfgs/default/result/bittorrent_tcp_miss.pcapng.out index a865a13cd..a741e7e44 100644 --- a/tests/cfgs/default/result/bittorrent_tcp_miss.pcapng.out +++ b/tests/cfgs/default/result/bittorrent_tcp_miss.pcapng.out @@ -1,6 +1,6 @@ DPI Packets (TCP): 10 (10.00 pkts/flow) Confidence DPI : 1 (flows) -Num dissector calls: 242 (242.00 diss/flow) +Num dissector calls: 241 (241.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 5/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/cloudflare-warp.pcap.out b/tests/cfgs/default/result/cloudflare-warp.pcap.out index 03f09cb82..4cf53f0fb 100644 --- a/tests/cfgs/default/result/cloudflare-warp.pcap.out +++ b/tests/cfgs/default/result/cloudflare-warp.pcap.out @@ -4,7 +4,7 @@ DPI Packets (TCP): 41 (5.12 pkts/flow) Confidence Match by port : 2 (flows) Confidence DPI : 5 (flows) Confidence Match by IP : 1 (flows) -Num dissector calls: 199 (24.88 diss/flow) +Num dissector calls: 198 (24.75 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/9/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/emotet.pcap.out b/tests/cfgs/default/result/emotet.pcap.out index 298fded32..e524b6157 100644 --- a/tests/cfgs/default/result/emotet.pcap.out +++ b/tests/cfgs/default/result/emotet.pcap.out @@ -1,6 +1,6 @@ DPI Packets (TCP): 48 (8.00 pkts/flow) Confidence DPI : 6 (flows) -Num dissector calls: 217 (36.17 diss/flow) +Num dissector calls: 216 (36.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/fastcgi.pcap.out b/tests/cfgs/default/result/fastcgi.pcap.out index 458b94b86..810923d4a 100644 --- a/tests/cfgs/default/result/fastcgi.pcap.out +++ b/tests/cfgs/default/result/fastcgi.pcap.out @@ -1,6 +1,6 @@ DPI Packets (TCP): 6 (6.00 pkts/flow) Confidence DPI : 1 (flows) -Num dissector calls: 168 (168.00 diss/flow) +Num dissector calls: 167 (167.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/ftp-start-tls.pcap.out b/tests/cfgs/default/result/ftp-start-tls.pcap.out index 0b2725877..2dcdbba55 100644 --- a/tests/cfgs/default/result/ftp-start-tls.pcap.out +++ b/tests/cfgs/default/result/ftp-start-tls.pcap.out @@ -1,6 +1,6 @@ DPI Packets (TCP): 17 (17.00 pkts/flow) Confidence DPI : 1 (flows) -Num dissector calls: 170 (170.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/cfgs/default/result/ftp.pcap.out b/tests/cfgs/default/result/ftp.pcap.out index 96e57e2e4..58a39857c 100644 --- a/tests/cfgs/default/result/ftp.pcap.out +++ b/tests/cfgs/default/result/ftp.pcap.out @@ -1,7 +1,7 @@ DPI Packets (TCP): 39 (13.00 pkts/flow) Confidence Unknown : 1 (flows) Confidence DPI : 2 (flows) -Num dissector calls: 541 (180.33 diss/flow) +Num dissector calls: 531 (177.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/3/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/ftp_failed.pcap.out b/tests/cfgs/default/result/ftp_failed.pcap.out index 4d903f2af..afbc98257 100644 --- a/tests/cfgs/default/result/ftp_failed.pcap.out +++ b/tests/cfgs/default/result/ftp_failed.pcap.out @@ -1,6 +1,6 @@ DPI Packets (TCP): 8 (8.00 pkts/flow) Confidence DPI : 1 (flows) -Num dissector calls: 169 (169.00 diss/flow) +Num dissector calls: 168 (168.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/fuzz-2006-06-26-2594.pcap.out b/tests/cfgs/default/result/fuzz-2006-06-26-2594.pcap.out index 8edf6c69f..3da5b4e95 100644 --- a/tests/cfgs/default/result/fuzz-2006-06-26-2594.pcap.out +++ b/tests/cfgs/default/result/fuzz-2006-06-26-2594.pcap.out @@ -6,7 +6,7 @@ DPI Packets (other): 5 (1.00 pkts/flow) Confidence Unknown : 34 (flows) Confidence Match by port : 27 (flows) Confidence DPI : 190 (flows) -Num dissector calls: 7136 (28.43 diss/flow) +Num dissector calls: 7135 (28.43 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/189/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/fuzz-2006-09-29-28586.pcap.out b/tests/cfgs/default/result/fuzz-2006-09-29-28586.pcap.out index 71f3ddc19..655910b35 100644 --- a/tests/cfgs/default/result/fuzz-2006-09-29-28586.pcap.out +++ b/tests/cfgs/default/result/fuzz-2006-09-29-28586.pcap.out @@ -5,7 +5,7 @@ DPI Packets (other): 1 (1.00 pkts/flow) Confidence Unknown : 3 (flows) Confidence Match by port : 26 (flows) Confidence DPI : 11 (flows) -Num dissector calls: 1107 (27.67 diss/flow) +Num dissector calls: 1103 (27.58 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/87/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/google_ssl.pcap.out b/tests/cfgs/default/result/google_ssl.pcap.out index 5a3a2ce4d..7e929f53e 100644 --- a/tests/cfgs/default/result/google_ssl.pcap.out +++ b/tests/cfgs/default/result/google_ssl.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 1 DPI Packets (TCP): 24 (24.00 pkts/flow) Confidence Match by port : 1 (flows) -Num dissector calls: 206 (206.00 diss/flow) +Num dissector calls: 205 (205.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/3/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/imap-starttls.pcap.out b/tests/cfgs/default/result/imap-starttls.pcap.out index 8bdc8ff1e..0c35f2604 100644 --- a/tests/cfgs/default/result/imap-starttls.pcap.out +++ b/tests/cfgs/default/result/imap-starttls.pcap.out @@ -1,6 +1,6 @@ DPI Packets (TCP): 19 (19.00 pkts/flow) Confidence DPI : 1 (flows) -Num dissector calls: 218 (218.00 diss/flow) +Num dissector calls: 217 (217.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/imap.pcap.out b/tests/cfgs/default/result/imap.pcap.out index be131215a..2599401d2 100644 --- a/tests/cfgs/default/result/imap.pcap.out +++ b/tests/cfgs/default/result/imap.pcap.out @@ -1,6 +1,6 @@ DPI Packets (TCP): 11 (11.00 pkts/flow) Confidence DPI : 1 (flows) -Num dissector calls: 218 (218.00 diss/flow) +Num dissector calls: 217 (217.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/instagram.pcap.out b/tests/cfgs/default/result/instagram.pcap.out index 29e71c320..85fe6e17e 100644 --- a/tests/cfgs/default/result/instagram.pcap.out +++ b/tests/cfgs/default/result/instagram.pcap.out @@ -6,7 +6,7 @@ DPI Packets (other): 1 (1.00 pkts/flow) Confidence Unknown : 1 (flows) Confidence Match by port : 7 (flows) Confidence DPI : 30 (flows) -Num dissector calls: 1413 (37.18 diss/flow) +Num dissector calls: 1373 (36.13 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/24/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/irc.pcap.out b/tests/cfgs/default/result/irc.pcap.out index 9c9460312..e8b22ea9c 100644 --- a/tests/cfgs/default/result/irc.pcap.out +++ b/tests/cfgs/default/result/irc.pcap.out @@ -1,6 +1,6 @@ DPI Packets (TCP): 7 (7.00 pkts/flow) Confidence DPI : 1 (flows) -Num dissector calls: 174 (174.00 diss/flow) +Num dissector calls: 173 (173.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/iso9506-1-mms.pcap.out b/tests/cfgs/default/result/iso9506-1-mms.pcap.out index 0b27da5bc..28ea8ca15 100644 --- a/tests/cfgs/default/result/iso9506-1-mms.pcap.out +++ b/tests/cfgs/default/result/iso9506-1-mms.pcap.out @@ -1,6 +1,6 @@ DPI Packets (TCP): 7 (7.00 pkts/flow) Confidence DPI : 1 (flows) -Num dissector calls: 191 (191.00 diss/flow) +Num dissector calls: 190 (190.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/jabber.pcap.out b/tests/cfgs/default/result/jabber.pcap.out index 95e99aecd..10364f8ce 100644 --- a/tests/cfgs/default/result/jabber.pcap.out +++ b/tests/cfgs/default/result/jabber.pcap.out @@ -1,6 +1,6 @@ DPI Packets (TCP): 74 (6.17 pkts/flow) Confidence DPI : 12 (flows) -Num dissector calls: 1580 (131.67 diss/flow) +Num dissector calls: 1575 (131.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/cfgs/default/result/kerberos.pcap.out b/tests/cfgs/default/result/kerberos.pcap.out index 7f2fcd129..6e2f2aa58 100644 --- a/tests/cfgs/default/result/kerberos.pcap.out +++ b/tests/cfgs/default/result/kerberos.pcap.out @@ -4,7 +4,7 @@ DPI Packets (TCP): 77 (2.14 pkts/flow) Confidence Unknown : 2 (flows) Confidence Match by port : 23 (flows) Confidence DPI : 11 (flows) -Num dissector calls: 4354 (120.94 diss/flow) +Num dissector calls: 4329 (120.25 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/75/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/log4j-webapp-exploit.pcap.out b/tests/cfgs/default/result/log4j-webapp-exploit.pcap.out index e64986170..eb53d047c 100644 --- a/tests/cfgs/default/result/log4j-webapp-exploit.pcap.out +++ b/tests/cfgs/default/result/log4j-webapp-exploit.pcap.out @@ -1,7 +1,7 @@ DPI Packets (TCP): 56 (8.00 pkts/flow) Confidence Unknown : 2 (flows) Confidence DPI : 5 (flows) -Num dissector calls: 360 (51.43 diss/flow) +Num dissector calls: 359 (51.29 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/6/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/mongo_false_positive.pcapng.out b/tests/cfgs/default/result/mongo_false_positive.pcapng.out index b40fce87d..92e35e230 100644 --- a/tests/cfgs/default/result/mongo_false_positive.pcapng.out +++ b/tests/cfgs/default/result/mongo_false_positive.pcapng.out @@ -2,7 +2,7 @@ Guessed flow protos: 1 DPI Packets (TCP): 14 (14.00 pkts/flow) Confidence Match by port : 1 (flows) -Num dissector calls: 275 (275.00 diss/flow) +Num dissector calls: 274 (274.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/3/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/mssql_tds.pcap.out b/tests/cfgs/default/result/mssql_tds.pcap.out index c5203b4d9..b75ea7c04 100644 --- a/tests/cfgs/default/result/mssql_tds.pcap.out +++ b/tests/cfgs/default/result/mssql_tds.pcap.out @@ -3,7 +3,7 @@ Guessed flow protos: 1 DPI Packets (TCP): 18 (1.50 pkts/flow) Confidence Match by port : 1 (flows) Confidence DPI : 11 (flows) -Num dissector calls: 280 (23.33 diss/flow) +Num dissector calls: 274 (22.83 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/3/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/nest_log_sink.pcap.out b/tests/cfgs/default/result/nest_log_sink.pcap.out index 9ffa4a091..68918ad60 100644 --- a/tests/cfgs/default/result/nest_log_sink.pcap.out +++ b/tests/cfgs/default/result/nest_log_sink.pcap.out @@ -4,7 +4,7 @@ DPI Packets (TCP): 130 (10.00 pkts/flow) DPI Packets (UDP): 2 (2.00 pkts/flow) Confidence Match by port : 1 (flows) Confidence DPI : 13 (flows) -Num dissector calls: 2065 (147.50 diss/flow) +Num dissector calls: 2053 (146.64 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/3/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/ookla.pcap.out b/tests/cfgs/default/result/ookla.pcap.out index b06b31fe8..6cc0458e4 100644 --- a/tests/cfgs/default/result/ookla.pcap.out +++ b/tests/cfgs/default/result/ookla.pcap.out @@ -4,7 +4,7 @@ DPI Packets (TCP): 40 (6.67 pkts/flow) Confidence DPI (partial cache): 1 (flows) Confidence DPI : 4 (flows) Confidence DPI (aggressive) : 1 (flows) -Num dissector calls: 562 (93.67 diss/flow) +Num dissector calls: 559 (93.17 diss/flow) LRU cache ookla: 4/2/2 (insert/search/found) LRU cache bittorrent: 0/3/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/openvpn.pcap.out b/tests/cfgs/default/result/openvpn.pcap.out index bee49dc64..169f5df69 100644 --- a/tests/cfgs/default/result/openvpn.pcap.out +++ b/tests/cfgs/default/result/openvpn.pcap.out @@ -1,7 +1,7 @@ DPI Packets (TCP): 24 (8.00 pkts/flow) DPI Packets (UDP): 15 (3.00 pkts/flow) Confidence DPI : 8 (flows) -Num dissector calls: 1294 (161.75 diss/flow) +Num dissector calls: 1291 (161.38 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/6/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/oracle12.pcapng.out b/tests/cfgs/default/result/oracle12.pcapng.out index 235ee10b0..ad5160df3 100644 --- a/tests/cfgs/default/result/oracle12.pcapng.out +++ b/tests/cfgs/default/result/oracle12.pcapng.out @@ -2,7 +2,7 @@ Guessed flow protos: 1 DPI Packets (TCP): 20 (20.00 pkts/flow) Confidence Match by port : 1 (flows) -Num dissector calls: 267 (267.00 diss/flow) +Num dissector calls: 257 (257.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/3/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/ossfuzz_seed_fake_traces_2.pcapng.out b/tests/cfgs/default/result/ossfuzz_seed_fake_traces_2.pcapng.out index 5100a36c3..90ed730e5 100644 --- a/tests/cfgs/default/result/ossfuzz_seed_fake_traces_2.pcapng.out +++ b/tests/cfgs/default/result/ossfuzz_seed_fake_traces_2.pcapng.out @@ -4,7 +4,7 @@ DPI Packets (TCP): 30 (7.50 pkts/flow) DPI Packets (UDP): 4 (2.00 pkts/flow) Confidence Match by port : 1 (flows) Confidence DPI : 5 (flows) -Num dissector calls: 947 (157.83 diss/flow) +Num dissector calls: 944 (157.33 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/3/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/pop3.pcap.out b/tests/cfgs/default/result/pop3.pcap.out index cd21c97cb..19bdf0142 100644 --- a/tests/cfgs/default/result/pop3.pcap.out +++ b/tests/cfgs/default/result/pop3.pcap.out @@ -1,6 +1,6 @@ DPI Packets (TCP): 83 (13.83 pkts/flow) Confidence DPI : 6 (flows) -Num dissector calls: 1242 (207.00 diss/flow) +Num dissector calls: 1236 (206.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/pop3_stls.pcap.out b/tests/cfgs/default/result/pop3_stls.pcap.out index bad75a4e3..64b934b65 100644 --- a/tests/cfgs/default/result/pop3_stls.pcap.out +++ b/tests/cfgs/default/result/pop3_stls.pcap.out @@ -1,6 +1,6 @@ DPI Packets (TCP): 18 (18.00 pkts/flow) Confidence DPI : 1 (flows) -Num dissector calls: 206 (206.00 diss/flow) +Num dissector calls: 205 (205.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/protobuf.pcap.out b/tests/cfgs/default/result/protobuf.pcap.out index 980a2776d..a8ae3cde8 100644 --- a/tests/cfgs/default/result/protobuf.pcap.out +++ b/tests/cfgs/default/result/protobuf.pcap.out @@ -1,6 +1,6 @@ DPI Packets (TCP): 26 (5.20 pkts/flow) Confidence DPI : 5 (flows) -Num dissector calls: 704 (140.80 diss/flow) +Num dissector calls: 701 (140.20 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/raft.pcap.out b/tests/cfgs/default/result/raft.pcap.out index 0442dce11..aa1336f3c 100644 --- a/tests/cfgs/default/result/raft.pcap.out +++ b/tests/cfgs/default/result/raft.pcap.out @@ -1,6 +1,6 @@ DPI Packets (TCP): 12 (6.00 pkts/flow) Confidence DPI : 2 (flows) -Num dissector calls: 340 (170.00 diss/flow) +Num dissector calls: 338 (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/cfgs/default/result/reasm_crash_anon.pcapng.out b/tests/cfgs/default/result/reasm_crash_anon.pcapng.out index 47a439b3d..95d9ab67e 100644 --- a/tests/cfgs/default/result/reasm_crash_anon.pcapng.out +++ b/tests/cfgs/default/result/reasm_crash_anon.pcapng.out @@ -1,6 +1,6 @@ DPI Packets (TCP): 23 (23.00 pkts/flow) Confidence Unknown : 1 (flows) -Num dissector calls: 256 (256.00 diss/flow) +Num dissector calls: 254 (254.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/3/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/reasm_segv_anon.pcapng.out b/tests/cfgs/default/result/reasm_segv_anon.pcapng.out index 826a2eb76..d3ed72f1b 100644 --- a/tests/cfgs/default/result/reasm_segv_anon.pcapng.out +++ b/tests/cfgs/default/result/reasm_segv_anon.pcapng.out @@ -2,7 +2,7 @@ Guessed flow protos: 1 DPI Packets (TCP): 21 (21.00 pkts/flow) Confidence Match by port : 1 (flows) -Num dissector calls: 207 (207.00 diss/flow) +Num dissector calls: 202 (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/cfgs/default/result/resp.pcap.out b/tests/cfgs/default/result/resp.pcap.out new file mode 100644 index 000000000..a8e5bb060 --- /dev/null +++ b/tests/cfgs/default/result/resp.pcap.out @@ -0,0 +1,28 @@ +DPI Packets (TCP): 4 (4.00 pkts/flow) +Confidence DPI : 1 (flows) +Num dissector calls: 1 (1.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: 0/0 (search/found) +Patricia risk mask IPv6: 0/0 (search/found) +Patricia risk: 0/0 (search/found) +Patricia risk IPv6: 0/0 (search/found) +Patricia protocols: 2/0 (search/found) +Patricia protocols IPv6: 0/0 (search/found) + +RESP 39 92898 1 + +Acceptable 39 92898 1 + + 1 TCP 192.168.88.221:51882 <-> 192.168.88.231:6379 [proto: 182/RESP][IP: 0/Unknown][ClearText][Confidence: DPI][DPI packets: 4][cat: Database/11][22 pkts/1556 bytes <-> 17 pkts/91342 bytes][Goodput ratio: 6/99][28.51 sec][bytes ratio: -0.967 (Download)][IAT c2s/s2c min/avg/max/stddev: 0/0 1413/1863 15066/15069 3554/4207][Pkt Len c2s/s2c min/avg/max/stddev: 66/66 71/5373 108/20338 10/5879][PLAIN TEXT (COMMAND)][Plen Bins: 35,5,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,59] diff --git a/tests/cfgs/default/result/riot.pcapng.out b/tests/cfgs/default/result/riot.pcapng.out index 829237351..0180eee9e 100644 --- a/tests/cfgs/default/result/riot.pcapng.out +++ b/tests/cfgs/default/result/riot.pcapng.out @@ -3,7 +3,7 @@ Guessed flow protos: 1 DPI Packets (TCP): 7 (3.50 pkts/flow) Confidence Match by port : 1 (flows) Confidence DPI : 1 (flows) -Num dissector calls: 200 (100.00 diss/flow) +Num dissector calls: 198 (99.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/3/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/rsh.pcap.out b/tests/cfgs/default/result/rsh.pcap.out index 0f0a672e9..47b389f31 100644 --- a/tests/cfgs/default/result/rsh.pcap.out +++ b/tests/cfgs/default/result/rsh.pcap.out @@ -1,6 +1,6 @@ DPI Packets (TCP): 12 (6.00 pkts/flow) Confidence DPI : 2 (flows) -Num dissector calls: 330 (165.00 diss/flow) +Num dissector calls: 328 (164.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/rtmp.pcap.out b/tests/cfgs/default/result/rtmp.pcap.out index b611aa1d6..bce58fa2c 100644 --- a/tests/cfgs/default/result/rtmp.pcap.out +++ b/tests/cfgs/default/result/rtmp.pcap.out @@ -1,6 +1,6 @@ DPI Packets (TCP): 8 (8.00 pkts/flow) Confidence DPI : 1 (flows) -Num dissector calls: 172 (172.00 diss/flow) +Num dissector calls: 171 (171.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/s7comm-plus.pcap.out b/tests/cfgs/default/result/s7comm-plus.pcap.out index f2b1619bf..c3f634268 100644 --- a/tests/cfgs/default/result/s7comm-plus.pcap.out +++ b/tests/cfgs/default/result/s7comm-plus.pcap.out @@ -1,6 +1,6 @@ DPI Packets (TCP): 9 (9.00 pkts/flow) Confidence DPI : 1 (flows) -Num dissector calls: 185 (185.00 diss/flow) +Num dissector calls: 184 (184.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/s7comm.pcap.out b/tests/cfgs/default/result/s7comm.pcap.out index f9c6e557f..692a2aa9b 100644 --- a/tests/cfgs/default/result/s7comm.pcap.out +++ b/tests/cfgs/default/result/s7comm.pcap.out @@ -1,6 +1,6 @@ DPI Packets (TCP): 3 (3.00 pkts/flow) Confidence DPI : 1 (flows) -Num dissector calls: 187 (187.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/cfgs/default/result/shadowsocks.pcap.out b/tests/cfgs/default/result/shadowsocks.pcap.out index c5dcd9a14..4c5da7b87 100644 --- a/tests/cfgs/default/result/shadowsocks.pcap.out +++ b/tests/cfgs/default/result/shadowsocks.pcap.out @@ -1,7 +1,7 @@ DPI Packets (TCP): 21 (10.50 pkts/flow) Confidence Unknown : 1 (flows) Confidence DPI : 1 (flows) -Num dissector calls: 364 (182.00 diss/flow) +Num dissector calls: 363 (181.50 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/3/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/skype.pcap.out b/tests/cfgs/default/result/skype.pcap.out index f0e10d37f..33e0cf65f 100644 --- a/tests/cfgs/default/result/skype.pcap.out +++ b/tests/cfgs/default/result/skype.pcap.out @@ -6,7 +6,7 @@ DPI Packets (other): 5 (1.00 pkts/flow) Confidence Unknown : 59 (flows) Confidence Match by port : 28 (flows) Confidence DPI : 206 (flows) -Num dissector calls: 28226 (96.33 diss/flow) +Num dissector calls: 28119 (95.97 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/261/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/skype_no_unknown.pcap.out b/tests/cfgs/default/result/skype_no_unknown.pcap.out index 7281316e8..f6132321e 100644 --- a/tests/cfgs/default/result/skype_no_unknown.pcap.out +++ b/tests/cfgs/default/result/skype_no_unknown.pcap.out @@ -6,7 +6,7 @@ DPI Packets (other): 5 (1.00 pkts/flow) Confidence Unknown : 44 (flows) Confidence Match by port : 22 (flows) Confidence DPI : 201 (flows) -Num dissector calls: 23409 (87.67 diss/flow) +Num dissector calls: 23333 (87.39 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/198/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/smb_frags.pcap.out b/tests/cfgs/default/result/smb_frags.pcap.out index f91415398..66446cf57 100644 --- a/tests/cfgs/default/result/smb_frags.pcap.out +++ b/tests/cfgs/default/result/smb_frags.pcap.out @@ -1,6 +1,6 @@ DPI Packets (TCP): 5 (5.00 pkts/flow) Confidence DPI : 1 (flows) -Num dissector calls: 171 (171.00 diss/flow) +Num dissector calls: 170 (170.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/smbv1.pcap.out b/tests/cfgs/default/result/smbv1.pcap.out index 0f2a8953b..b25820354 100644 --- a/tests/cfgs/default/result/smbv1.pcap.out +++ b/tests/cfgs/default/result/smbv1.pcap.out @@ -1,6 +1,6 @@ DPI Packets (TCP): 3 (3.00 pkts/flow) Confidence DPI : 1 (flows) -Num dissector calls: 173 (173.00 diss/flow) +Num dissector calls: 172 (172.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/smtp-starttls.pcap.out b/tests/cfgs/default/result/smtp-starttls.pcap.out index 61bd3fd7f..83cd1b0d7 100644 --- a/tests/cfgs/default/result/smtp-starttls.pcap.out +++ b/tests/cfgs/default/result/smtp-starttls.pcap.out @@ -1,6 +1,6 @@ DPI Packets (TCP): 26 (13.00 pkts/flow) Confidence DPI : 2 (flows) -Num dissector calls: 169 (84.50 diss/flow) +Num dissector calls: 168 (84.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/smtp.pcap.out b/tests/cfgs/default/result/smtp.pcap.out index a9d95fb46..31567fa32 100644 --- a/tests/cfgs/default/result/smtp.pcap.out +++ b/tests/cfgs/default/result/smtp.pcap.out @@ -1,6 +1,6 @@ DPI Packets (TCP): 11 (11.00 pkts/flow) Confidence DPI : 1 (flows) -Num dissector calls: 212 (212.00 diss/flow) +Num dissector calls: 211 (211.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/soap.pcap.out b/tests/cfgs/default/result/soap.pcap.out index 072810230..8af81ea02 100644 --- a/tests/cfgs/default/result/soap.pcap.out +++ b/tests/cfgs/default/result/soap.pcap.out @@ -3,7 +3,7 @@ Guessed flow protos: 1 DPI Packets (TCP): 20 (6.67 pkts/flow) Confidence Match by port : 1 (flows) Confidence DPI : 2 (flows) -Num dissector calls: 410 (136.67 diss/flow) +Num dissector calls: 407 (135.67 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/3/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/starcraft_battle.pcap.out b/tests/cfgs/default/result/starcraft_battle.pcap.out index dcc79c9d7..c5fe5ae2a 100644 --- a/tests/cfgs/default/result/starcraft_battle.pcap.out +++ b/tests/cfgs/default/result/starcraft_battle.pcap.out @@ -6,7 +6,7 @@ DPI Packets (other): 1 (1.00 pkts/flow) Confidence Match by port : 12 (flows) Confidence DPI : 39 (flows) Confidence Match by IP : 1 (flows) -Num dissector calls: 1637 (31.48 diss/flow) +Num dissector calls: 1635 (31.44 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/39/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/teams.pcap.out b/tests/cfgs/default/result/teams.pcap.out index 31e9aa49c..5fca8dfad 100644 --- a/tests/cfgs/default/result/teams.pcap.out +++ b/tests/cfgs/default/result/teams.pcap.out @@ -7,7 +7,7 @@ Confidence Unknown : 1 (flows) Confidence Match by port : 2 (flows) Confidence DPI (partial) : 4 (flows) Confidence DPI : 76 (flows) -Num dissector calls: 530 (6.39 diss/flow) +Num dissector calls: 529 (6.37 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/9/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/telegram_videocall.pcapng.out b/tests/cfgs/default/result/telegram_videocall.pcapng.out index 561ec1551..24ba87309 100644 --- a/tests/cfgs/default/result/telegram_videocall.pcapng.out +++ b/tests/cfgs/default/result/telegram_videocall.pcapng.out @@ -7,7 +7,7 @@ Confidence Match by port : 8 (flows) Confidence DPI (cache) : 10 (flows) Confidence DPI : 15 (flows) Confidence Match by IP : 1 (flows) -Num dissector calls: 1988 (58.47 diss/flow) +Num dissector calls: 1979 (58.21 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/27/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/telnet.pcap.out b/tests/cfgs/default/result/telnet.pcap.out index 2fb173661..655b93c9d 100644 --- a/tests/cfgs/default/result/telnet.pcap.out +++ b/tests/cfgs/default/result/telnet.pcap.out @@ -1,6 +1,6 @@ DPI Packets (TCP): 33 (33.00 pkts/flow) Confidence DPI : 1 (flows) -Num dissector calls: 169 (169.00 diss/flow) +Num dissector calls: 168 (168.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/threema.pcap.out b/tests/cfgs/default/result/threema.pcap.out index 3b75b3484..ae14d56ee 100644 --- a/tests/cfgs/default/result/threema.pcap.out +++ b/tests/cfgs/default/result/threema.pcap.out @@ -3,7 +3,7 @@ Guessed flow protos: 2 DPI Packets (TCP): 66 (11.00 pkts/flow) Confidence DPI : 4 (flows) Confidence Match by IP : 2 (flows) -Num dissector calls: 1334 (222.33 diss/flow) +Num dissector calls: 1328 (221.33 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/6/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/tinc.pcap.out b/tests/cfgs/default/result/tinc.pcap.out index 7fa19929a..0abe06d3a 100644 --- a/tests/cfgs/default/result/tinc.pcap.out +++ b/tests/cfgs/default/result/tinc.pcap.out @@ -2,7 +2,7 @@ DPI Packets (TCP): 19 (9.50 pkts/flow) DPI Packets (UDP): 2 (1.00 pkts/flow) Confidence DPI (cache) : 2 (flows) Confidence DPI : 2 (flows) -Num dissector calls: 533 (133.25 diss/flow) +Num dissector calls: 531 (132.75 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/tls_certificate_too_long.pcap.out b/tests/cfgs/default/result/tls_certificate_too_long.pcap.out index 4bf005a66..1dc5f4e0f 100644 --- a/tests/cfgs/default/result/tls_certificate_too_long.pcap.out +++ b/tests/cfgs/default/result/tls_certificate_too_long.pcap.out @@ -6,7 +6,7 @@ DPI Packets (other): 2 (1.00 pkts/flow) Confidence Unknown : 1 (flows) Confidence Match by port : 1 (flows) Confidence DPI : 33 (flows) -Num dissector calls: 635 (18.14 diss/flow) +Num dissector calls: 633 (18.09 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/6/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/tls_false_positives.pcapng.out b/tests/cfgs/default/result/tls_false_positives.pcapng.out index e27bce02c..16ccf258a 100644 --- a/tests/cfgs/default/result/tls_false_positives.pcapng.out +++ b/tests/cfgs/default/result/tls_false_positives.pcapng.out @@ -1,6 +1,6 @@ DPI Packets (TCP): 13 (13.00 pkts/flow) Confidence Unknown : 1 (flows) -Num dissector calls: 262 (262.00 diss/flow) +Num dissector calls: 261 (261.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/3/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/viber.pcap.out b/tests/cfgs/default/result/viber.pcap.out index 2140f767c..3b8a4a3a9 100644 --- a/tests/cfgs/default/result/viber.pcap.out +++ b/tests/cfgs/default/result/viber.pcap.out @@ -5,7 +5,7 @@ DPI Packets (UDP): 27 (1.93 pkts/flow) DPI Packets (other): 2 (1.00 pkts/flow) Confidence Match by port : 4 (flows) Confidence DPI : 25 (flows) -Num dissector calls: 461 (15.90 diss/flow) +Num dissector calls: 459 (15.83 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/12/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/wa_video.pcap.out b/tests/cfgs/default/result/wa_video.pcap.out index 16430f8b4..af212d2bd 100644 --- a/tests/cfgs/default/result/wa_video.pcap.out +++ b/tests/cfgs/default/result/wa_video.pcap.out @@ -5,7 +5,7 @@ DPI Packets (UDP): 13 (1.00 pkts/flow) Confidence DPI (cache) : 2 (flows) Confidence DPI : 11 (flows) Confidence Match by IP : 1 (flows) -Num dissector calls: 403 (28.79 diss/flow) +Num dissector calls: 395 (28.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/cfgs/default/result/waze.pcap.out b/tests/cfgs/default/result/waze.pcap.out index bd8376226..21a9869bf 100644 --- a/tests/cfgs/default/result/waze.pcap.out +++ b/tests/cfgs/default/result/waze.pcap.out @@ -5,7 +5,7 @@ DPI Packets (UDP): 1 (1.00 pkts/flow) Confidence Unknown : 1 (flows) Confidence Match by port : 9 (flows) Confidence DPI : 23 (flows) -Num dissector calls: 384 (11.64 diss/flow) +Num dissector calls: 383 (11.61 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/30/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/whatsapp.pcap.out b/tests/cfgs/default/result/whatsapp.pcap.out index 6495f9306..19b12a7df 100644 --- a/tests/cfgs/default/result/whatsapp.pcap.out +++ b/tests/cfgs/default/result/whatsapp.pcap.out @@ -1,6 +1,6 @@ DPI Packets (TCP): 344 (4.00 pkts/flow) Confidence DPI : 86 (flows) -Num dissector calls: 13760 (160.00 diss/flow) +Num dissector calls: 13674 (159.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/whois.pcapng.out b/tests/cfgs/default/result/whois.pcapng.out index ad134c9d6..4b60f0fa2 100644 --- a/tests/cfgs/default/result/whois.pcapng.out +++ b/tests/cfgs/default/result/whois.pcapng.out @@ -3,7 +3,7 @@ Guessed flow protos: 1 DPI Packets (TCP): 16 (5.33 pkts/flow) Confidence Match by port : 1 (flows) Confidence DPI : 2 (flows) -Num dissector calls: 201 (67.00 diss/flow) +Num dissector calls: 199 (66.33 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/3/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/z3950.pcapng.out b/tests/cfgs/default/result/z3950.pcapng.out index fb95aa1c2..f1ce704c4 100644 --- a/tests/cfgs/default/result/z3950.pcapng.out +++ b/tests/cfgs/default/result/z3950.pcapng.out @@ -3,7 +3,7 @@ Guessed flow protos: 1 DPI Packets (TCP): 26 (13.00 pkts/flow) Confidence Match by port : 1 (flows) Confidence DPI : 1 (flows) -Num dissector calls: 478 (239.00 diss/flow) +Num dissector calls: 476 (238.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/3/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/zoom.pcap.out b/tests/cfgs/default/result/zoom.pcap.out index f79603f9c..bb04161c3 100644 --- a/tests/cfgs/default/result/zoom.pcap.out +++ b/tests/cfgs/default/result/zoom.pcap.out @@ -5,7 +5,7 @@ DPI Packets (UDP): 28 (1.56 pkts/flow) DPI Packets (other): 2 (1.00 pkts/flow) Confidence Match by port : 2 (flows) Confidence DPI : 32 (flows) -Num dissector calls: 870 (25.59 diss/flow) +Num dissector calls: 869 (25.56 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/6/0 (insert/search/found) LRU cache zoom: 7/0/0 (insert/search/found) diff --git a/tests/cfgs/disable_aggressiveness/result/ookla.pcap.out b/tests/cfgs/disable_aggressiveness/result/ookla.pcap.out index d7b99fee4..b13a55f2a 100644 --- a/tests/cfgs/disable_aggressiveness/result/ookla.pcap.out +++ b/tests/cfgs/disable_aggressiveness/result/ookla.pcap.out @@ -3,7 +3,7 @@ Guessed flow protos: 1 DPI Packets (TCP): 40 (6.67 pkts/flow) Confidence DPI (partial cache): 1 (flows) Confidence DPI : 5 (flows) -Num dissector calls: 562 (93.67 diss/flow) +Num dissector calls: 559 (93.17 diss/flow) LRU cache ookla: 4/1/1 (insert/search/found) LRU cache bittorrent: 0/3/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/disable_protocols/result/soap.pcap.out b/tests/cfgs/disable_protocols/result/soap.pcap.out index b43b4ea1c..7bab5ebe7 100644 --- a/tests/cfgs/disable_protocols/result/soap.pcap.out +++ b/tests/cfgs/disable_protocols/result/soap.pcap.out @@ -3,7 +3,7 @@ Guessed flow protos: 2 DPI Packets (TCP): 20 (6.67 pkts/flow) Confidence Match by port : 2 (flows) Confidence DPI : 1 (flows) -Num dissector calls: 401 (133.67 diss/flow) +Num dissector calls: 398 (132.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/cfgs/enable_payload_stat/result/1kxun.pcap.out b/tests/cfgs/enable_payload_stat/result/1kxun.pcap.out index 88133999e..beccb2c17 100644 --- a/tests/cfgs/enable_payload_stat/result/1kxun.pcap.out +++ b/tests/cfgs/enable_payload_stat/result/1kxun.pcap.out @@ -5,7 +5,7 @@ DPI Packets (UDP): 120 (1.21 pkts/flow) Confidence Unknown : 14 (flows) Confidence Match by port : 6 (flows) Confidence DPI : 177 (flows) -Num dissector calls: 4933 (25.04 diss/flow) +Num dissector calls: 4925 (25.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/60/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/ip_lists_disable/result/1kxun.pcap.out b/tests/cfgs/ip_lists_disable/result/1kxun.pcap.out index 66e349e05..a96984c29 100644 --- a/tests/cfgs/ip_lists_disable/result/1kxun.pcap.out +++ b/tests/cfgs/ip_lists_disable/result/1kxun.pcap.out @@ -5,7 +5,7 @@ DPI Packets (UDP): 120 (1.21 pkts/flow) Confidence Unknown : 14 (flows) Confidence Match by port : 6 (flows) Confidence DPI : 177 (flows) -Num dissector calls: 4933 (25.04 diss/flow) +Num dissector calls: 4925 (25.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/60/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/windows/nDPI.vcxproj b/windows/nDPI.vcxproj index bc10f7897..c6f333019 100644 --- a/windows/nDPI.vcxproj +++ b/windows/nDPI.vcxproj @@ -285,7 +285,7 @@ - + diff --git a/windows/nDPI.vcxproj.filters b/windows/nDPI.vcxproj.filters index 6f9cec9b2..dfb72857d 100644 --- a/windows/nDPI.vcxproj.filters +++ b/windows/nDPI.vcxproj.filters @@ -68,7 +68,7 @@ - +