From 18f3147322918c6cd6397f6363172417d992fc99 Mon Sep 17 00:00:00 2001 From: mmaatuq Date: Thu, 23 May 2024 00:37:31 +0400 Subject: [PATCH] support rtp/rtcp over tcp (#2422) * support rtp/rtcp over tcp as per rfc4571. Signed-off-by: mmaatuq --- src/include/ndpi_typedefs.h | 18 ++- src/lib/protocols/protobuf.c | 2 +- src/lib/protocols/raknet.c | 4 +- src/lib/protocols/rtp.c | 126 ++++++++++++------ src/lib/protocols/viber.c | 2 +- tests/cfgs/caches_cfg/result/ookla.pcap.out | 2 +- tests/cfgs/caches_cfg/result/teams.pcap.out | 2 +- .../caches_global/result/bittorrent.pcap.out | 2 +- .../caches_global/result/mining.pcapng.out | 2 +- .../cfgs/caches_global/result/ookla.pcap.out | 2 +- .../cfgs/caches_global/result/teams.pcap.out | 2 +- tests/cfgs/default/pcap/rtp.pcapng | Bin 39700 -> 64212 bytes tests/cfgs/default/result/1kxun.pcap.out | 2 +- tests/cfgs/default/result/443-chrome.pcap.out | 2 +- tests/cfgs/default/result/443-opvn.pcap.out | 2 +- .../default/result/KakaoTalk_chat.pcap.out | 2 +- .../default/result/KakaoTalk_talk.pcap.out | 2 +- tests/cfgs/default/result/Oscar.pcap.out | 2 +- .../cfgs/default/result/alexa-app.pcapng.out | 2 +- tests/cfgs/default/result/alicloud.pcap.out | 2 +- tests/cfgs/default/result/amqp.pcap.out | 2 +- .../default/result/anyconnect-vpn.pcap.out | 2 +- tests/cfgs/default/result/avast.pcap.out | 2 +- tests/cfgs/default/result/bfcp.pcapng.out | 2 +- tests/cfgs/default/result/bittorrent.pcap.out | 2 +- .../result/bittorrent_tcp_miss.pcapng.out | 2 +- tests/cfgs/default/result/cassandra.pcap.out | 2 +- .../default/result/cloudflare-warp.pcap.out | 2 +- tests/cfgs/default/result/coap_mqtt.pcap.out | 2 +- tests/cfgs/default/result/codm.pcap.out | 2 +- tests/cfgs/default/result/corba.pcap.out | 2 +- .../result/custom_categories.pcapng.out | 2 +- tests/cfgs/default/result/dlms.pcap.out | 2 +- tests/cfgs/default/result/drda_db2.pcap.out | 2 +- tests/cfgs/default/result/edonkey.pcap.out | 2 +- .../default/result/elasticsearch.pcap.out | 2 +- tests/cfgs/default/result/elf.pcap.out | 2 +- tests/cfgs/default/result/emotet.pcap.out | 2 +- tests/cfgs/default/result/fastcgi.pcap.out | 2 +- tests/cfgs/default/result/fix.pcap.out | 2 +- tests/cfgs/default/result/fix2.pcap.out | 2 +- .../default/result/ftp-start-tls.pcap.out | 2 +- tests/cfgs/default/result/ftp.pcap.out | 2 +- tests/cfgs/default/result/ftp_failed.pcap.out | 2 +- .../result/fuzz-2006-06-26-2594.pcap.out | 2 +- .../result/fuzz-2006-09-29-28586.pcap.out | 2 +- .../default/result/fuzz-2021-10-13.pcap.out | 2 +- .../result/gaijin_mobile_mixed.pcap.out | 2 +- .../default/result/genshin-impact.pcap.out | 2 +- tests/cfgs/default/result/gnutella.pcap.out | 2 +- tests/cfgs/default/result/google_ssl.pcap.out | 2 +- tests/cfgs/default/result/h323.pcap.out | 2 +- tests/cfgs/default/result/haproxy.pcap.out | 2 +- tests/cfgs/default/result/hl7.pcap.out | 2 +- tests/cfgs/default/result/hpvirtgrp.pcap.out | 2 +- tests/cfgs/default/result/http2.pcapng.out | 2 +- .../http_guessed_host_and_guessed.pcapng.out | 2 +- .../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/jsonrpc.pcap.out | 2 +- tests/cfgs/default/result/kafka.pcapng.out | 2 +- tests/cfgs/default/result/kerberos.pcap.out | 2 +- tests/cfgs/default/result/kismet.pcap.out | 2 +- .../default/result/lisp_registration.pcap.out | 2 +- .../result/log4j-webapp-exploit.pcap.out | 2 +- tests/cfgs/default/result/memcached.cap.out | 2 +- tests/cfgs/default/result/mining.pcapng.out | 2 +- tests/cfgs/default/result/monero.pcap.out | 2 +- .../result/mongo_false_positive.pcapng.out | 2 +- tests/cfgs/default/result/mongodb.pcap.out | 2 +- tests/cfgs/default/result/mssql_tds.pcap.out | 2 +- tests/cfgs/default/result/nats.pcap.out | 2 +- .../default/result/nest_log_sink.pcap.out | 2 +- tests/cfgs/default/result/netbios.pcap.out | 2 +- tests/cfgs/default/result/nntp.pcap.out | 2 +- tests/cfgs/default/result/ookla.pcap.out | 2 +- tests/cfgs/default/result/openvpn.pcap.out | 2 +- .../result/openvpn_nohmac_tcp.pcapng.out | 2 +- tests/cfgs/default/result/oracle12.pcapng.out | 2 +- .../ossfuzz_seed_fake_traces_1.pcapng.out | 2 +- .../ossfuzz_seed_fake_traces_2.pcapng.out | 2 +- .../default/result/path_of_exile.pcapng.out | 2 +- tests/cfgs/default/result/pgsql.pcap.out | 2 +- tests/cfgs/default/result/pop3.pcap.out | 2 +- tests/cfgs/default/result/pop3_stls.pcap.out | 2 +- .../result/portable_executable.pcap.out | 2 +- tests/cfgs/default/result/pptp.pcap.out | 2 +- tests/cfgs/default/result/protobuf.pcap.out | 2 +- tests/cfgs/default/result/radmin3.pcapng.out | 2 +- tests/cfgs/default/result/raft.pcap.out | 2 +- .../result/reasm_crash_anon.pcapng.out | 2 +- .../default/result/reasm_segv_anon.pcapng.out | 2 +- tests/cfgs/default/result/riot.pcapng.out | 2 +- tests/cfgs/default/result/rsh.pcap.out | 2 +- tests/cfgs/default/result/rtmp.pcap.out | 2 +- tests/cfgs/default/result/rtp.pcapng.out | 18 +-- tests/cfgs/default/result/rtsp.pcap.out | 2 +- .../default/result/rtsp_setup_http.pcapng.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/shell.pcap.out | 2 +- tests/cfgs/default/result/smb_frags.pcap.out | 2 +- tests/cfgs/default/result/smbv1.pcap.out | 2 +- .../default/result/smpp_in_general.pcap.out | 2 +- .../default/result/smtp-starttls.pcap.out | 2 +- tests/cfgs/default/result/smtp.pcap.out | 2 +- tests/cfgs/default/result/soap.pcap.out | 2 +- tests/cfgs/default/result/socks.pcap.out | 2 +- .../cfgs/default/result/spotify_tcp.pcap.out | 2 +- .../default/result/starcraft_battle.pcap.out | 2 +- tests/cfgs/default/result/stun.pcap.out | 2 +- .../stun_tcp_multiple_msgs_same_pkt.pcap.out | 2 +- tests/cfgs/default/result/syslog.pcap.out | 2 +- tests/cfgs/default/result/teams.pcap.out | 2 +- .../result/telegram_videocall.pcapng.out | 2 +- tests/cfgs/default/result/telnet.pcap.out | 2 +- .../default/result/tencent_games.pcap.out | 2 +- tests/cfgs/default/result/teso.pcapng.out | 2 +- tests/cfgs/default/result/threema.pcap.out | 2 +- tests/cfgs/default/result/thrift.pcap.out | 2 +- tests/cfgs/default/result/tinc.pcap.out | 2 +- .../cfgs/default/result/tls-appdata.pcap.out | 2 +- .../result/tls_certificate_too_long.pcap.out | 2 +- .../result/tls_false_positives.pcapng.out | 2 +- .../default/result/tls_invalid_reads.pcap.out | 2 +- .../result/tls_missing_ch_frag.pcap.out | 2 +- .../result/tls_unidirectional.pcap.out | 2 +- tests/cfgs/default/result/ultrasurf.pcap.out | 2 +- tests/cfgs/default/result/viber.pcap.out | 2 +- tests/cfgs/default/result/vnc.pcap.out | 2 +- tests/cfgs/default/result/wa_video.pcap.out | 2 +- tests/cfgs/default/result/wa_voice.pcap.out | 2 +- tests/cfgs/default/result/waze.pcap.out | 2 +- tests/cfgs/default/result/websocket.pcap.out | 2 +- tests/cfgs/default/result/wechat.pcap.out | 2 +- tests/cfgs/default/result/whatsapp.pcap.out | 2 +- .../result/whatsapp_login_call.pcap.out | 2 +- .../result/whatsapp_login_chat.pcap.out | 2 +- .../whatsapp_voice_and_message.pcap.out | 2 +- tests/cfgs/default/result/whois.pcapng.out | 2 +- tests/cfgs/default/result/wow.pcap.out | 2 +- tests/cfgs/default/result/xiaomi.pcap.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 +- .../result/teams.pcap.out | 2 +- .../result/telegram_videocall.pcapng.out | 2 +- 155 files changed, 256 insertions(+), 210 deletions(-) diff --git a/src/include/ndpi_typedefs.h b/src/include/ndpi_typedefs.h index a2e10878fdb..534b804fba1 100644 --- a/src/include/ndpi_typedefs.h +++ b/src/include/ndpi_typedefs.h @@ -902,12 +902,6 @@ struct ndpi_flow_udp_struct { /* NDPI_PROTOCOL_XBOX */ u_int32_t xbox_stage:1; - /* NDPI_PROTOCOL_RTP */ - u_int32_t rtp_stage:2; - - /* NDPI_PROTOCOL_RTCP */ - u_int32_t rtcp_stage:2; - /* NDPI_PROTOCOL_QUIC */ u_int32_t quic_0rtt_found:1; u_int32_t quic_vn_pair:1; @@ -922,10 +916,6 @@ struct ndpi_flow_udp_struct { /* NDPI_PROTOCOL_RAKNET */ u_int32_t raknet_custom:1; - /* NDPI_PROTOCOL_RTP */ - u_int16_t rtp_seq[2]; - u_int8_t rtp_seq_set[2]; - /* NDPI_PROTOCOL_EAQ */ u_int8_t eaq_pkt_id; u_int32_t eaq_sequence; @@ -1492,6 +1482,14 @@ struct ndpi_flow_struct { /* NDPI_PROTOCOL_TINC */ u_int8_t tinc_state; + + /* NDPI_PROTOCOL_RTCP */ + u_int8_t rtcp_stage:2; + + /* NDPI_PROTOCOL_RTP */ + u_int8_t rtp_stage:2; + u_int8_t rtp_seq_set[2]; + u_int16_t rtp_seq[2]; /* Flow payload */ u_int16_t flow_payload_len; diff --git a/src/lib/protocols/protobuf.c b/src/lib/protocols/protobuf.c index 9f50e5c3164..4306e81adc9 100644 --- a/src/lib/protocols/protobuf.c +++ b/src/lib/protocols/protobuf.c @@ -228,7 +228,7 @@ static void ndpi_search_protobuf(struct ndpi_detection_module_struct *ndpi_struc #endif if ((protobuf_elements >= PROTOBUF_REQUIRED_ELEMENTS && protobuf_len_elements > 0 && /* (On UDP) this packet might be also a RTP/RTCP one. Wait for the next one */ - (flow->packet_counter > 1 || flow->l4_proto == IPPROTO_TCP || flow->l4.udp.rtp_stage == 0)) + (flow->packet_counter > 1 || flow->l4_proto == IPPROTO_TCP || flow->rtp_stage == 0)) || (flow->packet_counter >= PROTOBUF_MIN_PACKETS && protobuf_elements >= PROTOBUF_MIN_ELEMENTS)) { #ifdef DEBUG_PROTOBUF diff --git a/src/lib/protocols/raknet.c b/src/lib/protocols/raknet.c index b11107ec358..3e3200e1a49 100644 --- a/src/lib/protocols/raknet.c +++ b/src/lib/protocols/raknet.c @@ -295,7 +295,7 @@ static void ndpi_search_raknet(struct ndpi_detection_module_struct *ndpi_struct, if (frame_offset == packet->payload_packet_len) { /* This packet might also be a RTP/RTCP one: give precedence to RTP/RTCP dissector */ - if(flow->l4.udp.rtp_stage == 0 && flow->l4.udp.rtcp_stage == 0) + if(flow->rtp_stage == 0 && flow->rtcp_stage == 0) ndpi_int_raknet_add_connection(ndpi_struct, flow); } else { exclude_proto(ndpi_struct, flow); @@ -366,7 +366,7 @@ static void ndpi_search_raknet(struct ndpi_detection_module_struct *ndpi_struct, if (record_index == record_count && record_offset == packet->payload_packet_len) { /* This packet might also be a RTP/RTCP one: give precedence to RTP/RTCP dissector */ - if(flow->l4.udp.rtp_stage == 0 && flow->l4.udp.rtcp_stage == 0) + if(flow->rtp_stage == 0 && flow->rtcp_stage == 0) ndpi_int_raknet_add_connection(ndpi_struct, flow); } else { exclude_proto(ndpi_struct, flow); diff --git a/src/lib/protocols/rtp.c b/src/lib/protocols/rtp.c index e549a910f03..b543e8b99cf 100644 --- a/src/lib/protocols/rtp.c +++ b/src/lib/protocols/rtp.c @@ -90,10 +90,15 @@ int is_rtp_or_rtcp(struct ndpi_detection_module_struct *ndpi_struct, u_int16_t * u_int16_t ext_len; u_int32_t min_len; const u_int8_t *payload = packet->payload; - const u_int16_t payload_len = packet->payload_packet_len; + u_int16_t payload_len = packet->payload_packet_len; if(payload_len < 2) return NO_RTP_RTCP; + + if(packet->tcp != NULL) { + payload_len -= 2; + payload += 2; /* Skip the length field */ + } if((payload[0] & 0xC0) != 0x80) { /* Version 2 */ NDPI_LOG_DBG(ndpi_struct, "Not version 2\n"); @@ -142,20 +147,14 @@ int is_rtp_or_rtcp(struct ndpi_detection_module_struct *ndpi_struct, u_int16_t * static void ndpi_rtp_search(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow) { u_int8_t is_rtp; - u_int16_t d_port = ntohs(ndpi_struct->packet.udp->dest); struct ndpi_packet_struct *packet = &ndpi_struct->packet; const u_int8_t *payload = packet->payload; u_int16_t seq; - NDPI_LOG_DBG(ndpi_struct, "search RTP (stage %d/%d)\n", flow->l4.udp.rtp_stage, flow->l4.udp.rtcp_stage); - - if(d_port == 5355 || /* LLMNR_PORT */ - d_port == 5353 || /* MDNS_PORT */ - d_port == 9600 /* FINS_PORT */) { - NDPI_EXCLUDE_PROTO(ndpi_struct, flow); - NDPI_EXCLUDE_PROTO_EXT(ndpi_struct, flow, NDPI_PROTOCOL_RTCP); - return; + if(packet->tcp != NULL) { + payload += 2; /* Skip the length field */ } + NDPI_LOG_DBG(ndpi_struct, "search RTP (stage %d/%d)\n", flow->rtp_stage, flow->rtcp_stage); /* * Let some "unknown" packets at the beginning: * search for 3/4 consecutive RTP/RTCP packets. @@ -163,8 +162,8 @@ static void ndpi_rtp_search(struct ndpi_detection_module_struct *ndpi_struct, * RTCP packets in the flow or if RTP/RTCP are multiplexed together */ if(flow->packet_counter > 3 && - flow->l4.udp.rtp_stage == 0 && - flow->l4.udp.rtcp_stage == 0) { + flow->rtp_stage == 0 && + flow->rtcp_stage == 0) { NDPI_EXCLUDE_PROTO(ndpi_struct, flow); NDPI_EXCLUDE_PROTO_EXT(ndpi_struct, flow, NDPI_PROTOCOL_RTCP); return; @@ -173,19 +172,19 @@ static void ndpi_rtp_search(struct ndpi_detection_module_struct *ndpi_struct, is_rtp = is_rtp_or_rtcp(ndpi_struct, &seq); if(is_rtp == IS_RTP) { - if(flow->l4.udp.rtp_stage == 2) { + if(flow->rtp_stage == 2) { if(flow->l4.udp.line_pkts[0] >= 2 && flow->l4.udp.line_pkts[1] >= 2) { /* It seems that it is a LINE stuff; let its dissector to evaluate */ } else if(flow->l4.udp.epicgames_stage > 0) { /* It seems that it is a EpicGames stuff; let its dissector to evaluate */ - } else if(flow->l4.udp.rtp_seq_set[packet->packet_direction] && - flow->l4.udp.rtp_seq[packet->packet_direction] == seq) { + } else if(flow->rtp_seq_set[packet->packet_direction] && + flow->rtp_seq[packet->packet_direction] == seq) { /* Simple heuristic to avoid false positives. tradeoff between: * consecutive RTP packets should have different sequence number * we should handle duplicated traffic */ NDPI_LOG_DBG(ndpi_struct, "Same seq on consecutive pkts\n"); - flow->l4.udp.rtp_stage = 0; - flow->l4.udp.rtcp_stage = 0; + flow->rtp_stage = 0; + flow->rtcp_stage = 0; NDPI_EXCLUDE_PROTO(ndpi_struct, flow); NDPI_EXCLUDE_PROTO_EXT(ndpi_struct, flow, NDPI_PROTOCOL_RTCP); } else { @@ -198,32 +197,32 @@ static void ndpi_rtp_search(struct ndpi_detection_module_struct *ndpi_struct, } return; } - if(flow->l4.udp.rtp_stage == 0) { - flow->l4.udp.rtp_seq[packet->packet_direction] = seq; - flow->l4.udp.rtp_seq_set[packet->packet_direction] = 1; + if(flow->rtp_stage == 0) { + flow->rtp_seq[packet->packet_direction] = seq; + flow->rtp_seq_set[packet->packet_direction] = 1; } - flow->l4.udp.rtp_stage += 1; - } else if(is_rtp == IS_RTCP && flow->l4.udp.rtp_stage > 0) { + flow->rtp_stage += 1; + } else if(is_rtp == IS_RTCP && flow->rtp_stage > 0) { /* RTCP after (some) RTP. Keep looking for RTP */ - } else if(is_rtp == IS_RTCP && flow->l4.udp.rtp_stage == 0) { - if(flow->l4.udp.rtcp_stage == 3) { + } else if(is_rtp == IS_RTCP && flow->rtp_stage == 0) { + if(flow->rtcp_stage == 3) { NDPI_LOG_INFO(ndpi_struct, "Found RTCP\n"); ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_UNKNOWN, NDPI_PROTOCOL_RTCP, NDPI_CONFIDENCE_DPI); return; } - flow->l4.udp.rtcp_stage += 1; + flow->rtcp_stage += 1; } else { - if(flow->l4.udp.rtp_stage || flow->l4.udp.rtcp_stage) { + if(flow->rtp_stage || flow->rtcp_stage) { u_int16_t app_proto; /* unused */ u_int32_t unused; /* TODO: we should switch to the demultiplexing-code in stun dissector */ if(is_stun(ndpi_struct, flow, &app_proto) != 0 && !is_dtls(packet->payload, packet->payload_packet_len, &unused)) { - flow->l4.udp.rtp_stage = 0; - flow->l4.udp.rtcp_stage = 0; + flow->rtp_stage = 0; + flow->rtcp_stage = 0; NDPI_EXCLUDE_PROTO(ndpi_struct, flow); NDPI_EXCLUDE_PROTO_EXT(ndpi_struct, flow, NDPI_PROTOCOL_RTCP); } @@ -235,21 +234,68 @@ static void ndpi_rtp_search(struct ndpi_detection_module_struct *ndpi_struct, } /* *************************************************************** */ +/* https://datatracker.ietf.org/doc/html/rfc4571 + * message format for RTP/RTCP over TCP: + * 0 1 2 3 + * 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 + * --------------------------------------------------------------- + * | LENGTH | RTP or RTCP packet ... | + * --------------------------------------------------------------- + */ +static void ndpi_search_rtp_tcp(struct ndpi_detection_module_struct *ndpi_struct, + struct ndpi_flow_struct *flow) +{ + struct ndpi_packet_struct *packet = &ndpi_struct->packet; + const u_int8_t *payload = packet->payload; + + if(packet->payload_packet_len < 4){ /* (2) len field + (2) min rtp/rtcp*/ + NDPI_EXCLUDE_PROTO(ndpi_struct, flow); + NDPI_EXCLUDE_PROTO_EXT(ndpi_struct, flow, NDPI_PROTOCOL_RTCP); + return; + } -static void ndpi_search_rtp(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow) + u_int16_t len = ntohs(get_u_int16_t(payload, 0)); + if(len + sizeof(len) != packet->payload_packet_len) { /*fragmented packets are not handled*/ + NDPI_EXCLUDE_PROTO(ndpi_struct, flow); + NDPI_EXCLUDE_PROTO_EXT(ndpi_struct, flow, NDPI_PROTOCOL_RTCP); + } else { + ndpi_rtp_search(ndpi_struct, flow); + } + +} + +/* *************************************************************** */ +static void ndpi_search_rtp_udp(struct ndpi_detection_module_struct *ndpi_struct, + struct ndpi_flow_struct *flow) { struct ndpi_packet_struct *packet = &ndpi_struct->packet; u_int16_t source = ntohs(packet->udp->source); u_int16_t dest = ntohs(packet->udp->dest); - - if((source != 30303) && (dest != 30303 /* Avoid to mix it with Ethereum that looks alike */) - && (dest > 1023) - ) - ndpi_rtp_search(ndpi_struct, flow); - else { + /* + * XXX: not sure if rtp/rtcp over tcp will also mix with Ethereum + * for now, will not add it unitl we have a false positive. + */ + if((source == 30303) || (dest == 30303 /* Avoid to mix it with Ethereum that looks alike */) + || (dest == 5355 /* LLMNR_PORT */) + || (dest == 5353 /* MDNS_PORT */) + || (dest == 9600 /* FINS_PORT */) + || (dest <= 1023)){ NDPI_EXCLUDE_PROTO(ndpi_struct, flow); NDPI_EXCLUDE_PROTO_EXT(ndpi_struct, flow, NDPI_PROTOCOL_RTCP); + return; } + ndpi_rtp_search(ndpi_struct, flow); +} + +/* *************************************************************** */ +static void ndpi_search_rtp(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow) +{ + struct ndpi_packet_struct *packet = &ndpi_struct->packet; + if(packet->tcp != NULL) { + ndpi_search_rtp_tcp(ndpi_struct, flow); + } else { + ndpi_search_rtp_udp(ndpi_struct, flow); + } } /* *************************************************************** */ @@ -257,11 +303,11 @@ static void ndpi_search_rtp(struct ndpi_detection_module_struct *ndpi_struct, st void init_rtp_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id) { ndpi_set_bitmask_protocol_detection("RTP", ndpi_struct, *id, - NDPI_PROTOCOL_RTP, - ndpi_search_rtp, - NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_UDP_WITH_PAYLOAD, - SAVE_DETECTION_BITMASK_AS_UNKNOWN, - ADD_TO_DETECTION_BITMASK); + NDPI_PROTOCOL_RTP, + ndpi_search_rtp, + NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_OR_UDP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION, + SAVE_DETECTION_BITMASK_AS_UNKNOWN, + ADD_TO_DETECTION_BITMASK); *id += 1; } diff --git a/src/lib/protocols/viber.c b/src/lib/protocols/viber.c index 3a1a57792af..00cfae96ab6 100644 --- a/src/lib/protocols/viber.c +++ b/src/lib/protocols/viber.c @@ -70,7 +70,7 @@ static void ndpi_search_viber(struct ndpi_detection_module_struct *ndpi_struct, if((packet->udp != NULL) && (packet->payload_packet_len > 5)) { NDPI_LOG_DBG2(ndpi_struct, "calculating dport over udp\n"); - if((flow->l4.udp.rtp_stage == 0) && (flow->l4.udp.rtcp_stage == 0) /* Avoid collisions with RTP/RTCP */ && + if((flow->rtp_stage == 0) && (flow->rtcp_stage == 0) /* Avoid collisions with RTP/RTCP */ && ((packet->payload[2] == 0x03 && packet->payload[3] == 0x00) || (packet->payload_packet_len == 20 && packet->payload[2] == 0x09 && packet->payload[3] == 0x00) || (packet->payload[2] == 0x01 && packet->payload[3] == 0x00 && packet->payload[4] == 0x05 && packet->payload[5] == 0x00) diff --git a/tests/cfgs/caches_cfg/result/ookla.pcap.out b/tests/cfgs/caches_cfg/result/ookla.pcap.out index 05c6d1eb531..3b6fd645b44 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: 565 (94.17 diss/flow) +Num dissector calls: 568 (94.67 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/3/0 (insert/search/found) LRU cache stun: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/caches_cfg/result/teams.pcap.out b/tests/cfgs/caches_cfg/result/teams.pcap.out index bd0275bd919..6a24e985f48 100644 --- a/tests/cfgs/caches_cfg/result/teams.pcap.out +++ b/tests/cfgs/caches_cfg/result/teams.pcap.out @@ -7,7 +7,7 @@ Confidence Unknown : 1 (flows) Confidence Match by port : 1 (flows) Confidence DPI (partial) : 1 (flows) Confidence DPI : 80 (flows) -Num dissector calls: 511 (6.16 diss/flow) +Num dissector calls: 512 (6.17 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/9/0 (insert/search/found) LRU cache stun: 30/0/0 (insert/search/found) diff --git a/tests/cfgs/caches_global/result/bittorrent.pcap.out b/tests/cfgs/caches_global/result/bittorrent.pcap.out index a867063533c..c768362d66b 100644 --- a/tests/cfgs/caches_global/result/bittorrent.pcap.out +++ b/tests/cfgs/caches_global/result/bittorrent.pcap.out @@ -1,6 +1,6 @@ DPI Packets (TCP): 24 (1.00 pkts/flow) Confidence DPI : 24 (flows) -Num dissector calls: 1718 (71.58 diss/flow) +Num dissector calls: 1740 (72.50 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 120/0/0 (insert/search/found) LRU cache stun: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/caches_global/result/mining.pcapng.out b/tests/cfgs/caches_global/result/mining.pcapng.out index 86fda424360..463dd6574c8 100644 --- a/tests/cfgs/caches_global/result/mining.pcapng.out +++ b/tests/cfgs/caches_global/result/mining.pcapng.out @@ -1,6 +1,6 @@ DPI Packets (TCP): 17 (4.25 pkts/flow) Confidence DPI : 4 (flows) -Num dissector calls: 97 (24.25 diss/flow) +Num dissector calls: 101 (25.25 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache stun: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/caches_global/result/ookla.pcap.out b/tests/cfgs/caches_global/result/ookla.pcap.out index 9296c699503..bdda72697a2 100644 --- a/tests/cfgs/caches_global/result/ookla.pcap.out +++ b/tests/cfgs/caches_global/result/ookla.pcap.out @@ -4,7 +4,7 @@ DPI Packets (TCP): 40 (6.67 pkts/flow) Confidence DPI (partial cache): 1 (flows) Confidence DPI : 4 (flows) Confidence DPI (aggressive) : 1 (flows) -Num dissector calls: 565 (94.17 diss/flow) +Num dissector calls: 568 (94.67 diss/flow) LRU cache ookla: 4/2/2 (insert/search/found) LRU cache bittorrent: 0/3/0 (insert/search/found) LRU cache stun: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/caches_global/result/teams.pcap.out b/tests/cfgs/caches_global/result/teams.pcap.out index 10f95d7a863..7f837b46f33 100644 --- a/tests/cfgs/caches_global/result/teams.pcap.out +++ b/tests/cfgs/caches_global/result/teams.pcap.out @@ -7,7 +7,7 @@ Confidence Unknown : 1 (flows) Confidence Match by port : 1 (flows) Confidence DPI (partial) : 5 (flows) Confidence DPI : 76 (flows) -Num dissector calls: 511 (6.16 diss/flow) +Num dissector calls: 512 (6.17 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/9/0 (insert/search/found) LRU cache stun: 30/0/0 (insert/search/found) diff --git a/tests/cfgs/default/pcap/rtp.pcapng b/tests/cfgs/default/pcap/rtp.pcapng index f3b10e683e25185a82cf3725404aa18eb8f78d04..d1c6c5a129b26e5c03c0ca71f589a82a09d0aa79 100644 GIT binary patch delta 24819 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 Aa{vGU delta 153 zcmccem3hiGCK)bXUM>qp1_oanZ7Cqd@E-~o85S^1lvyCp%plI-lbKgqp0hl$p%H!Vo+;no-KZOhLmvvqYiHM9)CaOran#IXf{uHANw@SOF}eYgm_B tQD9hCnpB!sQfg$NX8;tgD=0`b)C5|{z+f?XDr4|w4<-(;%>k=h`~fIQE*Ag* diff --git a/tests/cfgs/default/result/1kxun.pcap.out b/tests/cfgs/default/result/1kxun.pcap.out index 87eab3c9f55..90192f16480 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: 4934 (25.05 diss/flow) +Num dissector calls: 4937 (25.06 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/60/0 (insert/search/found) LRU cache stun: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/443-chrome.pcap.out b/tests/cfgs/default/result/443-chrome.pcap.out index f7edc3d2563..92534338f6a 100644 --- a/tests/cfgs/default/result/443-chrome.pcap.out +++ b/tests/cfgs/default/result/443-chrome.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 1 DPI Packets (TCP): 1 (1.00 pkts/flow) Confidence Match by port : 1 (flows) -Num dissector calls: 148 (148.00 diss/flow) +Num dissector calls: 149 (149.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/3/0 (insert/search/found) LRU cache stun: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/443-opvn.pcap.out b/tests/cfgs/default/result/443-opvn.pcap.out index b8996ab233a..cdf1ac775d8 100644 --- a/tests/cfgs/default/result/443-opvn.pcap.out +++ b/tests/cfgs/default/result/443-opvn.pcap.out @@ -1,6 +1,6 @@ DPI Packets (TCP): 6 (6.00 pkts/flow) Confidence DPI : 1 (flows) -Num dissector calls: 149 (149.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 stun: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/KakaoTalk_chat.pcap.out b/tests/cfgs/default/result/KakaoTalk_chat.pcap.out index 22fdd93458d..d0b7a4bc376 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: 547 (14.39 diss/flow) +Num dissector calls: 549 (14.45 diss/flow) LRU cache ookla: 0/1/0 (insert/search/found) LRU cache bittorrent: 0/15/0 (insert/search/found) LRU cache stun: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/KakaoTalk_talk.pcap.out b/tests/cfgs/default/result/KakaoTalk_talk.pcap.out index 9a4e30df78e..d799b9b1ace 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: 1203 (60.15 diss/flow) +Num dissector calls: 1207 (60.35 diss/flow) LRU cache ookla: 0/2/0 (insert/search/found) LRU cache bittorrent: 0/27/0 (insert/search/found) LRU cache stun: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/Oscar.pcap.out b/tests/cfgs/default/result/Oscar.pcap.out index cbbcecce73a..66d95331128 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: 254 (254.00 diss/flow) +Num dissector calls: 255 (255.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/3/0 (insert/search/found) LRU cache stun: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/alexa-app.pcapng.out b/tests/cfgs/default/result/alexa-app.pcapng.out index a0d01f764f0..18e705deb74 100644 --- a/tests/cfgs/default/result/alexa-app.pcapng.out +++ b/tests/cfgs/default/result/alexa-app.pcapng.out @@ -5,7 +5,7 @@ DPI Packets (UDP): 64 (1.94 pkts/flow) DPI Packets (other): 6 (1.00 pkts/flow) Confidence Match by port : 14 (flows) Confidence DPI : 146 (flows) -Num dissector calls: 562 (3.51 diss/flow) +Num dissector calls: 563 (3.52 diss/flow) LRU cache ookla: 0/5/0 (insert/search/found) LRU cache bittorrent: 0/42/0 (insert/search/found) LRU cache stun: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/alicloud.pcap.out b/tests/cfgs/default/result/alicloud.pcap.out index 6ceb3d3d659..0067fab108d 100644 --- a/tests/cfgs/default/result/alicloud.pcap.out +++ b/tests/cfgs/default/result/alicloud.pcap.out @@ -1,6 +1,6 @@ DPI Packets (TCP): 60 (4.00 pkts/flow) Confidence DPI : 15 (flows) -Num dissector calls: 1560 (104.00 diss/flow) +Num dissector calls: 1575 (105.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache stun: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/amqp.pcap.out b/tests/cfgs/default/result/amqp.pcap.out index 56b734d547e..21cc11a4046 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: 374 (124.67 diss/flow) +Num dissector calls: 377 (125.67 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache stun: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/anyconnect-vpn.pcap.out b/tests/cfgs/default/result/anyconnect-vpn.pcap.out index 9a4617459df..d3b16c6ab3f 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: 808 (11.71 diss/flow) +Num dissector calls: 809 (11.72 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/24/0 (insert/search/found) LRU cache stun: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/avast.pcap.out b/tests/cfgs/default/result/avast.pcap.out index 0e53c7d7493..1e4dbb64a6f 100644 --- a/tests/cfgs/default/result/avast.pcap.out +++ b/tests/cfgs/default/result/avast.pcap.out @@ -1,6 +1,6 @@ DPI Packets (TCP): 40 (4.00 pkts/flow) Confidence DPI : 10 (flows) -Num dissector calls: 1050 (105.00 diss/flow) +Num dissector calls: 1060 (106.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache stun: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/bfcp.pcapng.out b/tests/cfgs/default/result/bfcp.pcapng.out index b180947faa9..590c6e5bd05 100644 --- a/tests/cfgs/default/result/bfcp.pcapng.out +++ b/tests/cfgs/default/result/bfcp.pcapng.out @@ -1,7 +1,7 @@ DPI Packets (TCP): 6 (6.00 pkts/flow) DPI Packets (UDP): 2 (2.00 pkts/flow) Confidence DPI : 2 (flows) -Num dissector calls: 326 (163.00 diss/flow) +Num dissector calls: 327 (163.50 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache stun: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/bittorrent.pcap.out b/tests/cfgs/default/result/bittorrent.pcap.out index a867063533c..c768362d66b 100644 --- a/tests/cfgs/default/result/bittorrent.pcap.out +++ b/tests/cfgs/default/result/bittorrent.pcap.out @@ -1,6 +1,6 @@ DPI Packets (TCP): 24 (1.00 pkts/flow) Confidence DPI : 24 (flows) -Num dissector calls: 1718 (71.58 diss/flow) +Num dissector calls: 1740 (72.50 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 120/0/0 (insert/search/found) LRU cache stun: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/bittorrent_tcp_miss.pcapng.out b/tests/cfgs/default/result/bittorrent_tcp_miss.pcapng.out index 3f889ff33cc..368cf49965c 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 (cache) : 1 (flows) -Num dissector calls: 238 (238.00 diss/flow) +Num dissector calls: 239 (239.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 10/1/1 (insert/search/found) LRU cache stun: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/cassandra.pcap.out b/tests/cfgs/default/result/cassandra.pcap.out index 4dc0d68450c..5d24a13c97a 100644 --- a/tests/cfgs/default/result/cassandra.pcap.out +++ b/tests/cfgs/default/result/cassandra.pcap.out @@ -1,6 +1,6 @@ DPI Packets (TCP): 16 (5.33 pkts/flow) Confidence DPI : 3 (flows) -Num dissector calls: 299 (99.67 diss/flow) +Num dissector calls: 301 (100.33 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache stun: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/cloudflare-warp.pcap.out b/tests/cfgs/default/result/cloudflare-warp.pcap.out index 73ebef608b4..f5943fcdfc5 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: 202 (25.25 diss/flow) +Num dissector calls: 203 (25.38 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/9/0 (insert/search/found) LRU cache stun: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/coap_mqtt.pcap.out b/tests/cfgs/default/result/coap_mqtt.pcap.out index 095c7a023a6..afba05ba411 100644 --- a/tests/cfgs/default/result/coap_mqtt.pcap.out +++ b/tests/cfgs/default/result/coap_mqtt.pcap.out @@ -1,7 +1,7 @@ DPI Packets (TCP): 7 (1.75 pkts/flow) DPI Packets (UDP): 12 (1.00 pkts/flow) Confidence DPI : 16 (flows) -Num dissector calls: 284 (17.75 diss/flow) +Num dissector calls: 288 (18.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache stun: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/codm.pcap.out b/tests/cfgs/default/result/codm.pcap.out index 2c216e0fb26..55d903de9e0 100644 --- a/tests/cfgs/default/result/codm.pcap.out +++ b/tests/cfgs/default/result/codm.pcap.out @@ -1,7 +1,7 @@ DPI Packets (TCP): 7 (7.00 pkts/flow) DPI Packets (UDP): 5 (2.50 pkts/flow) Confidence DPI : 3 (flows) -Num dissector calls: 466 (155.33 diss/flow) +Num dissector calls: 467 (155.67 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache stun: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/corba.pcap.out b/tests/cfgs/default/result/corba.pcap.out index db1b01b544d..9c6bda2af60 100644 --- a/tests/cfgs/default/result/corba.pcap.out +++ b/tests/cfgs/default/result/corba.pcap.out @@ -1,7 +1,7 @@ DPI Packets (TCP): 4 (4.00 pkts/flow) DPI Packets (UDP): 1 (1.00 pkts/flow) Confidence DPI : 2 (flows) -Num dissector calls: 110 (55.00 diss/flow) +Num dissector calls: 111 (55.50 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache stun: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/custom_categories.pcapng.out b/tests/cfgs/default/result/custom_categories.pcapng.out index 6e0eea7556a..6b1a56f0837 100644 --- a/tests/cfgs/default/result/custom_categories.pcapng.out +++ b/tests/cfgs/default/result/custom_categories.pcapng.out @@ -1,7 +1,7 @@ DPI Packets (TCP): 26 (13.00 pkts/flow) DPI Packets (other): 1 (1.00 pkts/flow) Confidence DPI : 3 (flows) -Num dissector calls: 22 (7.33 diss/flow) +Num dissector calls: 23 (7.67 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache stun: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/dlms.pcap.out b/tests/cfgs/default/result/dlms.pcap.out index 309e5b553df..8353a4d7897 100644 --- a/tests/cfgs/default/result/dlms.pcap.out +++ b/tests/cfgs/default/result/dlms.pcap.out @@ -1,7 +1,7 @@ DPI Packets (TCP): 4 (4.00 pkts/flow) DPI Packets (UDP): 1 (1.00 pkts/flow) Confidence DPI : 2 (flows) -Num dissector calls: 252 (126.00 diss/flow) +Num dissector calls: 253 (126.50 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/3/0 (insert/search/found) LRU cache stun: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/drda_db2.pcap.out b/tests/cfgs/default/result/drda_db2.pcap.out index e19adbc9063..8f82adcb409 100644 --- a/tests/cfgs/default/result/drda_db2.pcap.out +++ b/tests/cfgs/default/result/drda_db2.pcap.out @@ -1,6 +1,6 @@ DPI Packets (TCP): 4 (4.00 pkts/flow) Confidence DPI : 1 (flows) -Num dissector calls: 71 (71.00 diss/flow) +Num dissector calls: 72 (72.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache stun: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/edonkey.pcap.out b/tests/cfgs/default/result/edonkey.pcap.out index 488bbd45002..2ebb3673604 100644 --- a/tests/cfgs/default/result/edonkey.pcap.out +++ b/tests/cfgs/default/result/edonkey.pcap.out @@ -1,6 +1,6 @@ DPI Packets (TCP): 4 (4.00 pkts/flow) Confidence DPI : 1 (flows) -Num dissector calls: 8 (8.00 diss/flow) +Num dissector calls: 9 (9.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache stun: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/elasticsearch.pcap.out b/tests/cfgs/default/result/elasticsearch.pcap.out index 4af2c8b8852..12b5ef098ef 100644 --- a/tests/cfgs/default/result/elasticsearch.pcap.out +++ b/tests/cfgs/default/result/elasticsearch.pcap.out @@ -1,6 +1,6 @@ DPI Packets (TCP): 16 (2.29 pkts/flow) Confidence DPI : 7 (flows) -Num dissector calls: 770 (110.00 diss/flow) +Num dissector calls: 777 (111.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache stun: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/elf.pcap.out b/tests/cfgs/default/result/elf.pcap.out index de80db3834f..6263a9e40b9 100644 --- a/tests/cfgs/default/result/elf.pcap.out +++ b/tests/cfgs/default/result/elf.pcap.out @@ -1,7 +1,7 @@ DPI Packets (TCP): 10 (10.00 pkts/flow) DPI Packets (UDP): 2 (2.00 pkts/flow) Confidence Unknown : 2 (flows) -Num dissector calls: 329 (164.50 diss/flow) +Num dissector calls: 330 (165.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/6/0 (insert/search/found) LRU cache stun: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/emotet.pcap.out b/tests/cfgs/default/result/emotet.pcap.out index c92a330ea08..a30e6bcf9cc 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: 220 (36.67 diss/flow) +Num dissector calls: 221 (36.83 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache stun: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/fastcgi.pcap.out b/tests/cfgs/default/result/fastcgi.pcap.out index 3975489e219..a543581a4be 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: 170 (170.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 stun: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/fix.pcap.out b/tests/cfgs/default/result/fix.pcap.out index 72383e4e38d..0a0cb0763d3 100644 --- a/tests/cfgs/default/result/fix.pcap.out +++ b/tests/cfgs/default/result/fix.pcap.out @@ -1,6 +1,6 @@ DPI Packets (TCP): 12 (1.00 pkts/flow) Confidence DPI : 12 (flows) -Num dissector calls: 900 (75.00 diss/flow) +Num dissector calls: 912 (76.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache stun: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/fix2.pcap.out b/tests/cfgs/default/result/fix2.pcap.out index 7c333f0575a..8912e17acd8 100644 --- a/tests/cfgs/default/result/fix2.pcap.out +++ b/tests/cfgs/default/result/fix2.pcap.out @@ -1,6 +1,6 @@ DPI Packets (TCP): 8 (4.00 pkts/flow) Confidence DPI : 2 (flows) -Num dissector calls: 148 (74.00 diss/flow) +Num dissector calls: 150 (75.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache stun: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/ftp-start-tls.pcap.out b/tests/cfgs/default/result/ftp-start-tls.pcap.out index a2b01216409..e0c2e36ee1a 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: 173 (173.00 diss/flow) +Num dissector calls: 174 (174.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache stun: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/ftp.pcap.out b/tests/cfgs/default/result/ftp.pcap.out index 1ba722d045d..756cce4aaef 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: 517 (172.33 diss/flow) +Num dissector calls: 520 (173.33 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/3/0 (insert/search/found) LRU cache stun: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/ftp_failed.pcap.out b/tests/cfgs/default/result/ftp_failed.pcap.out index 0f8da098191..1d186704e35 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: 172 (172.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 stun: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/fuzz-2006-06-26-2594.pcap.out b/tests/cfgs/default/result/fuzz-2006-06-26-2594.pcap.out index 592b91d17ea..b158eca6ce4 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 : 28 (flows) Confidence DPI : 189 (flows) -Num dissector calls: 7595 (30.26 diss/flow) +Num dissector calls: 7608 (30.31 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/192/0 (insert/search/found) LRU cache stun: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/fuzz-2006-09-29-28586.pcap.out b/tests/cfgs/default/result/fuzz-2006-09-29-28586.pcap.out index a19baee86bc..554c8a8609b 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: 1129 (28.23 diss/flow) +Num dissector calls: 1135 (28.38 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/87/0 (insert/search/found) LRU cache stun: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/fuzz-2021-10-13.pcap.out b/tests/cfgs/default/result/fuzz-2021-10-13.pcap.out index 3d5a44ef540..bcb4a1e1682 100644 --- a/tests/cfgs/default/result/fuzz-2021-10-13.pcap.out +++ b/tests/cfgs/default/result/fuzz-2021-10-13.pcap.out @@ -1,6 +1,6 @@ DPI Packets (TCP): 1 (1.00 pkts/flow) Confidence Unknown : 1 (flows) -Num dissector calls: 147 (147.00 diss/flow) +Num dissector calls: 148 (148.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/3/0 (insert/search/found) LRU cache stun: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/gaijin_mobile_mixed.pcap.out b/tests/cfgs/default/result/gaijin_mobile_mixed.pcap.out index 9e87d3d1c2c..1eb8edd2afd 100644 --- a/tests/cfgs/default/result/gaijin_mobile_mixed.pcap.out +++ b/tests/cfgs/default/result/gaijin_mobile_mixed.pcap.out @@ -1,7 +1,7 @@ DPI Packets (TCP): 13 (6.50 pkts/flow) DPI Packets (UDP): 1 (1.00 pkts/flow) Confidence DPI : 3 (flows) -Num dissector calls: 151 (50.33 diss/flow) +Num dissector calls: 152 (50.67 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache stun: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/genshin-impact.pcap.out b/tests/cfgs/default/result/genshin-impact.pcap.out index 4eb7b91f3b8..44bed7daf53 100644 --- a/tests/cfgs/default/result/genshin-impact.pcap.out +++ b/tests/cfgs/default/result/genshin-impact.pcap.out @@ -1,7 +1,7 @@ DPI Packets (TCP): 12 (4.00 pkts/flow) DPI Packets (UDP): 3 (1.00 pkts/flow) Confidence DPI : 6 (flows) -Num dissector calls: 440 (73.33 diss/flow) +Num dissector calls: 443 (73.83 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache stun: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/gnutella.pcap.out b/tests/cfgs/default/result/gnutella.pcap.out index de6e86719ec..6d4e936fe4c 100644 --- a/tests/cfgs/default/result/gnutella.pcap.out +++ b/tests/cfgs/default/result/gnutella.pcap.out @@ -6,7 +6,7 @@ DPI Packets (other): 10 (1.00 pkts/flow) Confidence Unknown : 389 (flows) Confidence Match by port : 1 (flows) Confidence DPI : 370 (flows) -Num dissector calls: 50340 (66.24 diss/flow) +Num dissector calls: 50392 (66.31 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/1170/0 (insert/search/found) LRU cache stun: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/google_ssl.pcap.out b/tests/cfgs/default/result/google_ssl.pcap.out index 13ff7e3ec75..2b2e0f9b982 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: 200 (200.00 diss/flow) +Num dissector calls: 201 (201.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/3/0 (insert/search/found) LRU cache stun: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/h323.pcap.out b/tests/cfgs/default/result/h323.pcap.out index 1e5d768ed89..5d6b94b1cb7 100644 --- a/tests/cfgs/default/result/h323.pcap.out +++ b/tests/cfgs/default/result/h323.pcap.out @@ -1,7 +1,7 @@ DPI Packets (TCP): 15 (3.75 pkts/flow) DPI Packets (UDP): 2 (1.00 pkts/flow) Confidence DPI : 6 (flows) -Num dissector calls: 57 (9.50 diss/flow) +Num dissector calls: 58 (9.67 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache stun: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/haproxy.pcap.out b/tests/cfgs/default/result/haproxy.pcap.out index 07415f69b40..7cea86109a7 100644 --- a/tests/cfgs/default/result/haproxy.pcap.out +++ b/tests/cfgs/default/result/haproxy.pcap.out @@ -1,6 +1,6 @@ DPI Packets (TCP): 1 (1.00 pkts/flow) Confidence DPI : 1 (flows) -Num dissector calls: 116 (116.00 diss/flow) +Num dissector calls: 117 (117.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache stun: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/hl7.pcap.out b/tests/cfgs/default/result/hl7.pcap.out index 5a54bd6ef69..a7e5a35d19f 100644 --- a/tests/cfgs/default/result/hl7.pcap.out +++ b/tests/cfgs/default/result/hl7.pcap.out @@ -1,6 +1,6 @@ DPI Packets (TCP): 4 (4.00 pkts/flow) Confidence DPI : 1 (flows) -Num dissector calls: 133 (133.00 diss/flow) +Num dissector calls: 134 (134.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache stun: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/hpvirtgrp.pcap.out b/tests/cfgs/default/result/hpvirtgrp.pcap.out index f90a41c65d8..34d7dd7df76 100644 --- a/tests/cfgs/default/result/hpvirtgrp.pcap.out +++ b/tests/cfgs/default/result/hpvirtgrp.pcap.out @@ -1,6 +1,6 @@ DPI Packets (TCP): 37 (4.11 pkts/flow) Confidence DPI : 9 (flows) -Num dissector calls: 846 (94.00 diss/flow) +Num dissector calls: 855 (95.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache stun: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/http2.pcapng.out b/tests/cfgs/default/result/http2.pcapng.out index 5efc7992f33..3d9f05794ef 100644 --- a/tests/cfgs/default/result/http2.pcapng.out +++ b/tests/cfgs/default/result/http2.pcapng.out @@ -1,6 +1,6 @@ DPI Packets (TCP): 1 (1.00 pkts/flow) Confidence DPI : 1 (flows) -Num dissector calls: 115 (115.00 diss/flow) +Num dissector calls: 116 (116.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache stun: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/http_guessed_host_and_guessed.pcapng.out b/tests/cfgs/default/result/http_guessed_host_and_guessed.pcapng.out index 86371bb2665..21c0174d677 100644 --- a/tests/cfgs/default/result/http_guessed_host_and_guessed.pcapng.out +++ b/tests/cfgs/default/result/http_guessed_host_and_guessed.pcapng.out @@ -2,7 +2,7 @@ Guessed flow protos: 1 DPI Packets (TCP): 1 (1.00 pkts/flow) Confidence Match by port : 1 (flows) -Num dissector calls: 148 (148.00 diss/flow) +Num dissector calls: 149 (149.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/3/0 (insert/search/found) LRU cache stun: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/imap-starttls.pcap.out b/tests/cfgs/default/result/imap-starttls.pcap.out index 97695b3e02b..cc3c7cd11c4 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: 219 (219.00 diss/flow) +Num dissector calls: 220 (220.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache stun: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/imap.pcap.out b/tests/cfgs/default/result/imap.pcap.out index 989dba47131..d3092c87082 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: 219 (219.00 diss/flow) +Num dissector calls: 220 (220.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache stun: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/instagram.pcap.out b/tests/cfgs/default/result/instagram.pcap.out index 0b091dbe831..1ed9b8312a3 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: 1319 (34.71 diss/flow) +Num dissector calls: 1323 (34.82 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/24/0 (insert/search/found) LRU cache stun: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/irc.pcap.out b/tests/cfgs/default/result/irc.pcap.out index d70bd89ed53..77711360f4d 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: 178 (178.00 diss/flow) +Num dissector calls: 179 (179.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache stun: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/iso9506-1-mms.pcap.out b/tests/cfgs/default/result/iso9506-1-mms.pcap.out index 0c0ea89002c..0afadbce5a0 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: 192 (192.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache stun: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/jabber.pcap.out b/tests/cfgs/default/result/jabber.pcap.out index 23de684a24e..5ef5a981d48 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: 1624 (135.33 diss/flow) +Num dissector calls: 1636 (136.33 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache stun: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/jsonrpc.pcap.out b/tests/cfgs/default/result/jsonrpc.pcap.out index f404f2621f1..3662d6050c5 100644 --- a/tests/cfgs/default/result/jsonrpc.pcap.out +++ b/tests/cfgs/default/result/jsonrpc.pcap.out @@ -1,6 +1,6 @@ DPI Packets (TCP): 10 (5.00 pkts/flow) Confidence DPI : 2 (flows) -Num dissector calls: 149 (74.50 diss/flow) +Num dissector calls: 150 (75.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache stun: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/kafka.pcapng.out b/tests/cfgs/default/result/kafka.pcapng.out index 69b355e6598..47bdc80f339 100644 --- a/tests/cfgs/default/result/kafka.pcapng.out +++ b/tests/cfgs/default/result/kafka.pcapng.out @@ -3,7 +3,7 @@ Guessed flow protos: 1 DPI Packets (TCP): 16 (1.78 pkts/flow) Confidence Match by port : 1 (flows) Confidence DPI : 8 (flows) -Num dissector calls: 221 (24.56 diss/flow) +Num dissector calls: 222 (24.67 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/3/0 (insert/search/found) LRU cache stun: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/kerberos.pcap.out b/tests/cfgs/default/result/kerberos.pcap.out index 88a5d787693..907347679b4 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: 4401 (122.25 diss/flow) +Num dissector calls: 4426 (122.94 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/75/0 (insert/search/found) LRU cache stun: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/kismet.pcap.out b/tests/cfgs/default/result/kismet.pcap.out index 9bfa9196fb0..0611f6db473 100644 --- a/tests/cfgs/default/result/kismet.pcap.out +++ b/tests/cfgs/default/result/kismet.pcap.out @@ -1,6 +1,6 @@ DPI Packets (TCP): 4 (4.00 pkts/flow) Confidence DPI : 1 (flows) -Num dissector calls: 107 (107.00 diss/flow) +Num dissector calls: 108 (108.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache stun: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/lisp_registration.pcap.out b/tests/cfgs/default/result/lisp_registration.pcap.out index 3a066f75628..601012a065b 100644 --- a/tests/cfgs/default/result/lisp_registration.pcap.out +++ b/tests/cfgs/default/result/lisp_registration.pcap.out @@ -1,7 +1,7 @@ DPI Packets (TCP): 8 (4.00 pkts/flow) DPI Packets (UDP): 2 (1.00 pkts/flow) Confidence DPI : 4 (flows) -Num dissector calls: 166 (41.50 diss/flow) +Num dissector calls: 168 (42.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache stun: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/log4j-webapp-exploit.pcap.out b/tests/cfgs/default/result/log4j-webapp-exploit.pcap.out index a659b1f06c2..5f896a0bc47 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: 351 (50.14 diss/flow) +Num dissector calls: 354 (50.57 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/6/0 (insert/search/found) LRU cache stun: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/memcached.cap.out b/tests/cfgs/default/result/memcached.cap.out index ca4bee072a0..9c9b5e94fa5 100644 --- a/tests/cfgs/default/result/memcached.cap.out +++ b/tests/cfgs/default/result/memcached.cap.out @@ -1,6 +1,6 @@ DPI Packets (TCP): 6 (6.00 pkts/flow) Confidence DPI : 1 (flows) -Num dissector calls: 149 (149.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 stun: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/mining.pcapng.out b/tests/cfgs/default/result/mining.pcapng.out index 86fda424360..463dd6574c8 100644 --- a/tests/cfgs/default/result/mining.pcapng.out +++ b/tests/cfgs/default/result/mining.pcapng.out @@ -1,6 +1,6 @@ DPI Packets (TCP): 17 (4.25 pkts/flow) Confidence DPI : 4 (flows) -Num dissector calls: 97 (24.25 diss/flow) +Num dissector calls: 101 (25.25 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache stun: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/monero.pcap.out b/tests/cfgs/default/result/monero.pcap.out index 4e309d0c4d1..94e95c6fb8f 100644 --- a/tests/cfgs/default/result/monero.pcap.out +++ b/tests/cfgs/default/result/monero.pcap.out @@ -1,6 +1,6 @@ DPI Packets (TCP): 16 (4.00 pkts/flow) Confidence DPI : 4 (flows) -Num dissector calls: 504 (126.00 diss/flow) +Num dissector calls: 508 (127.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache stun: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/mongo_false_positive.pcapng.out b/tests/cfgs/default/result/mongo_false_positive.pcapng.out index 6785319c199..2730d48cc7a 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: 266 (266.00 diss/flow) +Num dissector calls: 267 (267.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/3/0 (insert/search/found) LRU cache stun: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/mongodb.pcap.out b/tests/cfgs/default/result/mongodb.pcap.out index 897b26fc280..3ea89439ed8 100644 --- a/tests/cfgs/default/result/mongodb.pcap.out +++ b/tests/cfgs/default/result/mongodb.pcap.out @@ -4,7 +4,7 @@ DPI Packets (TCP): 27 (3.38 pkts/flow) Confidence Unknown : 1 (flows) Confidence Match by port : 2 (flows) Confidence DPI : 5 (flows) -Num dissector calls: 97 (12.12 diss/flow) +Num dissector calls: 98 (12.25 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/9/0 (insert/search/found) LRU cache stun: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/mssql_tds.pcap.out b/tests/cfgs/default/result/mssql_tds.pcap.out index d68baee2892..ccda0f3cd70 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: 265 (22.08 diss/flow) +Num dissector calls: 266 (22.17 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/3/0 (insert/search/found) LRU cache stun: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/nats.pcap.out b/tests/cfgs/default/result/nats.pcap.out index fa54e54d675..17e56125280 100644 --- a/tests/cfgs/default/result/nats.pcap.out +++ b/tests/cfgs/default/result/nats.pcap.out @@ -1,6 +1,6 @@ DPI Packets (TCP): 10 (5.00 pkts/flow) Confidence DPI : 2 (flows) -Num dissector calls: 20 (10.00 diss/flow) +Num dissector calls: 22 (11.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache stun: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/nest_log_sink.pcap.out b/tests/cfgs/default/result/nest_log_sink.pcap.out index 039c7ed885d..499ec272f3c 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: 2089 (149.21 diss/flow) +Num dissector calls: 2101 (150.07 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/3/0 (insert/search/found) LRU cache stun: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/netbios.pcap.out b/tests/cfgs/default/result/netbios.pcap.out index f835aabdf8d..b560e95d803 100644 --- a/tests/cfgs/default/result/netbios.pcap.out +++ b/tests/cfgs/default/result/netbios.pcap.out @@ -4,7 +4,7 @@ DPI Packets (TCP): 2 (2.00 pkts/flow) DPI Packets (UDP): 14 (1.00 pkts/flow) Confidence Match by port : 1 (flows) Confidence DPI : 14 (flows) -Num dissector calls: 162 (10.80 diss/flow) +Num dissector calls: 163 (10.87 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/3/0 (insert/search/found) LRU cache stun: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/nntp.pcap.out b/tests/cfgs/default/result/nntp.pcap.out index 6baa84368e7..42e8161ad7e 100644 --- a/tests/cfgs/default/result/nntp.pcap.out +++ b/tests/cfgs/default/result/nntp.pcap.out @@ -1,6 +1,6 @@ DPI Packets (TCP): 6 (6.00 pkts/flow) Confidence DPI : 1 (flows) -Num dissector calls: 156 (156.00 diss/flow) +Num dissector calls: 157 (157.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache stun: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/ookla.pcap.out b/tests/cfgs/default/result/ookla.pcap.out index 9296c699503..bdda72697a2 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: 565 (94.17 diss/flow) +Num dissector calls: 568 (94.67 diss/flow) LRU cache ookla: 4/2/2 (insert/search/found) LRU cache bittorrent: 0/3/0 (insert/search/found) LRU cache stun: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/openvpn.pcap.out b/tests/cfgs/default/result/openvpn.pcap.out index 7ee63d2cd46..24ded8f5152 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: 1338 (167.25 diss/flow) +Num dissector calls: 1345 (168.12 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/6/0 (insert/search/found) LRU cache stun: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/openvpn_nohmac_tcp.pcapng.out b/tests/cfgs/default/result/openvpn_nohmac_tcp.pcapng.out index b56d221c350..e5bd17d88af 100644 --- a/tests/cfgs/default/result/openvpn_nohmac_tcp.pcapng.out +++ b/tests/cfgs/default/result/openvpn_nohmac_tcp.pcapng.out @@ -1,6 +1,6 @@ DPI Packets (TCP): 6 (6.00 pkts/flow) Confidence DPI : 1 (flows) -Num dissector calls: 149 (149.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 stun: 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 0e35ca4964f..af573ce1211 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: 244 (244.00 diss/flow) +Num dissector calls: 245 (245.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/3/0 (insert/search/found) LRU cache stun: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/ossfuzz_seed_fake_traces_1.pcapng.out b/tests/cfgs/default/result/ossfuzz_seed_fake_traces_1.pcapng.out index a428bbd4d27..5f80f6dfdfa 100644 --- a/tests/cfgs/default/result/ossfuzz_seed_fake_traces_1.pcapng.out +++ b/tests/cfgs/default/result/ossfuzz_seed_fake_traces_1.pcapng.out @@ -2,7 +2,7 @@ DPI Packets (TCP): 8 (1.33 pkts/flow) DPI Packets (UDP): 9 (2.25 pkts/flow) Confidence Unknown : 2 (flows) Confidence DPI : 8 (flows) -Num dissector calls: 938 (93.80 diss/flow) +Num dissector calls: 940 (94.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/9/0 (insert/search/found) LRU cache stun: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/ossfuzz_seed_fake_traces_2.pcapng.out b/tests/cfgs/default/result/ossfuzz_seed_fake_traces_2.pcapng.out index 3cf2e250725..5139086e7cd 100644 --- a/tests/cfgs/default/result/ossfuzz_seed_fake_traces_2.pcapng.out +++ b/tests/cfgs/default/result/ossfuzz_seed_fake_traces_2.pcapng.out @@ -4,7 +4,7 @@ DPI Packets (TCP): 38 (6.33 pkts/flow) DPI Packets (UDP): 4 (2.00 pkts/flow) Confidence Match by port : 1 (flows) Confidence DPI : 7 (flows) -Num dissector calls: 1007 (125.88 diss/flow) +Num dissector calls: 1013 (126.62 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/3/0 (insert/search/found) LRU cache stun: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/path_of_exile.pcapng.out b/tests/cfgs/default/result/path_of_exile.pcapng.out index 534d92b13ef..5c8965e9a91 100644 --- a/tests/cfgs/default/result/path_of_exile.pcapng.out +++ b/tests/cfgs/default/result/path_of_exile.pcapng.out @@ -1,6 +1,6 @@ DPI Packets (TCP): 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 stun: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/pgsql.pcap.out b/tests/cfgs/default/result/pgsql.pcap.out index 538f8a4d217..ae062af7312 100644 --- a/tests/cfgs/default/result/pgsql.pcap.out +++ b/tests/cfgs/default/result/pgsql.pcap.out @@ -1,6 +1,6 @@ DPI Packets (TCP): 36 (6.00 pkts/flow) Confidence DPI : 6 (flows) -Num dissector calls: 894 (149.00 diss/flow) +Num dissector calls: 900 (150.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache stun: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/pop3.pcap.out b/tests/cfgs/default/result/pop3.pcap.out index 8f59403e3bd..b0472cc43c2 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: 1245 (207.50 diss/flow) +Num dissector calls: 1251 (208.50 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache stun: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/pop3_stls.pcap.out b/tests/cfgs/default/result/pop3_stls.pcap.out index 2b4e3dfc666..6287703f266 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: 207 (207.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache stun: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/portable_executable.pcap.out b/tests/cfgs/default/result/portable_executable.pcap.out index eab1a11b3aa..9b9d27891d8 100644 --- a/tests/cfgs/default/result/portable_executable.pcap.out +++ b/tests/cfgs/default/result/portable_executable.pcap.out @@ -3,7 +3,7 @@ Guessed flow protos: 1 DPI Packets (TCP): 30 (15.00 pkts/flow) Confidence Unknown : 1 (flows) Confidence Match by port : 1 (flows) -Num dissector calls: 471 (235.50 diss/flow) +Num dissector calls: 473 (236.50 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/6/0 (insert/search/found) LRU cache stun: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/pptp.pcap.out b/tests/cfgs/default/result/pptp.pcap.out index 32c08080408..9d886bd0784 100644 --- a/tests/cfgs/default/result/pptp.pcap.out +++ b/tests/cfgs/default/result/pptp.pcap.out @@ -1,6 +1,6 @@ DPI Packets (TCP): 4 (4.00 pkts/flow) Confidence DPI : 1 (flows) -Num dissector calls: 40 (40.00 diss/flow) +Num dissector calls: 41 (41.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache stun: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/protobuf.pcap.out b/tests/cfgs/default/result/protobuf.pcap.out index 86eff328deb..3566c136d29 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: 691 (138.20 diss/flow) +Num dissector calls: 696 (139.20 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache stun: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/radmin3.pcapng.out b/tests/cfgs/default/result/radmin3.pcapng.out index 9bf5055082a..3d0c03418d8 100644 --- a/tests/cfgs/default/result/radmin3.pcapng.out +++ b/tests/cfgs/default/result/radmin3.pcapng.out @@ -1,6 +1,6 @@ DPI Packets (TCP): 12 (6.00 pkts/flow) Confidence DPI : 2 (flows) -Num dissector calls: 298 (149.00 diss/flow) +Num dissector calls: 300 (150.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache stun: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/raft.pcap.out b/tests/cfgs/default/result/raft.pcap.out index 9d5b2d8edc2..ada326ca38d 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: 344 (172.00 diss/flow) +Num dissector calls: 346 (173.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache stun: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/reasm_crash_anon.pcapng.out b/tests/cfgs/default/result/reasm_crash_anon.pcapng.out index c45f1781a11..5a6edd66f5d 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: 242 (242.00 diss/flow) +Num dissector calls: 243 (243.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/3/0 (insert/search/found) LRU cache stun: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/reasm_segv_anon.pcapng.out b/tests/cfgs/default/result/reasm_segv_anon.pcapng.out index 4578bc54d7e..50c358d50c4 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: 199 (199.00 diss/flow) +Num dissector calls: 200 (200.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/3/0 (insert/search/found) LRU cache stun: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/riot.pcapng.out b/tests/cfgs/default/result/riot.pcapng.out index fdb6468bdc1..13f72476d64 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: 198 (99.00 diss/flow) +Num dissector calls: 199 (99.50 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/3/0 (insert/search/found) LRU cache stun: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/rsh.pcap.out b/tests/cfgs/default/result/rsh.pcap.out index af05def8f4b..5c29d1715cb 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: 336 (168.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 stun: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/rtmp.pcap.out b/tests/cfgs/default/result/rtmp.pcap.out index 18b13f29d66..437c4735287 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: 174 (174.00 diss/flow) +Num dissector calls: 175 (175.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache stun: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/rtp.pcapng.out b/tests/cfgs/default/result/rtp.pcapng.out index b30b0b5d82b..eb3c31a1159 100644 --- a/tests/cfgs/default/result/rtp.pcapng.out +++ b/tests/cfgs/default/result/rtp.pcapng.out @@ -1,6 +1,7 @@ +DPI Packets (TCP): 8 (8.00 pkts/flow) DPI Packets (UDP): 9 (3.00 pkts/flow) -Confidence DPI : 3 (flows) -Num dissector calls: 479 (159.67 diss/flow) +Confidence DPI : 4 (flows) +Num dissector calls: 654 (163.50 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache stun: 0/0/0 (insert/search/found) @@ -17,15 +18,16 @@ Patricia risk mask: 4/0 (search/found) Patricia risk mask IPv6: 0/0 (search/found) Patricia risk: 1/0 (search/found) Patricia risk IPv6: 0/0 (search/found) -Patricia protocols: 6/0 (search/found) +Patricia protocols: 8/0 (search/found) Patricia protocols IPv6: 0/0 (search/found) Discord 30 16092 1 -RTP 45 20619 2 +RTP 82 43715 3 -Acceptable 45 20619 2 +Acceptable 82 43715 3 Fun 30 16092 1 - 1 UDP 10.204.220.71:6000 -> 10.204.220.171:6000 [proto: 87/RTP][IP: 0/Unknown][Stream Content: Video][ClearText][Confidence: DPI][DPI packets: 3][cat: Media/1][15 pkts/18438 bytes -> 0 pkts/0 bytes][Goodput ratio: 97/0][0.34 sec][bytes ratio: 1.000 (Upload)][IAT c2s/s2c min/avg/max/stddev: 1/0 25/0 77/0 31/0][Pkt Len c2s/s2c min/avg/max/stddev: 66/0 1229/0 1486/0 467/0][Plen Bins: 6,0,0,6,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,6,0,0,6,0,0,0,0,0,0,0,0,0,6,0,0,0,68,0,0] - 2 UDP 150.219.118.19:54234 <-> 192.113.193.227:50003 [proto: 58/Discord][IP: 0/Unknown][Encrypted][Confidence: DPI][DPI packets: 2][cat: Collaborative/15][11 pkts/1455 bytes <-> 19 pkts/14637 bytes][Goodput ratio: 68/95][0.14 sec][Client IP: 85.154.2.145][bytes ratio: -0.819 (Download)][IAT c2s/s2c min/avg/max/stddev: 0/0 13/6 36/29 11/11][Pkt Len c2s/s2c min/avg/max/stddev: 85/116 132/770 207/1146 54/475][PLAIN TEXT (85.154.2.145)][Plen Bins: 0,20,6,20,3,10,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,26,13,0,0,0,0,0,0,0,0,0,0,0,0,0] - 3 UDP 10.140.67.167:55402 -> 148.153.85.97:6008 [VLAN: 1508][proto: 87/RTP][IP: 0/Unknown][Stream Content: Audio][ClearText][Confidence: DPI][DPI packets: 4][cat: Media/1][30 pkts/2181 bytes -> 0 pkts/0 bytes][Goodput ratio: 37/0][0.82 sec][bytes ratio: 1.000 (Upload)][IAT c2s/s2c min/avg/max/stddev: 0/0 29/0 118/0 35/0][Pkt Len c2s/s2c min/avg/max/stddev: 62/0 73/0 106/0 12/0][Plen Bins: 80,20,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] + 1 TCP 172.16.168.24:40252 <-> 172.16.168.64:5000 [proto: 87/RTP][IP: 0/Unknown][Stream Content: Audio][ClearText][Confidence: DPI][DPI packets: 8][cat: Media/1][19 pkts/21900 bytes <-> 18 pkts/1196 bytes][Goodput ratio: 94/0][85.30 sec][bytes ratio: 0.896 (Upload)][IAT c2s/s2c min/avg/max/stddev: 93/93 5654/6060 82923/82923 20651/21318][Pkt Len c2s/s2c min/avg/max/stddev: 66/66 1153/66 1280/74 371/2][Risk: ** Probing attempt **][Risk Score: 50][Risk Info: TCP connection with unidirectional traffic][PLAIN TEXT (QQSPSSV)][Plen Bins: 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,100,0,0,0,0,0,0,0,0,0,0] + 2 UDP 10.204.220.71:6000 -> 10.204.220.171:6000 [proto: 87/RTP][IP: 0/Unknown][Stream Content: Video][ClearText][Confidence: DPI][DPI packets: 3][cat: Media/1][15 pkts/18438 bytes -> 0 pkts/0 bytes][Goodput ratio: 97/0][0.34 sec][bytes ratio: 1.000 (Upload)][IAT c2s/s2c min/avg/max/stddev: 1/0 25/0 77/0 31/0][Pkt Len c2s/s2c min/avg/max/stddev: 66/0 1229/0 1486/0 467/0][Plen Bins: 6,0,0,6,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,6,0,0,6,0,0,0,0,0,0,0,0,0,6,0,0,0,68,0,0] + 3 UDP 150.219.118.19:54234 <-> 192.113.193.227:50003 [proto: 58/Discord][IP: 0/Unknown][Encrypted][Confidence: DPI][DPI packets: 2][cat: Collaborative/15][11 pkts/1455 bytes <-> 19 pkts/14637 bytes][Goodput ratio: 68/95][0.14 sec][Client IP: 85.154.2.145][bytes ratio: -0.819 (Download)][IAT c2s/s2c min/avg/max/stddev: 0/0 13/6 36/29 11/11][Pkt Len c2s/s2c min/avg/max/stddev: 85/116 132/770 207/1146 54/475][PLAIN TEXT (85.154.2.145)][Plen Bins: 0,20,6,20,3,10,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,26,13,0,0,0,0,0,0,0,0,0,0,0,0,0] + 4 UDP 10.140.67.167:55402 -> 148.153.85.97:6008 [VLAN: 1508][proto: 87/RTP][IP: 0/Unknown][Stream Content: Audio][ClearText][Confidence: DPI][DPI packets: 4][cat: Media/1][30 pkts/2181 bytes -> 0 pkts/0 bytes][Goodput ratio: 37/0][0.82 sec][bytes ratio: 1.000 (Upload)][IAT c2s/s2c min/avg/max/stddev: 0/0 29/0 118/0 35/0][Pkt Len c2s/s2c min/avg/max/stddev: 62/0 73/0 106/0 12/0][Plen Bins: 80,20,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/cfgs/default/result/rtsp.pcap.out b/tests/cfgs/default/result/rtsp.pcap.out index c981e164d3e..062645d2736 100644 --- a/tests/cfgs/default/result/rtsp.pcap.out +++ b/tests/cfgs/default/result/rtsp.pcap.out @@ -1,6 +1,6 @@ DPI Packets (TCP): 87 (12.43 pkts/flow) Confidence DPI : 7 (flows) -Num dissector calls: 28 (4.00 diss/flow) +Num dissector calls: 35 (5.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache stun: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/rtsp_setup_http.pcapng.out b/tests/cfgs/default/result/rtsp_setup_http.pcapng.out index 911b0dcdd0e..9bb3728fe41 100644 --- a/tests/cfgs/default/result/rtsp_setup_http.pcapng.out +++ b/tests/cfgs/default/result/rtsp_setup_http.pcapng.out @@ -1,6 +1,6 @@ DPI Packets (TCP): 1 (1.00 pkts/flow) Confidence DPI : 1 (flows) -Num dissector calls: 4 (4.00 diss/flow) +Num dissector calls: 5 (5.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache stun: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/s7comm-plus.pcap.out b/tests/cfgs/default/result/s7comm-plus.pcap.out index 3587ea8a42d..83d27b5a16f 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: 186 (186.00 diss/flow) +Num dissector calls: 187 (187.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache stun: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/s7comm.pcap.out b/tests/cfgs/default/result/s7comm.pcap.out index 17252bfeaaa..7be241ac2b8 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: 186 (186.00 diss/flow) +Num dissector calls: 187 (187.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache stun: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/shadowsocks.pcap.out b/tests/cfgs/default/result/shadowsocks.pcap.out index 90e64567eaa..2c3f123e65e 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: 367 (183.50 diss/flow) +Num dissector calls: 369 (184.50 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/3/0 (insert/search/found) LRU cache stun: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/shell.pcap.out b/tests/cfgs/default/result/shell.pcap.out index 42621984dfc..8aa094d0edf 100644 --- a/tests/cfgs/default/result/shell.pcap.out +++ b/tests/cfgs/default/result/shell.pcap.out @@ -1,7 +1,7 @@ DPI Packets (TCP): 16 (8.00 pkts/flow) DPI Packets (UDP): 2 (1.00 pkts/flow) Confidence Unknown : 4 (flows) -Num dissector calls: 578 (144.50 diss/flow) +Num dissector calls: 580 (145.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/12/0 (insert/search/found) LRU cache stun: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/smb_frags.pcap.out b/tests/cfgs/default/result/smb_frags.pcap.out index ca645cc8a37..68541f4b21d 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: 173 (173.00 diss/flow) +Num dissector calls: 174 (174.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache stun: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/smbv1.pcap.out b/tests/cfgs/default/result/smbv1.pcap.out index 4c371f62840..0b93fc30735 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: 175 (175.00 diss/flow) +Num dissector calls: 176 (176.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache stun: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/smpp_in_general.pcap.out b/tests/cfgs/default/result/smpp_in_general.pcap.out index 01bea056013..5971b9c4e19 100644 --- a/tests/cfgs/default/result/smpp_in_general.pcap.out +++ b/tests/cfgs/default/result/smpp_in_general.pcap.out @@ -1,6 +1,6 @@ DPI Packets (TCP): 4 (4.00 pkts/flow) Confidence DPI : 1 (flows) -Num dissector calls: 72 (72.00 diss/flow) +Num dissector calls: 73 (73.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache stun: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/smtp-starttls.pcap.out b/tests/cfgs/default/result/smtp-starttls.pcap.out index 8f40ac3800e..b6c0dcb4bae 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: 172 (86.00 diss/flow) +Num dissector calls: 173 (86.50 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache stun: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/smtp.pcap.out b/tests/cfgs/default/result/smtp.pcap.out index a4319fb726d..6391ca088d6 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: 213 (213.00 diss/flow) +Num dissector calls: 214 (214.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache stun: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/soap.pcap.out b/tests/cfgs/default/result/soap.pcap.out index a481122595e..fe9434267ce 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: 409 (136.33 diss/flow) +Num dissector calls: 411 (137.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/3/0 (insert/search/found) LRU cache stun: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/socks.pcap.out b/tests/cfgs/default/result/socks.pcap.out index 11ff216f326..54588900aa2 100644 --- a/tests/cfgs/default/result/socks.pcap.out +++ b/tests/cfgs/default/result/socks.pcap.out @@ -1,6 +1,6 @@ DPI Packets (TCP): 23 (5.75 pkts/flow) Confidence DPI : 4 (flows) -Num dissector calls: 599 (149.75 diss/flow) +Num dissector calls: 603 (150.75 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache stun: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/spotify_tcp.pcap.out b/tests/cfgs/default/result/spotify_tcp.pcap.out index 6a21a8f17ef..49df2542c23 100644 --- a/tests/cfgs/default/result/spotify_tcp.pcap.out +++ b/tests/cfgs/default/result/spotify_tcp.pcap.out @@ -1,6 +1,6 @@ DPI Packets (TCP): 4 (4.00 pkts/flow) Confidence DPI : 1 (flows) -Num dissector calls: 48 (48.00 diss/flow) +Num dissector calls: 49 (49.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache stun: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/starcraft_battle.pcap.out b/tests/cfgs/default/result/starcraft_battle.pcap.out index ed1a4189751..3499fdf6539 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: 1666 (32.04 diss/flow) +Num dissector calls: 1669 (32.10 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/39/0 (insert/search/found) LRU cache stun: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/stun.pcap.out b/tests/cfgs/default/result/stun.pcap.out index a656e373fed..6cb5607e012 100644 --- a/tests/cfgs/default/result/stun.pcap.out +++ b/tests/cfgs/default/result/stun.pcap.out @@ -2,7 +2,7 @@ DPI Packets (TCP): 17 (8.50 pkts/flow) DPI Packets (UDP): 45 (7.50 pkts/flow) DPI Packets (other): 1 (1.00 pkts/flow) Confidence DPI : 9 (flows) -Num dissector calls: 29 (3.22 diss/flow) +Num dissector calls: 31 (3.44 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache stun: 12/44/0 (insert/search/found) diff --git a/tests/cfgs/default/result/stun_tcp_multiple_msgs_same_pkt.pcap.out b/tests/cfgs/default/result/stun_tcp_multiple_msgs_same_pkt.pcap.out index c757510547c..261f7d96b80 100644 --- a/tests/cfgs/default/result/stun_tcp_multiple_msgs_same_pkt.pcap.out +++ b/tests/cfgs/default/result/stun_tcp_multiple_msgs_same_pkt.pcap.out @@ -1,6 +1,6 @@ DPI Packets (TCP): 5 (5.00 pkts/flow) Confidence DPI : 1 (flows) -Num dissector calls: 6 (6.00 diss/flow) +Num dissector calls: 7 (7.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache stun: 0/8/0 (insert/search/found) diff --git a/tests/cfgs/default/result/syslog.pcap.out b/tests/cfgs/default/result/syslog.pcap.out index 9aad3244332..83a09cf9509 100644 --- a/tests/cfgs/default/result/syslog.pcap.out +++ b/tests/cfgs/default/result/syslog.pcap.out @@ -2,7 +2,7 @@ DPI Packets (TCP): 10 (5.00 pkts/flow) DPI Packets (UDP): 20 (1.00 pkts/flow) Confidence Unknown : 1 (flows) Confidence DPI : 21 (flows) -Num dissector calls: 53 (2.41 diss/flow) +Num dissector calls: 54 (2.45 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/3/0 (insert/search/found) LRU cache stun: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/teams.pcap.out b/tests/cfgs/default/result/teams.pcap.out index 10f95d7a863..7f837b46f33 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 : 1 (flows) Confidence DPI (partial) : 5 (flows) Confidence DPI : 76 (flows) -Num dissector calls: 511 (6.16 diss/flow) +Num dissector calls: 512 (6.17 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/9/0 (insert/search/found) LRU cache stun: 30/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/telegram_videocall.pcapng.out b/tests/cfgs/default/result/telegram_videocall.pcapng.out index 3d25fced416..49f1e9318db 100644 --- a/tests/cfgs/default/result/telegram_videocall.pcapng.out +++ b/tests/cfgs/default/result/telegram_videocall.pcapng.out @@ -7,7 +7,7 @@ Confidence DPI (partial) : 1 (flows) Confidence DPI (cache) : 10 (flows) Confidence DPI : 15 (flows) Confidence Match by IP : 8 (flows) -Num dissector calls: 748 (22.00 diss/flow) +Num dissector calls: 756 (22.24 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/6/0 (insert/search/found) LRU cache stun: 38/49/10 (insert/search/found) diff --git a/tests/cfgs/default/result/telnet.pcap.out b/tests/cfgs/default/result/telnet.pcap.out index 4352a087559..f7b7f1318c6 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: 171 (171.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 stun: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/tencent_games.pcap.out b/tests/cfgs/default/result/tencent_games.pcap.out index d98de918624..11b10827a0e 100644 --- a/tests/cfgs/default/result/tencent_games.pcap.out +++ b/tests/cfgs/default/result/tencent_games.pcap.out @@ -1,6 +1,6 @@ DPI Packets (TCP): 16 (4.00 pkts/flow) Confidence DPI : 4 (flows) -Num dissector calls: 564 (141.00 diss/flow) +Num dissector calls: 568 (142.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache stun: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/teso.pcapng.out b/tests/cfgs/default/result/teso.pcapng.out index 18c73585802..c0db7a042ae 100644 --- a/tests/cfgs/default/result/teso.pcapng.out +++ b/tests/cfgs/default/result/teso.pcapng.out @@ -1,6 +1,6 @@ DPI Packets (TCP): 8 (4.00 pkts/flow) Confidence DPI : 2 (flows) -Num dissector calls: 290 (145.00 diss/flow) +Num dissector calls: 292 (146.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache stun: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/threema.pcap.out b/tests/cfgs/default/result/threema.pcap.out index c708ce05f96..bed4db40a24 100644 --- a/tests/cfgs/default/result/threema.pcap.out +++ b/tests/cfgs/default/result/threema.pcap.out @@ -3,7 +3,7 @@ Guessed flow protos: 2 DPI Packets (TCP): 66 (11.00 pkts/flow) Confidence DPI : 4 (flows) Confidence Match by IP : 2 (flows) -Num dissector calls: 1312 (218.67 diss/flow) +Num dissector calls: 1318 (219.67 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/6/0 (insert/search/found) LRU cache stun: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/thrift.pcap.out b/tests/cfgs/default/result/thrift.pcap.out index 7fe166579de..2dcd7132e66 100644 --- a/tests/cfgs/default/result/thrift.pcap.out +++ b/tests/cfgs/default/result/thrift.pcap.out @@ -1,7 +1,7 @@ DPI Packets (TCP): 4 (4.00 pkts/flow) DPI Packets (UDP): 1 (1.00 pkts/flow) Confidence DPI : 2 (flows) -Num dissector calls: 217 (108.50 diss/flow) +Num dissector calls: 218 (109.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache stun: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/tinc.pcap.out b/tests/cfgs/default/result/tinc.pcap.out index 8009ba0a722..042a6c03eb5 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: 525 (131.25 diss/flow) +Num dissector calls: 527 (131.75 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache stun: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/tls-appdata.pcap.out b/tests/cfgs/default/result/tls-appdata.pcap.out index be61bbf1ded..f24b2b9f65e 100644 --- a/tests/cfgs/default/result/tls-appdata.pcap.out +++ b/tests/cfgs/default/result/tls-appdata.pcap.out @@ -1,6 +1,6 @@ DPI Packets (TCP): 17 (8.50 pkts/flow) Confidence DPI : 2 (flows) -Num dissector calls: 150 (75.00 diss/flow) +Num dissector calls: 151 (75.50 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache stun: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/tls_certificate_too_long.pcap.out b/tests/cfgs/default/result/tls_certificate_too_long.pcap.out index 58db1f58c8e..4a2368d3615 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: 637 (18.20 diss/flow) +Num dissector calls: 640 (18.29 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/6/0 (insert/search/found) LRU cache stun: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/tls_false_positives.pcapng.out b/tests/cfgs/default/result/tls_false_positives.pcapng.out index a385e43e88a..b041ab5b779 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: 245 (245.00 diss/flow) +Num dissector calls: 246 (246.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/3/0 (insert/search/found) LRU cache stun: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/tls_invalid_reads.pcap.out b/tests/cfgs/default/result/tls_invalid_reads.pcap.out index 462d5563a67..66c1d408c66 100644 --- a/tests/cfgs/default/result/tls_invalid_reads.pcap.out +++ b/tests/cfgs/default/result/tls_invalid_reads.pcap.out @@ -3,7 +3,7 @@ Guessed flow protos: 1 DPI Packets (TCP): 10 (3.33 pkts/flow) Confidence Match by port : 1 (flows) Confidence DPI : 2 (flows) -Num dissector calls: 150 (50.00 diss/flow) +Num dissector calls: 151 (50.33 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/3/0 (insert/search/found) LRU cache stun: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/tls_missing_ch_frag.pcap.out b/tests/cfgs/default/result/tls_missing_ch_frag.pcap.out index 52c524c47ef..086ac61f0e1 100644 --- a/tests/cfgs/default/result/tls_missing_ch_frag.pcap.out +++ b/tests/cfgs/default/result/tls_missing_ch_frag.pcap.out @@ -1,6 +1,6 @@ DPI Packets (TCP): 3 (3.00 pkts/flow) Confidence DPI : 1 (flows) -Num dissector calls: 149 (149.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 stun: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/tls_unidirectional.pcap.out b/tests/cfgs/default/result/tls_unidirectional.pcap.out index 50b3f7b2769..7398030ff78 100644 --- a/tests/cfgs/default/result/tls_unidirectional.pcap.out +++ b/tests/cfgs/default/result/tls_unidirectional.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 1 DPI Packets (TCP): 8 (8.00 pkts/flow) Confidence Match by port : 1 (flows) -Num dissector calls: 148 (148.00 diss/flow) +Num dissector calls: 149 (149.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/3/0 (insert/search/found) LRU cache stun: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/ultrasurf.pcap.out b/tests/cfgs/default/result/ultrasurf.pcap.out index b6bac4e399a..017f3767160 100644 --- a/tests/cfgs/default/result/ultrasurf.pcap.out +++ b/tests/cfgs/default/result/ultrasurf.pcap.out @@ -1,6 +1,6 @@ DPI Packets (TCP): 13 (4.33 pkts/flow) Confidence DPI : 3 (flows) -Num dissector calls: 108 (36.00 diss/flow) +Num dissector calls: 109 (36.33 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache stun: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/viber.pcap.out b/tests/cfgs/default/result/viber.pcap.out index 018f7c000a2..a6f9de17ef7 100644 --- a/tests/cfgs/default/result/viber.pcap.out +++ b/tests/cfgs/default/result/viber.pcap.out @@ -5,7 +5,7 @@ DPI Packets (UDP): 34 (2.27 pkts/flow) DPI Packets (other): 2 (1.00 pkts/flow) Confidence Match by port : 4 (flows) Confidence DPI : 26 (flows) -Num dissector calls: 457 (15.23 diss/flow) +Num dissector calls: 458 (15.27 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/12/0 (insert/search/found) LRU cache stun: 3/6/0 (insert/search/found) diff --git a/tests/cfgs/default/result/vnc.pcap.out b/tests/cfgs/default/result/vnc.pcap.out index 33188978ec3..1238de1e058 100644 --- a/tests/cfgs/default/result/vnc.pcap.out +++ b/tests/cfgs/default/result/vnc.pcap.out @@ -1,6 +1,6 @@ DPI Packets (TCP): 10 (5.00 pkts/flow) Confidence DPI : 2 (flows) -Num dissector calls: 310 (155.00 diss/flow) +Num dissector calls: 312 (156.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache stun: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/wa_video.pcap.out b/tests/cfgs/default/result/wa_video.pcap.out index e1498ba052f..f3510bd6d53 100644 --- a/tests/cfgs/default/result/wa_video.pcap.out +++ b/tests/cfgs/default/result/wa_video.pcap.out @@ -5,7 +5,7 @@ DPI Packets (UDP): 44 (3.38 pkts/flow) Confidence DPI (cache) : 2 (flows) Confidence DPI : 11 (flows) Confidence Match by IP : 1 (flows) -Num dissector calls: 368 (26.29 diss/flow) +Num dissector calls: 369 (26.36 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/3/0 (insert/search/found) LRU cache stun: 14/2/2 (insert/search/found) diff --git a/tests/cfgs/default/result/wa_voice.pcap.out b/tests/cfgs/default/result/wa_voice.pcap.out index 220a49242eb..5290234f531 100644 --- a/tests/cfgs/default/result/wa_voice.pcap.out +++ b/tests/cfgs/default/result/wa_voice.pcap.out @@ -4,7 +4,7 @@ DPI Packets (other): 1 (1.00 pkts/flow) Confidence Unknown : 1 (flows) Confidence DPI (cache) : 1 (flows) Confidence DPI : 26 (flows) -Num dissector calls: 358 (12.79 diss/flow) +Num dissector calls: 360 (12.86 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/3/0 (insert/search/found) LRU cache stun: 16/3/2 (insert/search/found) diff --git a/tests/cfgs/default/result/waze.pcap.out b/tests/cfgs/default/result/waze.pcap.out index 31acb534014..6198b42594b 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: 383 (11.61 diss/flow) +Num dissector calls: 385 (11.67 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/30/0 (insert/search/found) LRU cache stun: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/websocket.pcap.out b/tests/cfgs/default/result/websocket.pcap.out index 455ff21f35e..f7eca23cf75 100644 --- a/tests/cfgs/default/result/websocket.pcap.out +++ b/tests/cfgs/default/result/websocket.pcap.out @@ -1,6 +1,6 @@ DPI Packets (TCP): 1 (1.00 pkts/flow) Confidence DPI : 1 (flows) -Num dissector calls: 90 (90.00 diss/flow) +Num dissector calls: 91 (91.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache stun: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/wechat.pcap.out b/tests/cfgs/default/result/wechat.pcap.out index e88915cd79f..f84f407fb5d 100644 --- a/tests/cfgs/default/result/wechat.pcap.out +++ b/tests/cfgs/default/result/wechat.pcap.out @@ -6,7 +6,7 @@ DPI Packets (other): 7 (1.00 pkts/flow) Confidence Match by port : 24 (flows) Confidence DPI : 78 (flows) Confidence Match by IP : 1 (flows) -Num dissector calls: 321 (3.12 diss/flow) +Num dissector calls: 322 (3.13 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/75/0 (insert/search/found) LRU cache stun: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/whatsapp.pcap.out b/tests/cfgs/default/result/whatsapp.pcap.out index e96ca69895d..df3ba90f028 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: 14018 (163.00 diss/flow) +Num dissector calls: 14104 (164.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache stun: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/whatsapp_login_call.pcap.out b/tests/cfgs/default/result/whatsapp_login_call.pcap.out index f46cc29597a..ee4857b39de 100644 --- a/tests/cfgs/default/result/whatsapp_login_call.pcap.out +++ b/tests/cfgs/default/result/whatsapp_login_call.pcap.out @@ -6,7 +6,7 @@ DPI Packets (other): 1 (1.00 pkts/flow) Confidence Match by port : 20 (flows) Confidence DPI (cache) : 2 (flows) Confidence DPI : 35 (flows) -Num dissector calls: 279 (4.89 diss/flow) +Num dissector calls: 281 (4.93 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/60/0 (insert/search/found) LRU cache stun: 46/4/4 (insert/search/found) diff --git a/tests/cfgs/default/result/whatsapp_login_chat.pcap.out b/tests/cfgs/default/result/whatsapp_login_chat.pcap.out index ab5653b9f09..826854356e2 100644 --- a/tests/cfgs/default/result/whatsapp_login_chat.pcap.out +++ b/tests/cfgs/default/result/whatsapp_login_chat.pcap.out @@ -1,7 +1,7 @@ DPI Packets (TCP): 17 (5.67 pkts/flow) DPI Packets (UDP): 7 (1.17 pkts/flow) Confidence DPI : 9 (flows) -Num dissector calls: 294 (32.67 diss/flow) +Num dissector calls: 296 (32.89 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache stun: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/whatsapp_voice_and_message.pcap.out b/tests/cfgs/default/result/whatsapp_voice_and_message.pcap.out index 50b6f518734..b53da908c8e 100644 --- a/tests/cfgs/default/result/whatsapp_voice_and_message.pcap.out +++ b/tests/cfgs/default/result/whatsapp_voice_and_message.pcap.out @@ -1,7 +1,7 @@ DPI Packets (TCP): 20 (4.00 pkts/flow) DPI Packets (UDP): 42 (5.25 pkts/flow) Confidence DPI : 13 (flows) -Num dissector calls: 403 (31.00 diss/flow) +Num dissector calls: 408 (31.38 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache stun: 16/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/whois.pcapng.out b/tests/cfgs/default/result/whois.pcapng.out index 4a19d89048b..91577dd73eb 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: 202 (67.33 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/3/0 (insert/search/found) LRU cache stun: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/wow.pcap.out b/tests/cfgs/default/result/wow.pcap.out index 449a0bdee80..6c2c66e979f 100644 --- a/tests/cfgs/default/result/wow.pcap.out +++ b/tests/cfgs/default/result/wow.pcap.out @@ -1,6 +1,6 @@ DPI Packets (TCP): 36 (7.20 pkts/flow) Confidence DPI : 5 (flows) -Num dissector calls: 109 (21.80 diss/flow) +Num dissector calls: 112 (22.40 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache stun: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/xiaomi.pcap.out b/tests/cfgs/default/result/xiaomi.pcap.out index 4a739273fc3..3497989a799 100644 --- a/tests/cfgs/default/result/xiaomi.pcap.out +++ b/tests/cfgs/default/result/xiaomi.pcap.out @@ -1,6 +1,6 @@ DPI Packets (TCP): 19 (2.71 pkts/flow) Confidence DPI : 7 (flows) -Num dissector calls: 609 (87.00 diss/flow) +Num dissector calls: 615 (87.86 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache stun: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/z3950.pcapng.out b/tests/cfgs/default/result/z3950.pcapng.out index a4253d0477e..48dbb1547e3 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: 467 (233.50 diss/flow) +Num dissector calls: 469 (234.50 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/3/0 (insert/search/found) LRU cache stun: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/default/result/zoom.pcap.out b/tests/cfgs/default/result/zoom.pcap.out index 2d9fd64f19e..09d3ca51aae 100644 --- a/tests/cfgs/default/result/zoom.pcap.out +++ b/tests/cfgs/default/result/zoom.pcap.out @@ -5,7 +5,7 @@ DPI Packets (UDP): 40 (2.22 pkts/flow) DPI Packets (other): 2 (1.00 pkts/flow) Confidence Match by port : 2 (flows) Confidence DPI : 32 (flows) -Num dissector calls: 1020 (30.00 diss/flow) +Num dissector calls: 1022 (30.06 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/6/0 (insert/search/found) LRU cache stun: 6/0/0 (insert/search/found) diff --git a/tests/cfgs/disable_aggressiveness/result/ookla.pcap.out b/tests/cfgs/disable_aggressiveness/result/ookla.pcap.out index ac8e8a82bc5..9cdfd8eb083 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: 565 (94.17 diss/flow) +Num dissector calls: 568 (94.67 diss/flow) LRU cache ookla: 4/1/1 (insert/search/found) LRU cache bittorrent: 0/3/0 (insert/search/found) LRU cache stun: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/disable_protocols/result/soap.pcap.out b/tests/cfgs/disable_protocols/result/soap.pcap.out index 62aaec5b0ab..f49de9eccf3 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: 400 (133.33 diss/flow) +Num dissector calls: 402 (134.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/6/0 (insert/search/found) LRU cache stun: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/enable_payload_stat/result/1kxun.pcap.out b/tests/cfgs/enable_payload_stat/result/1kxun.pcap.out index 2f5d80f812b..ce082432a2a 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: 4934 (25.05 diss/flow) +Num dissector calls: 4937 (25.06 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/60/0 (insert/search/found) LRU cache stun: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/ip_lists_disable/result/1kxun.pcap.out b/tests/cfgs/ip_lists_disable/result/1kxun.pcap.out index e1609e4a4ef..359d1103d89 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: 4934 (25.05 diss/flow) +Num dissector calls: 4937 (25.06 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/60/0 (insert/search/found) LRU cache stun: 0/0/0 (insert/search/found) diff --git a/tests/cfgs/stun_all_attributes_disabled/result/teams.pcap.out b/tests/cfgs/stun_all_attributes_disabled/result/teams.pcap.out index e44e8987ecd..7e3a52722e0 100644 --- a/tests/cfgs/stun_all_attributes_disabled/result/teams.pcap.out +++ b/tests/cfgs/stun_all_attributes_disabled/result/teams.pcap.out @@ -7,7 +7,7 @@ Confidence Unknown : 1 (flows) Confidence Match by port : 1 (flows) Confidence DPI (partial) : 5 (flows) Confidence DPI : 76 (flows) -Num dissector calls: 511 (6.16 diss/flow) +Num dissector calls: 512 (6.17 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/9/0 (insert/search/found) LRU cache stun: 24/0/0 (insert/search/found) diff --git a/tests/cfgs/stun_only_peer_address_enabled/result/telegram_videocall.pcapng.out b/tests/cfgs/stun_only_peer_address_enabled/result/telegram_videocall.pcapng.out index b31bf0616ec..cea9fe74111 100644 --- a/tests/cfgs/stun_only_peer_address_enabled/result/telegram_videocall.pcapng.out +++ b/tests/cfgs/stun_only_peer_address_enabled/result/telegram_videocall.pcapng.out @@ -7,7 +7,7 @@ Confidence DPI (partial) : 1 (flows) Confidence DPI (cache) : 10 (flows) Confidence DPI : 15 (flows) Confidence Match by IP : 8 (flows) -Num dissector calls: 748 (22.00 diss/flow) +Num dissector calls: 756 (22.24 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/6/0 (insert/search/found) LRU cache stun: 38/49/10 (insert/search/found)