From 642a07ff10d6a14a7629f91a013203a78cef4787 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 | 118 ++++++++++++------ 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_tcp.pcapng | Bin 0 -> 24640 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_tcp.pcapng.out | 27 ++++ 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, 269 insertions(+), 198 deletions(-) create mode 100644 tests/cfgs/default/pcap/rtp_tcp.pcapng create mode 100644 tests/cfgs/default/result/rtp_tcp.pcapng.out diff --git a/src/include/ndpi_typedefs.h b/src/include/ndpi_typedefs.h index ffc98ecd141..185367704dc 100644 --- a/src/include/ndpi_typedefs.h +++ b/src/include/ndpi_typedefs.h @@ -908,12 +908,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; @@ -928,10 +922,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; @@ -1440,6 +1430,14 @@ struct ndpi_flow_struct { u_int8_t url_count; char url[4][48]; } slp; + + struct { + u_int32_t rtp_stage:2; + u_int32_t rtcp_stage:2; + u_int16_t rtp_seq[2]; + u_int8_t rtp_seq_set[2]; + } rtp_rtcp; + } protos; /*** ALL protocol specific 64 bit variables here ***/ diff --git a/src/lib/protocols/protobuf.c b/src/lib/protocols/protobuf.c index 9f50e5c3164..2d5ca62647f 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->protos.rtp_rtcp.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..4cfe8f0de5b 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->protos.rtp_rtcp.rtp_stage == 0 && flow->protos.rtp_rtcp.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->protos.rtp_rtcp.rtp_stage == 0 && flow->protos.rtp_rtcp.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..892a73f2951 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->protos.rtp_rtcp.rtp_stage, flow->protos.rtp_rtcp.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->protos.rtp_rtcp.rtp_stage == 0 && + flow->protos.rtp_rtcp.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->protos.rtp_rtcp.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->protos.rtp_rtcp.rtp_seq_set[packet->packet_direction] && + flow->protos.rtp_rtcp.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->protos.rtp_rtcp.rtp_stage = 0; + flow->protos.rtp_rtcp.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->protos.rtp_rtcp.rtp_stage == 0) { + flow->protos.rtp_rtcp.rtp_seq[packet->packet_direction] = seq; + flow->protos.rtp_rtcp.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->protos.rtp_rtcp.rtp_stage += 1; + } else if(is_rtp == IS_RTCP && flow->protos.rtp_rtcp.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->protos.rtp_rtcp.rtp_stage == 0) { + if(flow->protos.rtp_rtcp.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->protos.rtp_rtcp.rtcp_stage += 1; } else { - if(flow->l4.udp.rtp_stage || flow->l4.udp.rtcp_stage) { + if(flow->protos.rtp_rtcp.rtp_stage || flow->protos.rtp_rtcp.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->protos.rtp_rtcp.rtp_stage = 0; + flow->protos.rtp_rtcp.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); + } } /* *************************************************************** */ @@ -259,7 +305,7 @@ void init_rtp_dissector(struct ndpi_detection_module_struct *ndpi_struct, ndpi_set_bitmask_protocol_detection("RTP", ndpi_struct, *id, NDPI_PROTOCOL_RTP, ndpi_search_rtp, - NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_UDP_WITH_PAYLOAD, + NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_OR_UDP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION, SAVE_DETECTION_BITMASK_AS_UNKNOWN, ADD_TO_DETECTION_BITMASK); diff --git a/src/lib/protocols/viber.c b/src/lib/protocols/viber.c index 3a1a57792af..335ad58df8e 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->protos.rtp_rtcp.rtp_stage == 0) && (flow->protos.rtp_rtcp.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 3b6fd645b44..9c7f5219c0d 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: 568 (94.67 diss/flow) +Num dissector calls: 571 (95.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/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 c768362d66b..8215b52f7d5 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: 1740 (72.50 diss/flow) +Num dissector calls: 1762 (73.42 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 bdda72697a2..4f4be3d329c 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: 568 (94.67 diss/flow) +Num dissector calls: 571 (95.17 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_tcp.pcapng b/tests/cfgs/default/pcap/rtp_tcp.pcapng new file mode 100644 index 0000000000000000000000000000000000000000..c72b73441408737dc5e9a8100811070e0c1578d8 GIT binary patch literal 24640 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 literal 0 HcmV?d00001 diff --git a/tests/cfgs/default/result/1kxun.pcap.out b/tests/cfgs/default/result/1kxun.pcap.out index 381d91f0466..f08410937fb 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: 4923 (24.99 diss/flow) +Num dissector calls: 4926 (25.01 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 92534338f6a..c21fe9e4c09 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: 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/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 cdf1ac775d8..f0c309f509a 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: 150 (150.00 diss/flow) +Num dissector calls: 151 (151.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 d0b7a4bc376..e1d3546c3fd 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: 549 (14.45 diss/flow) +Num dissector calls: 551 (14.50 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 aecb0a07cf5..492e11067c7 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: 1205 (60.25 diss/flow) +Num dissector calls: 1209 (60.45 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 66d95331128..0f01a230280 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: 255 (255.00 diss/flow) +Num dissector calls: 256 (256.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 18e705deb74..b1dbcda7624 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: 563 (3.52 diss/flow) +Num dissector calls: 564 (3.53 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 0067fab108d..0f3580e4df1 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: 1575 (105.00 diss/flow) +Num dissector calls: 1590 (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/amqp.pcap.out b/tests/cfgs/default/result/amqp.pcap.out index 21cc11a4046..aa56dc797f7 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: 377 (125.67 diss/flow) +Num dissector calls: 380 (126.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 d3b16c6ab3f..c2f86c26528 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: 809 (11.72 diss/flow) +Num dissector calls: 810 (11.74 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 1e4dbb64a6f..2ccc5187920 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: 1060 (106.00 diss/flow) +Num dissector calls: 1070 (107.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 c768362d66b..8215b52f7d5 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: 1740 (72.50 diss/flow) +Num dissector calls: 1762 (73.42 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 368cf49965c..d906d84fb86 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: 239 (239.00 diss/flow) +Num dissector calls: 240 (240.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 5d24a13c97a..9a4474e2dc2 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: 301 (100.33 diss/flow) +Num dissector calls: 303 (101.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/cloudflare-warp.pcap.out b/tests/cfgs/default/result/cloudflare-warp.pcap.out index b7fa70b7b94..e0c69b55c5d 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: 203 (25.38 diss/flow) +Num dissector calls: 204 (25.50 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 afba05ba411..0797d723287 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: 288 (18.00 diss/flow) +Num dissector calls: 292 (18.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/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 9c6bda2af60..fb75ada2d67 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: 111 (55.50 diss/flow) +Num dissector calls: 112 (56.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/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 8353a4d7897..0b076ae39cf 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: 253 (126.50 diss/flow) +Num dissector calls: 254 (127.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/drda_db2.pcap.out b/tests/cfgs/default/result/drda_db2.pcap.out index 8f82adcb409..908c38478fb 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: 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/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 12b5ef098ef..fa9849f26cc 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: 777 (111.00 diss/flow) +Num dissector calls: 784 (112.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 a30e6bcf9cc..c88fdbfee3f 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: 221 (36.83 diss/flow) +Num dissector calls: 222 (37.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/fastcgi.pcap.out b/tests/cfgs/default/result/fastcgi.pcap.out index a543581a4be..c5fad458308 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: 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/fix.pcap.out b/tests/cfgs/default/result/fix.pcap.out index 0a0cb0763d3..e45aab6c78c 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: 912 (76.00 diss/flow) +Num dissector calls: 924 (77.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 8912e17acd8..17d5b6d9676 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: 150 (75.00 diss/flow) +Num dissector calls: 152 (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/ftp-start-tls.pcap.out b/tests/cfgs/default/result/ftp-start-tls.pcap.out index e0c2e36ee1a..c0e5e873ad7 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: 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/ftp.pcap.out b/tests/cfgs/default/result/ftp.pcap.out index 756cce4aaef..c9b348ccac9 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: 520 (173.33 diss/flow) +Num dissector calls: 523 (174.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 1d186704e35..bbc778a9839 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: 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/fuzz-2006-06-26-2594.pcap.out b/tests/cfgs/default/result/fuzz-2006-06-26-2594.pcap.out index 684c69b5f40..d307322a0e7 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: 7570 (30.16 diss/flow) +Num dissector calls: 7583 (30.21 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 554c8a8609b..5d197348b34 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: 1135 (28.38 diss/flow) +Num dissector calls: 1141 (28.52 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 bcb4a1e1682..19384761a2e 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: 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/gaijin_mobile_mixed.pcap.out b/tests/cfgs/default/result/gaijin_mobile_mixed.pcap.out index 1eb8edd2afd..61ffbcdba69 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: 152 (50.67 diss/flow) +Num dissector calls: 153 (51.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/genshin-impact.pcap.out b/tests/cfgs/default/result/genshin-impact.pcap.out index 44bed7daf53..42aa7f13171 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: 443 (73.83 diss/flow) +Num dissector calls: 446 (74.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/gnutella.pcap.out b/tests/cfgs/default/result/gnutella.pcap.out index 136959c0e39..d4db5e8b8b4 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: 50031 (65.83 diss/flow) +Num dissector calls: 50083 (65.90 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 2b2e0f9b982..ce83a6de8b7 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: 201 (201.00 diss/flow) +Num dissector calls: 202 (202.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/3/0 (insert/search/found) LRU cache 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 7cea86109a7..b7d470a9a30 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: 117 (117.00 diss/flow) +Num dissector calls: 118 (118.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 a7e5a35d19f..fc30a0555a5 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: 134 (134.00 diss/flow) +Num dissector calls: 135 (135.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 34d7dd7df76..33727993a4d 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: 855 (95.00 diss/flow) +Num dissector calls: 864 (96.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 3d9f05794ef..a781734604c 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: 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/http_guessed_host_and_guessed.pcapng.out b/tests/cfgs/default/result/http_guessed_host_and_guessed.pcapng.out index 21c0174d677..0d267747f62 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: 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/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 cc3c7cd11c4..4fe42abfbdc 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: 220 (220.00 diss/flow) +Num dissector calls: 221 (221.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 d3092c87082..d16e8cf6ea4 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: 220 (220.00 diss/flow) +Num dissector calls: 221 (221.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 d1685b1e237..7c90d6f839e 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: 1322 (34.79 diss/flow) +Num dissector calls: 1326 (34.89 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 77711360f4d..53622517f3d 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: 179 (179.00 diss/flow) +Num dissector calls: 180 (180.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 0afadbce5a0..a0771c5a6cf 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: 192 (192.00 diss/flow) +Num dissector calls: 193 (193.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 4877f209036..927e6ca93d0 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: 1633 (136.08 diss/flow) +Num dissector calls: 1645 (137.08 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 3662d6050c5..f6d4de48e28 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: 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/kafka.pcapng.out b/tests/cfgs/default/result/kafka.pcapng.out index ee0deb38df9..d73528c7cdc 100644 --- a/tests/cfgs/default/result/kafka.pcapng.out +++ b/tests/cfgs/default/result/kafka.pcapng.out @@ -1,6 +1,6 @@ DPI Packets (TCP): 6 (6.00 pkts/flow) Confidence DPI : 1 (flows) -Num dissector calls: 150 (150.00 diss/flow) +Num dissector calls: 151 (151.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/kerberos.pcap.out b/tests/cfgs/default/result/kerberos.pcap.out index 907347679b4..7105b94fed7 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: 4426 (122.94 diss/flow) +Num dissector calls: 4451 (123.64 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 0611f6db473..d1245d37f57 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: 108 (108.00 diss/flow) +Num dissector calls: 109 (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/lisp_registration.pcap.out b/tests/cfgs/default/result/lisp_registration.pcap.out index 601012a065b..3c92fec8336 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: 168 (42.00 diss/flow) +Num dissector calls: 170 (42.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/log4j-webapp-exploit.pcap.out b/tests/cfgs/default/result/log4j-webapp-exploit.pcap.out index 6db355f2842..208329d5aba 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: 352 (50.29 diss/flow) +Num dissector calls: 355 (50.71 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 9c9b5e94fa5..8b906316041 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: 150 (150.00 diss/flow) +Num dissector calls: 151 (151.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 94e95c6fb8f..e7c4ac69368 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: 508 (127.00 diss/flow) +Num dissector calls: 512 (128.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 2730d48cc7a..33e5cfee9ff 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: 267 (267.00 diss/flow) +Num dissector calls: 268 (268.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 3ea89439ed8..6b29ae9ecce 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: 98 (12.25 diss/flow) +Num dissector calls: 99 (12.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/mssql_tds.pcap.out b/tests/cfgs/default/result/mssql_tds.pcap.out index ccda0f3cd70..37ab1d7985c 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: 266 (22.17 diss/flow) +Num dissector calls: 267 (22.25 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 499ec272f3c..1358c238896 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: 2101 (150.07 diss/flow) +Num dissector calls: 2113 (150.93 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 b560e95d803..a90c4e92930 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: 163 (10.87 diss/flow) +Num dissector calls: 164 (10.93 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 42e8161ad7e..8ad8520ec72 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: 157 (157.00 diss/flow) +Num dissector calls: 158 (158.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache 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 bdda72697a2..4f4be3d329c 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: 568 (94.67 diss/flow) +Num dissector calls: 571 (95.17 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 981198848d6..c81aa9621bd 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: 1336 (167.00 diss/flow) +Num dissector calls: 1343 (167.88 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 e5bd17d88af..14211c49611 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: 150 (150.00 diss/flow) +Num dissector calls: 151 (151.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 af573ce1211..01c358fe368 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: 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/ossfuzz_seed_fake_traces_1.pcapng.out b/tests/cfgs/default/result/ossfuzz_seed_fake_traces_1.pcapng.out index 34f04e35e46..a428bbd4d27 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: 936 (93.60 diss/flow) +Num dissector calls: 938 (93.80 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 6d4eb89678f..d109e81d16c 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: 1009 (126.12 diss/flow) +Num dissector calls: 1015 (126.88 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 5c8965e9a91..ac32a3364f4 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: 145 (145.00 diss/flow) +Num dissector calls: 146 (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/pgsql.pcap.out b/tests/cfgs/default/result/pgsql.pcap.out index ae062af7312..e1b941187d8 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: 900 (150.00 diss/flow) +Num dissector calls: 906 (151.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 b0472cc43c2..72e01de6ae9 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: 1251 (208.50 diss/flow) +Num dissector calls: 1257 (209.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 6287703f266..cef0ea5d903 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: 207 (207.00 diss/flow) +Num dissector calls: 208 (208.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 9b9d27891d8..db50b85bc07 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: 473 (236.50 diss/flow) +Num dissector calls: 475 (237.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 3566c136d29..276255d8624 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: 696 (139.20 diss/flow) +Num dissector calls: 701 (140.20 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache 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 3d0c03418d8..993ffabb2e5 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: 300 (150.00 diss/flow) +Num dissector calls: 302 (151.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 ada326ca38d..2950dbb00fc 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: 346 (173.00 diss/flow) +Num dissector calls: 348 (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/reasm_crash_anon.pcapng.out b/tests/cfgs/default/result/reasm_crash_anon.pcapng.out index 5a6edd66f5d..1cc508baf5e 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: 243 (243.00 diss/flow) +Num dissector calls: 244 (244.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 50c358d50c4..78ae5d3c1ec 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: 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/riot.pcapng.out b/tests/cfgs/default/result/riot.pcapng.out index 13f72476d64..127b93e492b 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: 199 (99.50 diss/flow) +Num dissector calls: 200 (100.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/rsh.pcap.out b/tests/cfgs/default/result/rsh.pcap.out index 5c29d1715cb..71f1bbb4b3f 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: 338 (169.00 diss/flow) +Num dissector calls: 340 (170.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 437c4735287..2e699d3766e 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: 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/rtp_tcp.pcapng.out b/tests/cfgs/default/result/rtp_tcp.pcapng.out new file mode 100644 index 00000000000..5e2840a8e1b --- /dev/null +++ b/tests/cfgs/default/result/rtp_tcp.pcapng.out @@ -0,0 +1,27 @@ +DPI Packets (TCP): 8 (8.00 pkts/flow) +Confidence DPI : 1 (flows) +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) +LRU cache tls_cert: 0/0/0 (insert/search/found) +LRU cache mining: 0/0/0 (insert/search/found) +LRU cache msteams: 0/0/0 (insert/search/found) +LRU cache stun_zoom: 0/0/0 (insert/search/found) +Automa host: 0/0 (search/found) +Automa domain: 0/0 (search/found) +Automa tls cert: 0/0 (search/found) +Automa risk mask: 0/0 (search/found) +Automa common alpns: 0/0 (search/found) +Patricia risk mask: 0/0 (search/found) +Patricia risk mask IPv6: 0/0 (search/found) +Patricia risk: 0/0 (search/found) +Patricia risk IPv6: 0/0 (search/found) +Patricia protocols: 2/0 (search/found) +Patricia protocols IPv6: 0/0 (search/found) + +RTP 37 23096 1 + +Acceptable 37 23096 1 + + 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] 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 83d27b5a16f..df0e4145d86 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: 187 (187.00 diss/flow) +Num dissector calls: 188 (188.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 7be241ac2b8..cc2d397a6e4 100644 --- a/tests/cfgs/default/result/s7comm.pcap.out +++ b/tests/cfgs/default/result/s7comm.pcap.out @@ -1,6 +1,6 @@ DPI Packets (TCP): 3 (3.00 pkts/flow) Confidence DPI : 1 (flows) -Num dissector calls: 187 (187.00 diss/flow) +Num dissector calls: 188 (188.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 2c3f123e65e..75320cd482d 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: 369 (184.50 diss/flow) +Num dissector calls: 371 (185.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 68541f4b21d..25df34e23bb 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: 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/smbv1.pcap.out b/tests/cfgs/default/result/smbv1.pcap.out index 0b93fc30735..c2a6612675d 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: 176 (176.00 diss/flow) +Num dissector calls: 177 (177.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 5971b9c4e19..3d9a6b06a7c 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: 73 (73.00 diss/flow) +Num dissector calls: 74 (74.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 b6c0dcb4bae..c5344819f36 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: 173 (86.50 diss/flow) +Num dissector calls: 174 (87.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.pcap.out b/tests/cfgs/default/result/smtp.pcap.out index 6391ca088d6..456fa85cc3e 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: 214 (214.00 diss/flow) +Num dissector calls: 215 (215.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 fe9434267ce..54f4601f94e 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: 411 (137.00 diss/flow) +Num dissector calls: 413 (137.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/socks.pcap.out b/tests/cfgs/default/result/socks.pcap.out index 54588900aa2..c5ad1fb340e 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: 603 (150.75 diss/flow) +Num dissector calls: 607 (151.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 121bd963acc..3f807b3af6f 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: 1664 (32.00 diss/flow) +Num dissector calls: 1667 (32.06 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 49f1e9318db..d5e2792356a 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: 756 (22.24 diss/flow) +Num dissector calls: 764 (22.47 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 f7b7f1318c6..b99434b4798 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: 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/tencent_games.pcap.out b/tests/cfgs/default/result/tencent_games.pcap.out index 11b10827a0e..74eba31ac76 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: 568 (142.00 diss/flow) +Num dissector calls: 572 (143.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 c0db7a042ae..e0cdd5bf102 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: 292 (146.00 diss/flow) +Num dissector calls: 294 (147.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 bed4db40a24..9e834261bbc 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: 1318 (219.67 diss/flow) +Num dissector calls: 1324 (220.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 2dcd7132e66..99c916e304f 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: 218 (109.00 diss/flow) +Num dissector calls: 219 (109.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/tinc.pcap.out b/tests/cfgs/default/result/tinc.pcap.out index 042a6c03eb5..1c8d20c8f2f 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: 527 (131.75 diss/flow) +Num dissector calls: 529 (132.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/tls-appdata.pcap.out b/tests/cfgs/default/result/tls-appdata.pcap.out index f24b2b9f65e..06f35a38210 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: 151 (75.50 diss/flow) +Num dissector calls: 152 (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/tls_certificate_too_long.pcap.out b/tests/cfgs/default/result/tls_certificate_too_long.pcap.out index 4a2368d3615..2d4f4a782c9 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: 640 (18.29 diss/flow) +Num dissector calls: 643 (18.37 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 b041ab5b779..a5232745ff6 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: 246 (246.00 diss/flow) +Num dissector calls: 247 (247.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 66c1d408c66..6cde56c7f7c 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: 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/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 086ac61f0e1..a2538b6e410 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: 150 (150.00 diss/flow) +Num dissector calls: 151 (151.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 7398030ff78..dea0a0d1c3a 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: 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/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 017f3767160..2d3c7338549 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: 109 (36.33 diss/flow) +Num dissector calls: 110 (36.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/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 1238de1e058..7fab973dc1b 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: 312 (156.00 diss/flow) +Num dissector calls: 314 (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/wa_video.pcap.out b/tests/cfgs/default/result/wa_video.pcap.out index f3510bd6d53..e355effe4c2 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: 369 (26.36 diss/flow) +Num dissector calls: 370 (26.43 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 5290234f531..2273dea1336 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: 360 (12.86 diss/flow) +Num dissector calls: 362 (12.93 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 6198b42594b..cce1ce27d84 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: 385 (11.67 diss/flow) +Num dissector calls: 387 (11.73 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 f7eca23cf75..985af458377 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: 91 (91.00 diss/flow) +Num dissector calls: 92 (92.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 f84f407fb5d..d242625b00f 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: 322 (3.13 diss/flow) +Num dissector calls: 323 (3.14 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 df3ba90f028..3032030d93a 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: 14104 (164.00 diss/flow) +Num dissector calls: 14190 (165.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 ee4857b39de..87c872cde92 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: 281 (4.93 diss/flow) +Num dissector calls: 283 (4.96 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 826854356e2..4637bd05fb0 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: 296 (32.89 diss/flow) +Num dissector calls: 298 (33.11 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 b53da908c8e..0e27c73cfdd 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: 408 (31.38 diss/flow) +Num dissector calls: 413 (31.77 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 91577dd73eb..876bda44b23 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: 202 (67.33 diss/flow) +Num dissector calls: 203 (67.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/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 3497989a799..97c6f25ea94 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: 615 (87.86 diss/flow) +Num dissector calls: 621 (88.71 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 48dbb1547e3..aeaf3635781 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: 469 (234.50 diss/flow) +Num dissector calls: 471 (235.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 c2d51eae3ee..e20e377a293 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: 1021 (30.03 diss/flow) +Num dissector calls: 1023 (30.09 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 9cdfd8eb083..07e384b5cef 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: 568 (94.67 diss/flow) +Num dissector calls: 571 (95.17 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 f49de9eccf3..2a04030e49f 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: 402 (134.00 diss/flow) +Num dissector calls: 404 (134.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/enable_payload_stat/result/1kxun.pcap.out b/tests/cfgs/enable_payload_stat/result/1kxun.pcap.out index dee717d8515..ab93f1ecd23 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: 4923 (24.99 diss/flow) +Num dissector calls: 4926 (25.01 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 6e42547512b..a6b6a0b0982 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: 4923 (24.99 diss/flow) +Num dissector calls: 4926 (25.01 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 cea9fe74111..1ee2f86dfe8 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: 756 (22.24 diss/flow) +Num dissector calls: 764 (22.47 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)