From 3de76812d978060c433864c2f72de113746d70e8 Mon Sep 17 00:00:00 2001 From: Ivan Nardi <12729895+IvanNardi@users.noreply.github.com> Date: Fri, 23 Dec 2022 10:04:08 +0100 Subject: [PATCH] Remove some old protocols (#1832) These protocols: * have been addeded in the OpenDPI era * have never been updated since then * we don't have any pcap examples [*] If (and it is a big if...) some of these protocols are still somehow used and if someone is still interested in them, we can probably re-add them starting from scratch (because the current detection rules are probably outdated) Protocols removed: DIRECT_DOWNLOAD_LINK, APPLEJUICE, DIRECTCONNECT, OPENFT, FASTTRACK, SHOUTCAST, THUNDER, AYIYA, STEALTHNET, FIESTA, FLORENSIA, AIMINI, SOPCAST PPSTREAM dissector works (...) only on UDP. [*]: with do have an AIMINI test pcap but it was some trivial http traffic detected only by hostname matching, on domains no more available... --- src/include/ndpi_protocol_ids.h | 26 +- src/include/ndpi_protocols.h | 12 - src/include/ndpi_typedefs.h | 21 - src/lib/ndpi_main.c | 97 +-- src/lib/protocols/aimini.c | 270 ------- src/lib/protocols/applejuice.c | 67 -- src/lib/protocols/ayiya.c | 87 --- src/lib/protocols/directconnect.c | 207 ----- src/lib/protocols/directdownloadlink.c | 726 ------------------ src/lib/protocols/fasttrack.c | 95 --- src/lib/protocols/fiesta.c | 105 --- src/lib/protocols/florensia.c | 130 ---- src/lib/protocols/openft.c | 67 -- src/lib/protocols/ppstream.c | 2 +- src/lib/protocols/shoutcast.c | 118 --- src/lib/protocols/sopcast.c | 223 ------ src/lib/protocols/stealthnet.c | 69 -- src/lib/protocols/thunder.c | 193 ----- tests/pcap/aimini-http.pcap | Bin 91784 -> 0 bytes tests/result/1kxun.pcap.out | 2 +- tests/result/443-chrome.pcap.out | 2 +- tests/result/443-opvn.pcap.out | 2 +- tests/result/4in4tunnel.pcap.out | 2 +- tests/result/6in4tunnel.pcap.out | 2 +- tests/result/6in6tunnel.pcap.out | 2 +- tests/result/EAQ.pcap.out | 2 +- tests/result/KakaoTalk_chat.pcap.out | 2 +- tests/result/KakaoTalk_talk.pcap.out | 2 +- tests/result/Oscar.pcap.out | 2 +- tests/result/WebattackRCE.pcap.out | 2 +- tests/result/WebattackSQLinj.pcap.out | 2 +- tests/result/WebattackXSS.pcap.out | 2 +- tests/result/activision.pcap.out | 2 +- tests/result/agora-sd-rtn.pcap.out | 2 +- tests/result/aimini-http.pcap.out | 28 - tests/result/alexa-app.pcapng.out | 2 +- tests/result/alicloud.pcap.out | 2 +- tests/result/amqp.pcap.out | 2 +- tests/result/android.pcap.out | 2 +- tests/result/anyconnect-vpn.pcap.out | 2 +- tests/result/avast.pcap.out | 2 +- tests/result/avast_securedns.pcapng.out | 2 +- tests/result/bittorrent.pcap.out | 2 +- tests/result/bittorrent_utp.pcap.out | 2 +- tests/result/bot.pcap.out | 2 +- tests/result/cassandra.pcap.out | 2 +- tests/result/cloudflare-warp.pcap.out | 2 +- tests/result/coap_mqtt.pcap.out | 2 +- tests/result/collectd.pcap.out | 2 +- tests/result/corba.pcap.out | 2 +- tests/result/crynet.pcap.out | 2 +- tests/result/dcerpc.pcap.out | 2 +- tests/result/dhcp-fuzz.pcapng.out | 2 +- tests/result/discord.pcap.out | 2 +- .../dnscrypt-v1-and-resolver-pings.pcap.out | 2 +- tests/result/dnscrypt-v2.pcap.out | 2 +- .../dnscrypt_skype_false_positive.pcapng.out | 2 +- tests/result/doq.pcapng.out | 2 +- tests/result/doq_adguard.pcapng.out | 2 +- tests/result/drda_db2.pcap.out | 2 +- tests/result/elasticsearch.pcap.out | 2 +- tests/result/emotet.pcap.out | 2 +- tests/result/ethereum.pcap.out | 2 +- tests/result/exe_download.pcap.out | 2 +- tests/result/exe_download_as_png.pcap.out | 2 +- tests/result/fastcgi.pcap.out | 2 +- tests/result/fix.pcap.out | 2 +- tests/result/fix2.pcap.out | 2 +- tests/result/ftp-start-tls.pcap.out | 2 +- tests/result/ftp.pcap.out | 2 +- tests/result/ftp_failed.pcap.out | 2 +- tests/result/fuzz-2006-06-26-2594.pcap.out | 2 +- tests/result/fuzz-2006-09-29-28586.pcap.out | 2 +- tests/result/fuzz-2020-02-16-11740.pcap.out | 2 +- tests/result/fuzz-2021-10-13.pcap.out | 2 +- tests/result/genshin-impact.pcap.out | 2 +- tests/result/gnutella.pcap.out | 2 +- tests/result/google_ssl.pcap.out | 2 +- tests/result/gtp_false_positive.pcapng.out | 2 +- tests/result/gtp_prime.pcapng.out | 2 +- tests/result/h323.pcap.out | 2 +- tests/result/hangout.pcap.out | 2 +- tests/result/hpvirtgrp.pcap.out | 2 +- tests/result/hsrp2_ipv6.pcapng.out | 2 +- .../http-crash-content-disposition.pcap.out | 2 +- tests/result/http-lines-split.pcap.out | 2 +- tests/result/http-manipulated.pcap.out | 2 +- tests/result/http_auth.pcap.out | 2 +- .../http_guessed_host_and_guessed.pcapng.out | 2 +- tests/result/http_ipv6.pcap.out | 2 +- tests/result/http_on_sip_port.pcap.out | 2 +- tests/result/i3d.pcap.out | 2 +- tests/result/imap-starttls.pcap.out | 2 +- tests/result/imap.pcap.out | 2 +- tests/result/imo.pcap.out | 2 +- tests/result/instagram.pcap.out | 2 +- tests/result/iphone.pcap.out | 2 +- tests/result/ipp.pcap.out | 2 +- tests/result/irc.pcap.out | 2 +- tests/result/jabber.pcap.out | 2 +- tests/result/kerberos.pcap.out | 2 +- tests/result/kismet.pcap.out | 2 +- tests/result/kontiki.pcap.out | 2 +- tests/result/line.pcap.out | 2 +- tests/result/lisp_registration.pcap.out | 2 +- tests/result/log4j-webapp-exploit.pcap.out | 2 +- tests/result/lru_ipv6_caches.pcapng.out | 2 +- tests/result/malware.pcap.out | 2 +- tests/result/memcached.cap.out | 2 +- tests/result/mgcp.pcapng.out | 2 +- tests/result/monero.pcap.out | 2 +- tests/result/mongo_false_positive.pcapng.out | 2 +- tests/result/mongodb.pcap.out | 2 +- tests/result/mpeg-dash.pcap.out | 2 +- tests/result/mpeg.pcap.out | 2 +- tests/result/mpegts.pcap.out | 2 +- tests/result/mssql_tds.pcap.out | 2 +- tests/result/nats.pcap.out | 2 +- ...match_string_subprotocol__error.pcapng.out | 2 +- tests/result/nest_log_sink.pcap.out | 2 +- tests/result/netbios.pcap.out | 2 +- tests/result/netflix.pcap.out | 2 +- tests/result/netflowv9.pcap.out | 2 +- tests/result/nfsv2.pcap.out | 2 +- tests/result/nfsv3.pcap.out | 2 +- tests/result/nintendo.pcap.out | 2 +- tests/result/nntp.pcap.out | 2 +- tests/result/ocs.pcap.out | 2 +- tests/result/ocsp.pcapng.out | 2 +- tests/result/ookla.pcap.out | 2 +- tests/result/openvpn.pcap.out | 2 +- tests/result/oracle12.pcapng.out | 2 +- tests/result/pgsql.pcap.out | 2 +- tests/result/pop3.pcap.out | 2 +- tests/result/pop3_stls.pcap.out | 2 +- tests/result/pps.pcap.out | 2 +- tests/result/pptp.pcap.out | 2 +- tests/result/punycode-idn.pcap.out | 2 +- tests/result/quic-33.pcapng.out | 2 +- tests/result/quic-34.pcap.out | 2 +- tests/result/quic-fuzz-overflow.pcapng.out | 2 +- tests/result/quic-v2-01.pcapng.out | 2 +- tests/result/quic.pcap.out | 2 +- tests/result/quic_0RTT.pcap.out | 2 +- ...ic_frags_ch_in_multiple_packets.pcapng.out | 2 +- tests/result/quic_interop_V.pcapng.out | 2 +- tests/result/quickplay.pcap.out | 2 +- tests/result/radius_false_positive.pcapng.out | 2 +- tests/result/raknet.pcap.out | 2 +- tests/result/reasm_crash_anon.pcapng.out | 2 +- tests/result/reasm_segv_anon.pcapng.out | 2 +- tests/result/riotgames.pcap.out | 2 +- tests/result/rsh.pcap.out | 2 +- tests/result/rsync.pcap.out | 2 +- tests/result/rtmp.pcap.out | 2 +- tests/result/rx.pcap.out | 2 +- tests/result/sflow.pcap.out | 2 +- tests/result/sip.pcap.out | 2 +- tests/result/sip_hello.pcapng.out | 2 +- tests/result/sites.pcapng.out | 2 +- tests/result/skype.pcap.out | 2 +- tests/result/skype_no_unknown.pcap.out | 2 +- tests/result/skype_udp.pcap.out | 2 +- tests/result/smb_frags.pcap.out | 2 +- tests/result/smbv1.pcap.out | 2 +- tests/result/smpp_in_general.pcap.out | 2 +- tests/result/smtp-starttls.pcap.out | 2 +- tests/result/smtp.pcap.out | 2 +- tests/result/soap.pcap.out | 2 +- tests/result/socks-http-example.pcap.out | 2 +- tests/result/softether.pcap.out | 2 +- tests/result/someip-tp.pcap.out | 2 +- .../result/someip-udp-method-call.pcapng.out | 2 +- tests/result/sql_injection.pcap.out | 2 +- tests/result/ssdp-m-search-ua.pcap.out | 2 +- tests/result/ssdp-m-search.pcap.out | 2 +- tests/result/starcraft_battle.pcap.out | 2 +- tests/result/steam.pcap.out | 2 +- .../steam_datagram_relay_ping.pcapng.out | 2 +- tests/result/stun.pcap.out | 2 +- tests/result/stun_signal.pcapng.out | 2 +- tests/result/syncthing.pcap.out | 2 +- tests/result/syslog.pcap.out | 2 +- .../targusdataspeed_false_positives.pcap.out | 2 +- tests/result/teams.pcap.out | 2 +- tests/result/teamspeak3.pcap.out | 2 +- tests/result/teamviewer.pcap.out | 2 +- tests/result/telegram.pcap.out | 2 +- tests/result/telnet.pcap.out | 2 +- tests/result/tftp.pcap.out | 2 +- tests/result/threema.pcap.out | 2 +- tests/result/tinc.pcap.out | 2 +- tests/result/tls-appdata.pcap.out | 2 +- .../result/tls_certificate_too_long.pcap.out | 2 +- tests/result/tls_false_positives.pcapng.out | 2 +- tests/result/tls_invalid_reads.pcap.out | 2 +- tests/result/tls_missing_ch_frag.pcap.out | 2 +- tests/result/toca-boca.pcap.out | 2 +- tests/result/tor.pcap.out | 2 +- tests/result/trickbot.pcap.out | 2 +- tests/result/ultrasurf.pcap.out | 2 +- tests/result/viber.pcap.out | 2 +- tests/result/vnc.pcap.out | 2 +- tests/result/wa_video.pcap.out | 2 +- tests/result/wa_voice.pcap.out | 2 +- tests/result/waze.pcap.out | 2 +- tests/result/webex.pcap.out | 2 +- tests/result/websocket.pcap.out | 2 +- tests/result/wechat.pcap.out | 2 +- tests/result/weibo.pcap.out | 2 +- tests/result/whatsapp.pcap.out | 2 +- tests/result/whatsapp_login_call.pcap.out | 2 +- tests/result/whatsapp_login_chat.pcap.out | 2 +- .../whatsapp_voice_and_message.pcap.out | 2 +- tests/result/whois.pcapng.out | 2 +- tests/result/windowsupdate_over_http.pcap.out | 2 +- tests/result/wireguard.pcap.out | 2 +- tests/result/wow.pcap.out | 2 +- tests/result/xiaomi.pcap.out | 2 +- tests/result/xss.pcap.out | 2 +- tests/result/z3950.pcapng.out | 2 +- tests/result/zattoo.pcap.out | 2 +- tests/result/zcash.pcap.out | 2 +- tests/result/zoom.pcap.out | 2 +- tests/result/zoom2.pcap.out | 2 +- tests/result/zoom_p2p.pcapng.out | 2 +- windows/nDPI.vcxproj | 13 - windows/nDPI.vcxproj.filters | 13 - 228 files changed, 249 insertions(+), 2732 deletions(-) delete mode 100644 src/lib/protocols/aimini.c delete mode 100644 src/lib/protocols/applejuice.c delete mode 100644 src/lib/protocols/ayiya.c delete mode 100644 src/lib/protocols/directconnect.c delete mode 100644 src/lib/protocols/directdownloadlink.c delete mode 100644 src/lib/protocols/fasttrack.c delete mode 100644 src/lib/protocols/fiesta.c delete mode 100644 src/lib/protocols/florensia.c delete mode 100644 src/lib/protocols/openft.c delete mode 100644 src/lib/protocols/shoutcast.c delete mode 100644 src/lib/protocols/sopcast.c delete mode 100644 src/lib/protocols/stealthnet.c delete mode 100644 src/lib/protocols/thunder.c delete mode 100644 tests/pcap/aimini-http.pcap delete mode 100644 tests/result/aimini-http.pcap.out diff --git a/src/include/ndpi_protocol_ids.h b/src/include/ndpi_protocol_ids.h index 894b8c1f9..856778dc8 100644 --- a/src/include/ndpi_protocol_ids.h +++ b/src/include/ndpi_protocol_ids.h @@ -50,10 +50,10 @@ typedef enum { NDPI_PROTOCOL_POSTGRES = 19, NDPI_PROTOCOL_MYSQL = 20, NDPI_PROTOCOL_MS_OUTLOOK = 21, /* Hotmail / Microsoft Outlook / Exchange */ - NDPI_PROTOCOL_DIRECT_DOWNLOAD_LINK = 22, + NDPI_PROTOCOL_FREE_22 = 22, /* FREE */ NDPI_PROTOCOL_MAIL_POPS = 23, - NDPI_PROTOCOL_APPLEJUICE = 24, - NDPI_PROTOCOL_DIRECTCONNECT = 25, + NDPI_PROTOCOL_FREE_24 = 24, /* FREE */ + NDPI_PROTOCOL_FREE_25 = 25, /* FREE */ NDPI_PROTOCOL_NTOP = 26, NDPI_PROTOCOL_COAP = 27, NDPI_PROTOCOL_VMWARE = 28, @@ -61,8 +61,8 @@ typedef enum { NDPI_PROTOCOL_DTLS = 30, NDPI_PROTOCOL_UBNTAC2 = 31, /* Ubiquity UBNT AirControl = 2 */ NDPI_PROTOCOL_KONTIKI = 32, - NDPI_PROTOCOL_OPENFT = 33, - NDPI_PROTOCOL_FASTTRACK = 34, + NDPI_PROTOCOL_FREE_33 = 33, /* FREE */ + NDPI_PROTOCOL_FREE_34 = 34, /* FREE */ NDPI_PROTOCOL_GNUTELLA = 35, NDPI_PROTOCOL_EDONKEY = 36, NDPI_PROTOCOL_BITTORRENT = 37, @@ -84,17 +84,17 @@ typedef enum { NDPI_PROTOCOL_CPHA = 53, NDPI_PROTOCOL_PPSTREAM = 54, NDPI_PROTOCOL_ZATTOO = 55, - NDPI_PROTOCOL_SHOUTCAST = 56, - NDPI_PROTOCOL_SOPCAST = 57, + NDPI_PROTOCOL_FREE_56 = 56, /* FREE */ + NDPI_PROTOCOL_FREE_57 = 57, /* FREE */ NDPI_PROTOCOL_DISCORD = 58, NDPI_PROTOCOL_TVUPLAYER = 59, NDPI_PROTOCOL_MONGODB = 60, NDPI_PROTOCOL_PLURALSIGHT = 61, - NDPI_PROTOCOL_THUNDER = 62, + NDPI_PROTOCOL_FREE_62 = 62, /* FREE */ NDPI_PROTOCOL_OCSP = 63, NDPI_PROTOCOL_VXLAN = 64, NDPI_PROTOCOL_IRC = 65, - NDPI_PROTOCOL_AYIYA = 66, + NDPI_PROTOCOL_FREE_66 = 66, /* FREE */ NDPI_PROTOCOL_JABBER = 67, NDPI_PROTOCOL_NATS = 68, NDPI_PROTOCOL_AMONG_US = 69, @@ -126,8 +126,8 @@ typedef enum { NDPI_PROTOCOL_IAX = 95, NDPI_PROTOCOL_TFTP = 96, NDPI_PROTOCOL_AFP = 97, - NDPI_PROTOCOL_STEALTHNET = 98, - NDPI_PROTOCOL_AIMINI = 99, + NDPI_PROTOCOL_FREE_98 = 98, /* FREE */ + NDPI_PROTOCOL_FREE_99 = 99, /* FREE */ NDPI_PROTOCOL_SIP = 100, NDPI_PROTOCOL_TRUPHONE = 101, NDPI_PROTOCOL_IP_ICMPV6 = 102, @@ -135,8 +135,8 @@ typedef enum { NDPI_PROTOCOL_ARMAGETRON = 104, NDPI_PROTOCOL_CROSSFIRE = 105, NDPI_PROTOCOL_DOFUS = 106, - NDPI_PROTOCOL_FIESTA = 107, - NDPI_PROTOCOL_FLORENSIA = 108, + NDPI_PROTOCOL_FREE_107 = 107, /* FREE */ + NDPI_PROTOCOL_FREE_108 = 108, /* FREE */ NDPI_PROTOCOL_GUILDWARS = 109, NDPI_PROTOCOL_AMAZON_ALEXA = 110, NDPI_PROTOCOL_KERBEROS = 111, diff --git a/src/include/ndpi_protocols.h b/src/include/ndpi_protocols.h index be07c517c..d489b4cdf 100644 --- a/src/include/ndpi_protocols.h +++ b/src/include/ndpi_protocols.h @@ -53,10 +53,7 @@ void ndpi_search_tcp_or_udp(struct ndpi_detection_module_struct *ndpi_struct, st void init_diameter_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id); void init_afp_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id); -void init_aimini_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id); -void init_applejuice_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id); void init_armagetron_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id); -void init_ayiya_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id); void init_amqp_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id); void init_bgp_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id); void init_bittorrent_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id); @@ -71,16 +68,11 @@ void init_crossfire_dissector(struct ndpi_detection_module_struct *ndpi_struct, void init_dcerpc_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id); void init_dhcp_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id); void init_dhcpv6_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id); -void init_directconnect_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id); void init_dns_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id); void init_dofus_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id); -void init_directdownloadlink_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id); void init_dropbox_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id); void init_eaq_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id); void init_edonkey_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id); -void init_fasttrack_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id); -void init_fiesta_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id); -void init_florensia_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id); void init_ftp_control_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id); void init_ftp_data_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id); void init_gnutella_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id); @@ -118,7 +110,6 @@ void init_nfs_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int3 void init_noe_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id); void init_non_tcp_udp_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id); void init_ntp_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id); -void init_openft_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id); void init_openvpn_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id); void init_oracle_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id); void init_postgres_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id); @@ -144,13 +135,11 @@ void init_skype_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_in void init_smb_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id); void init_snmp_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id); void init_socrates_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id); -void init_sopcast_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id); void init_socks_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id); void init_spotify_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id); void init_ssh_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id); void init_tls_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id); void init_starcraft_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id); -void init_stealthnet_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id); void init_steam_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id); void init_stun_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id); void init_syslog_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id); @@ -160,7 +149,6 @@ void init_teamviewer_dissector(struct ndpi_detection_module_struct *ndpi_struct, void init_telegram_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id); void init_telnet_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id); void init_tftp_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id); -void init_thunder_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id); void init_tvuplayer_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id); void init_usenet_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id); void init_wsd_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id); diff --git a/src/include/ndpi_typedefs.h b/src/include/ndpi_typedefs.h index 093150407..d9de63d5e 100644 --- a/src/include/ndpi_typedefs.h +++ b/src/include/ndpi_typedefs.h @@ -730,15 +730,9 @@ struct ndpi_flow_tcp_struct { /* NDPI_PROTOCOL_DOFUS */ u_int32_t dofus_stage:1; - /* NDPI_PROTOCOL_FIESTA */ - u_int32_t fiesta_stage:2; - /* NDPI_PROTOCOL_WORLDOFWARCRAFT */ u_int32_t wow_stage:2; - /* NDPI_PROTOCOL_SHOUTCAST */ - u_int32_t shoutcast_stage:2; - /* NDPI_PROTOCOL_RTP */ u_int32_t rtp_special_packets_seen:1; @@ -761,9 +755,6 @@ struct ndpi_flow_tcp_struct { u_int8_t prev_zmq_pkt_len; u_char prev_zmq_pkt[10]; - /* NDPI_PROTOCOL_PPSTREAM */ - u_int32_t ppstream_stage:3; - /* NDPI_PROTOCOL_MEMCACHED */ u_int8_t memcached_matches; @@ -783,9 +774,6 @@ struct ndpi_flow_udp_struct { /* NDPI_PROTOCOL_TFTP */ u_int32_t tftp_stage:2; - /* NDPI_PROTOCOL_AIMINI */ - u_int32_t aimini_stage:5; - /* NDPI_PROTOCOL_XBOX */ u_int32_t xbox_stage:1; @@ -1533,9 +1521,6 @@ struct ndpi_flow_struct { u_int8_t bittorrent_stage; // can be 0 - 255 u_int8_t bt_check_performed : 1; - /* NDPI_PROTOCOL_DIRECTCONNECT */ - u_int8_t directconnect_stage:2; // 0 - 1 - /* NDPI_PROTOCOL_HTTP */ u_int8_t http_detected:1; @@ -1545,12 +1530,6 @@ struct ndpi_flow_struct { /* NDPI_PROTOCOL_ZATTOO */ u_int8_t zattoo_stage:3; - /* NDPI_PROTOCOL_THUNDER */ - u_int8_t thunder_stage:2; // 0 - 3 - - /* NDPI_PROTOCOL_FLORENSIA */ - u_int8_t florensia_stage:1; - /* NDPI_PROTOCOL_SOCKS */ u_int8_t socks5_stage:2, socks4_stage:2; // 0 - 3 diff --git a/src/lib/ndpi_main.c b/src/lib/ndpi_main.c index 97317a1c1..c67e7b2c8 100644 --- a/src/lib/ndpi_main.c +++ b/src/lib/ndpi_main.c @@ -1049,10 +1049,10 @@ static void ndpi_init_protocol_defaults(struct ndpi_detection_module_struct *ndp ndpi_build_default_ports(ports_a, 80, 0 /* ntop */, 0, 0, 0) /* TCP */, ndpi_build_default_ports(ports_b, 0, 0, 0, 0, 0) /* UDP */); ndpi_set_proto_subprotocols(ndpi_str, NDPI_PROTOCOL_HTTP, - NDPI_PROTOCOL_AIMINI, NDPI_PROTOCOL_CROSSFIRE, NDPI_PROTOCOL_SOAP, - NDPI_PROTOCOL_BITTORRENT, NDPI_PROTOCOL_DIRECT_DOWNLOAD_LINK, NDPI_PROTOCOL_GNUTELLA, + NDPI_PROTOCOL_CROSSFIRE, NDPI_PROTOCOL_SOAP, + NDPI_PROTOCOL_BITTORRENT, NDPI_PROTOCOL_GNUTELLA, NDPI_PROTOCOL_MAPLESTORY, NDPI_PROTOCOL_ZATTOO, NDPI_PROTOCOL_WORLDOFWARCRAFT, - NDPI_PROTOCOL_THUNDER, NDPI_PROTOCOL_IRC, + NDPI_PROTOCOL_IRC, NDPI_PROTOCOL_IPP, NDPI_PROTOCOL_MPEGDASH, NDPI_PROTOCOL_RTSP, @@ -1113,16 +1113,16 @@ static void ndpi_init_protocol_defaults(struct ndpi_detection_module_struct *ndp "MySQL", NDPI_PROTOCOL_CATEGORY_DATABASE, ndpi_build_default_ports(ports_a, 3306, 0, 0, 0, 0) /* TCP */, ndpi_build_default_ports(ports_b, 0, 0, 0, 0, 0) /* UDP */); - ndpi_set_proto_defaults(ndpi_str, 1 /* cleartext */, 0 /* nw proto */, NDPI_PROTOCOL_POTENTIALLY_DANGEROUS, NDPI_PROTOCOL_DIRECT_DOWNLOAD_LINK, - "Direct_Download_Link", NDPI_PROTOCOL_CATEGORY_DOWNLOAD_FT, + ndpi_set_proto_defaults(ndpi_str, 1 /* cleartext */, 0 /* nw proto */, NDPI_PROTOCOL_POTENTIALLY_DANGEROUS, NDPI_PROTOCOL_FREE_22, + "Free22", NDPI_PROTOCOL_CATEGORY_DOWNLOAD_FT, ndpi_build_default_ports(ports_a, 0, 0, 0, 0, 0) /* TCP */, ndpi_build_default_ports(ports_b, 0, 0, 0, 0, 0) /* UDP */); - ndpi_set_proto_defaults(ndpi_str, 1 /* cleartext */, 0 /* nw proto */, NDPI_PROTOCOL_POTENTIALLY_DANGEROUS, NDPI_PROTOCOL_APPLEJUICE, - "AppleJuice", NDPI_PROTOCOL_CATEGORY_DOWNLOAD_FT, + ndpi_set_proto_defaults(ndpi_str, 1 /* cleartext */, 0 /* nw proto */, NDPI_PROTOCOL_POTENTIALLY_DANGEROUS, NDPI_PROTOCOL_FREE_24, + "Free24", NDPI_PROTOCOL_CATEGORY_DOWNLOAD_FT, ndpi_build_default_ports(ports_a, 0, 0, 0, 0, 0) /* TCP */, ndpi_build_default_ports(ports_b, 0, 0, 0, 0, 0) /* UDP */); - ndpi_set_proto_defaults(ndpi_str, 1 /* cleartext */, 0 /* nw proto */, NDPI_PROTOCOL_POTENTIALLY_DANGEROUS, NDPI_PROTOCOL_DIRECTCONNECT, - "DirectConnect", NDPI_PROTOCOL_CATEGORY_DOWNLOAD_FT, + ndpi_set_proto_defaults(ndpi_str, 1 /* cleartext */, 0 /* nw proto */, NDPI_PROTOCOL_POTENTIALLY_DANGEROUS, NDPI_PROTOCOL_FREE_25, + "Free25", NDPI_PROTOCOL_CATEGORY_DOWNLOAD_FT, ndpi_build_default_ports(ports_a, 0, 0, 0, 0, 0) /* TCP */, ndpi_build_default_ports(ports_b, 0, 0, 0, 0, 0) /* UDP */); ndpi_set_proto_defaults(ndpi_str, 0 /* encrypted */, 0 /* nw proto */, NDPI_PROTOCOL_ACCEPTABLE, NDPI_PROTOCOL_NATS, @@ -1145,12 +1145,12 @@ static void ndpi_init_protocol_defaults(struct ndpi_detection_module_struct *ndp "Kontiki", NDPI_PROTOCOL_CATEGORY_MEDIA, ndpi_build_default_ports(ports_a, 0, 0, 0, 0, 0) /* TCP */, ndpi_build_default_ports(ports_b, 0, 0, 0, 0, 0) /* UDP */); - ndpi_set_proto_defaults(ndpi_str, 1 /* cleartext */, 0 /* nw proto */, NDPI_PROTOCOL_POTENTIALLY_DANGEROUS, NDPI_PROTOCOL_OPENFT, - "OpenFT", NDPI_PROTOCOL_CATEGORY_DOWNLOAD_FT, + ndpi_set_proto_defaults(ndpi_str, 1 /* cleartext */, 0 /* nw proto */, NDPI_PROTOCOL_POTENTIALLY_DANGEROUS, NDPI_PROTOCOL_FREE_33, + "Free33", NDPI_PROTOCOL_CATEGORY_DOWNLOAD_FT, ndpi_build_default_ports(ports_a, 0, 0, 0, 0, 0) /* TCP */, ndpi_build_default_ports(ports_b, 0, 0, 0, 0, 0) /* UDP */); - ndpi_set_proto_defaults(ndpi_str, 1 /* cleartext */, 0 /* nw proto */, NDPI_PROTOCOL_POTENTIALLY_DANGEROUS, NDPI_PROTOCOL_FASTTRACK, - "FastTrack", NDPI_PROTOCOL_CATEGORY_DOWNLOAD_FT, + ndpi_set_proto_defaults(ndpi_str, 1 /* cleartext */, 0 /* nw proto */, NDPI_PROTOCOL_POTENTIALLY_DANGEROUS, NDPI_PROTOCOL_FREE_34, + "Free34", NDPI_PROTOCOL_CATEGORY_DOWNLOAD_FT, ndpi_build_default_ports(ports_a, 0, 0, 0, 0, 0) /* TCP */, ndpi_build_default_ports(ports_b, 0, 0, 0, 0, 0) /* UDP */); ndpi_set_proto_defaults(ndpi_str, 1 /* cleartext */, 0 /* nw proto */, NDPI_PROTOCOL_POTENTIALLY_DANGEROUS, NDPI_PROTOCOL_GNUTELLA, @@ -1265,12 +1265,12 @@ static void ndpi_init_protocol_defaults(struct ndpi_detection_module_struct *ndp "Zattoo", NDPI_PROTOCOL_CATEGORY_VIDEO, ndpi_build_default_ports(ports_a, 0, 0, 0, 0, 0) /* TCP */, ndpi_build_default_ports(ports_b, 0, 0, 0, 0, 0) /* UDP */); - ndpi_set_proto_defaults(ndpi_str, 1 /* cleartext */, 0 /* nw proto */, NDPI_PROTOCOL_FUN, NDPI_PROTOCOL_SHOUTCAST, - "ShoutCast", NDPI_PROTOCOL_CATEGORY_MUSIC, + ndpi_set_proto_defaults(ndpi_str, 1 /* cleartext */, 0 /* nw proto */, NDPI_PROTOCOL_FUN, NDPI_PROTOCOL_FREE_56, + "Free56", NDPI_PROTOCOL_CATEGORY_MUSIC, ndpi_build_default_ports(ports_a, 0, 0, 0, 0, 0) /* TCP */, ndpi_build_default_ports(ports_b, 0, 0, 0, 0, 0) /* UDP */); - ndpi_set_proto_defaults(ndpi_str, 1 /* cleartext */, 0 /* nw proto */, NDPI_PROTOCOL_FUN, NDPI_PROTOCOL_SOPCAST, - "Sopcast", NDPI_PROTOCOL_CATEGORY_VIDEO, + ndpi_set_proto_defaults(ndpi_str, 1 /* cleartext */, 0 /* nw proto */, NDPI_PROTOCOL_FUN, NDPI_PROTOCOL_FREE_57, + "Free57", NDPI_PROTOCOL_CATEGORY_VIDEO, ndpi_build_default_ports(ports_a, 0, 0, 0, 0, 0) /* TCP */, ndpi_build_default_ports(ports_b, 0, 0, 0, 0, 0) /* UDP */); ndpi_set_proto_defaults(ndpi_str, 0 /* encrypted */, 1 /* app proto */, NDPI_PROTOCOL_FUN, NDPI_PROTOCOL_DISCORD, @@ -1285,8 +1285,8 @@ static void ndpi_init_protocol_defaults(struct ndpi_detection_module_struct *ndp "Pluralsight", NDPI_PROTOCOL_CATEGORY_VIDEO, ndpi_build_default_ports(ports_a, 0, 0, 0, 0, 0) /* TCP */, ndpi_build_default_ports(ports_b, 0, 0, 0, 0, 0) /* UDP */); - ndpi_set_proto_defaults(ndpi_str, 1 /* cleartext */, 1 /* app proto */, NDPI_PROTOCOL_FUN, NDPI_PROTOCOL_THUNDER, - "Thunder", NDPI_PROTOCOL_CATEGORY_DOWNLOAD_FT, + ndpi_set_proto_defaults(ndpi_str, 1 /* cleartext */, 1 /* app proto */, NDPI_PROTOCOL_FUN, NDPI_PROTOCOL_FREE_62, + "Free62", NDPI_PROTOCOL_CATEGORY_DOWNLOAD_FT, ndpi_build_default_ports(ports_a, 0, 0, 0, 0, 0) /* TCP */, ndpi_build_default_ports(ports_b, 0, 0, 0, 0, 0) /* UDP */); ndpi_set_proto_defaults(ndpi_str, 1 /* cleartext */, 1 /* app proto */, NDPI_PROTOCOL_SAFE, NDPI_PROTOCOL_OCSP, @@ -1301,8 +1301,8 @@ static void ndpi_init_protocol_defaults(struct ndpi_detection_module_struct *ndp "IRC", NDPI_PROTOCOL_CATEGORY_CHAT, ndpi_build_default_ports(ports_a, 194, 0, 0, 0, 0) /* TCP */, ndpi_build_default_ports(ports_b, 194, 0, 0, 0, 0) /* UDP */); - ndpi_set_proto_defaults(ndpi_str, 1 /* cleartext */, 0 /* nw proto */, NDPI_PROTOCOL_ACCEPTABLE, NDPI_PROTOCOL_AYIYA, - "Ayiya", NDPI_PROTOCOL_CATEGORY_NETWORK, + ndpi_set_proto_defaults(ndpi_str, 1 /* cleartext */, 0 /* nw proto */, NDPI_PROTOCOL_ACCEPTABLE, NDPI_PROTOCOL_FREE_66, + "Free66", NDPI_PROTOCOL_CATEGORY_NETWORK, ndpi_build_default_ports(ports_a, 0, 0, 0, 0, 0) /* TCP */, ndpi_build_default_ports(ports_b, 5072, 0, 0, 0, 0) /* UDP */); ndpi_set_proto_defaults(ndpi_str, 1 /* cleartext */, 0 /* nw proto */, NDPI_PROTOCOL_ACCEPTABLE, NDPI_PROTOCOL_JABBER, @@ -1447,12 +1447,12 @@ static void ndpi_init_protocol_defaults(struct ndpi_detection_module_struct *ndp "CHECKMK", NDPI_PROTOCOL_CATEGORY_DATA_TRANSFER, ndpi_build_default_ports(ports_a, 6556, 0, 0, 0, 0) /* TCP */, ndpi_build_default_ports(ports_b, 0, 0, 0, 0, 0) /* UDP */); - ndpi_set_proto_defaults(ndpi_str, 1 /* cleartext */, 0 /* nw proto */, NDPI_PROTOCOL_POTENTIALLY_DANGEROUS, NDPI_PROTOCOL_STEALTHNET, - "Stealthnet", NDPI_PROTOCOL_CATEGORY_DOWNLOAD_FT, + ndpi_set_proto_defaults(ndpi_str, 1 /* cleartext */, 0 /* nw proto */, NDPI_PROTOCOL_POTENTIALLY_DANGEROUS, NDPI_PROTOCOL_FREE_98, + "Free98", NDPI_PROTOCOL_CATEGORY_DOWNLOAD_FT, ndpi_build_default_ports(ports_a, 0, 0, 0, 0, 0) /* TCP */, ndpi_build_default_ports(ports_b, 0, 0, 0, 0, 0) /* UDP */); - ndpi_set_proto_defaults(ndpi_str, 1 /* cleartext */, 1 /* app proto */, NDPI_PROTOCOL_FUN, NDPI_PROTOCOL_AIMINI, - "Aimini", NDPI_PROTOCOL_CATEGORY_DOWNLOAD_FT, + ndpi_set_proto_defaults(ndpi_str, 1 /* cleartext */, 1 /* app proto */, NDPI_PROTOCOL_FUN, NDPI_PROTOCOL_FREE_99, + "Free99", NDPI_PROTOCOL_CATEGORY_DOWNLOAD_FT, ndpi_build_default_ports(ports_a, 0, 0, 0, 0, 0) /* TCP */, ndpi_build_default_ports(ports_b, 0, 0, 0, 0, 0) /* UDP */); ndpi_set_proto_defaults(ndpi_str, 1 /* cleartext */, 0 /* nw proto */, NDPI_PROTOCOL_ACCEPTABLE, NDPI_PROTOCOL_SIP, @@ -1483,12 +1483,12 @@ static void ndpi_init_protocol_defaults(struct ndpi_detection_module_struct *ndp "Dofus", NDPI_PROTOCOL_CATEGORY_GAME, ndpi_build_default_ports(ports_a, 0, 0, 0, 0, 0) /* TCP */, ndpi_build_default_ports(ports_b, 0, 0, 0, 0, 0) /* UDP */); - ndpi_set_proto_defaults(ndpi_str, 1 /* cleartext */, 0 /* nw proto */, NDPI_PROTOCOL_FUN, NDPI_PROTOCOL_FIESTA, - "Fiesta", NDPI_PROTOCOL_CATEGORY_GAME, + ndpi_set_proto_defaults(ndpi_str, 1 /* cleartext */, 0 /* nw proto */, NDPI_PROTOCOL_FUN, NDPI_PROTOCOL_FREE_107, + "Free107", NDPI_PROTOCOL_CATEGORY_GAME, ndpi_build_default_ports(ports_a, 0, 0, 0, 0, 0) /* TCP */, ndpi_build_default_ports(ports_b, 0, 0, 0, 0, 0) /* UDP */); - ndpi_set_proto_defaults(ndpi_str, 1 /* cleartext */, 0 /* nw proto */, NDPI_PROTOCOL_FUN, NDPI_PROTOCOL_FLORENSIA, - "Florensia", NDPI_PROTOCOL_CATEGORY_GAME, + ndpi_set_proto_defaults(ndpi_str, 1 /* cleartext */, 0 /* nw proto */, NDPI_PROTOCOL_FUN, NDPI_PROTOCOL_FREE_108, + "Free108", NDPI_PROTOCOL_CATEGORY_GAME, ndpi_build_default_ports(ports_a, 0, 0, 0, 0, 0) /* TCP */, ndpi_build_default_ports(ports_b, 0, 0, 0, 0, 0) /* UDP */); ndpi_set_proto_defaults(ndpi_str, 1 /* cleartext */, 0 /* nw proto */, NDPI_PROTOCOL_FUN, NDPI_PROTOCOL_GUILDWARS, @@ -4225,21 +4225,12 @@ static int ndpi_callback_init(struct ndpi_detection_module_struct *ndpi_str) { /* EDONKEY */ init_edonkey_dissector(ndpi_str, &a); - /* FASTTRACK */ - init_fasttrack_dissector(ndpi_str, &a); - /* GNUTELLA */ init_gnutella_dissector(ndpi_str, &a); - /* DIRECTCONNECT */ - init_directconnect_dissector(ndpi_str, &a); - /* NATS */ init_nats_dissector(ndpi_str, &a); - /* APPLEJUICE */ - init_applejuice_dissector(ndpi_str, &a); - /* SOCKS */ init_socks_dissector(ndpi_str, &a); @@ -4270,9 +4261,6 @@ static int ndpi_callback_init(struct ndpi_detection_module_struct *ndpi_str) { /* NON_TCP_UDP */ init_non_tcp_udp_dissector(ndpi_str, &a); - /* SOPCAST */ - init_sopcast_dissector(ndpi_str, &a); - /* TVUPLAYER */ init_tvuplayer_dissector(ndpi_str, &a); @@ -4294,12 +4282,6 @@ static int ndpi_callback_init(struct ndpi_detection_module_struct *ndpi_str) { /* SSH */ init_ssh_dissector(ndpi_str, &a); - /* AYIYA */ - init_ayiya_dissector(ndpi_str, &a); - - /* THUNDER */ - init_thunder_dissector(ndpi_str, &a); - /* VNC */ init_vnc_dissector(ndpi_str, &a); @@ -4360,21 +4342,12 @@ static int ndpi_callback_init(struct ndpi_detection_module_struct *ndpi_str) { /* ICECAST */ init_icecast_dissector(ndpi_str, &a); - /* SHOUTCAST */ - init_shoutcast_dissector(ndpi_str, &a); - /* KERBEROS */ init_kerberos_dissector(ndpi_str, &a); - /* OPENFT */ - init_openft_dissector(ndpi_str, &a); - /* SYSLOG */ init_syslog_dissector(ndpi_str, &a); - /* DIRECT_DOWNLOAD_LINK */ - init_directdownloadlink_dissector(ndpi_str, &a); - /* NETBIOS */ init_netbios_dissector(ndpi_str, &a); @@ -4399,9 +4372,6 @@ static int ndpi_callback_init(struct ndpi_detection_module_struct *ndpi_str) { /* PPTP */ init_pptp_dissector(ndpi_str, &a); - /* STEALTHNET */ - init_stealthnet_dissector(ndpi_str, &a); - /* DHCPV6 */ init_dhcpv6_dissector(ndpi_str, &a); @@ -4414,12 +4384,6 @@ static int ndpi_callback_init(struct ndpi_detection_module_struct *ndpi_str) { /* cpha */ init_cpha_dissector(ndpi_str, &a); - /* AIMINI */ - init_aimini_dissector(ndpi_str, &a); - - /* FLORENSIA */ - init_florensia_dissector(ndpi_str, &a); - /* MAPLESTORY */ init_maplestory_dissector(ndpi_str, &a); @@ -4429,9 +4393,6 @@ static int ndpi_callback_init(struct ndpi_detection_module_struct *ndpi_str) { /* WORLD_OF_KUNG_FU */ init_world_of_kung_fu_dissector(ndpi_str, &a); - /* FIESTA */ - init_fiesta_dissector(ndpi_str, &a); - /* CROSSIFIRE */ init_crossfire_dissector(ndpi_str, &a); diff --git a/src/lib/protocols/aimini.c b/src/lib/protocols/aimini.c deleted file mode 100644 index 4e08612c6..000000000 --- a/src/lib/protocols/aimini.c +++ /dev/null @@ -1,270 +0,0 @@ -/* - * aimini.c - * - * Copyright (C) 2009-11 - ipoque GmbH - * Copyright (C) 2011-22 - ntop.org - * - * This file is part of nDPI, an open source deep packet inspection - * library based on the OpenDPI and PACE technology by ipoque GmbH - * - * nDPI is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * nDPI is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with nDPI. If not, see . - * - */ - - -#include "ndpi_protocol_ids.h" - -#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_AIMINI - -#include "ndpi_api.h" - - -static void ndpi_int_aimini_add_connection(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow/* , */ - /* ndpi_protocol_type_t protocol_type */) -{ - ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_AIMINI, NDPI_PROTOCOL_HTTP, NDPI_CONFIDENCE_DPI); -} - - -void ndpi_search_aimini(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow) -{ - struct ndpi_packet_struct *packet = &ndpi_struct->packet; - - NDPI_LOG_DBG(ndpi_struct, "search aimini\n"); - - if (packet->udp != NULL) { - if (flow->l4.udp.aimini_stage == 0) { - if (packet->payload_packet_len == 64 && ntohs(get_u_int16_t(packet->payload, 0)) == 0x010b) { - flow->l4.udp.aimini_stage = 1; - NDPI_LOG_DBG2(ndpi_struct, "stage = 1\n"); - return; - } - if (packet->payload_packet_len == 136 - && (ntohs(get_u_int16_t(packet->payload, 0)) == 0x01c9 || ntohs(get_u_int16_t(packet->payload, 0)) == 0x0165)) { - flow->l4.udp.aimini_stage = 4; - NDPI_LOG_DBG2(ndpi_struct, "stage = 4\n"); - return; - } - if (packet->payload_packet_len == 88 && ntohs(get_u_int16_t(packet->payload, 0)) == 0x0101) { - flow->l4.udp.aimini_stage = 7; - NDPI_LOG_DBG2(ndpi_struct, "stage = 7\n"); - return; - } - if (packet->payload_packet_len == 104 && ntohs(get_u_int16_t(packet->payload, 0)) == 0x0102) { - flow->l4.udp.aimini_stage = 10; - NDPI_LOG_DBG2(ndpi_struct, "stage = 10\n"); - return; - } - if (packet->payload_packet_len == 32 && ntohs(get_u_int16_t(packet->payload, 0)) == 0x01ca) { - flow->l4.udp.aimini_stage = 13; - NDPI_LOG_DBG2(ndpi_struct, "stage = 13\n"); - return; - } - if (packet->payload_packet_len == 16 && ntohs(get_u_int16_t(packet->payload, 0)) == 0x010c) { - flow->l4.udp.aimini_stage = 16; - NDPI_LOG_DBG2(ndpi_struct, "stage = 16\n"); - return; - } - } - /* first packet chronology: (len, value): (64, 0x010b), (>100, 0x0115), (16, 0x010c || 64, 0x010b || 88, 0x0115), - * (16, 0x010c || 64, 0x010b || >100, 0x0115) - */ - if (flow->l4.udp.aimini_stage == 1 && packet->payload_packet_len > 100 - && ntohs(get_u_int16_t(packet->payload, 0)) == 0x0115) { - flow->l4.udp.aimini_stage = 2; - NDPI_LOG_DBG2(ndpi_struct, "stage = 2\n"); - return; - } - if (flow->l4.udp.aimini_stage == 2 && - ((packet->payload_packet_len == 16 && get_u_int16_t(packet->payload, 0) == htons(0x010c)) || - (packet->payload_packet_len == 64 && get_u_int16_t(packet->payload, 0) == htons(0x010b)) || - (packet->payload_packet_len == 88 && get_u_int16_t(packet->payload, 0) == ntohs(0x0115)))) { - flow->l4.udp.aimini_stage = 3; - NDPI_LOG_DBG2(ndpi_struct, "stage = 3\n"); - return; - } - if (flow->l4.udp.aimini_stage == 3 - && ((packet->payload_packet_len == 16 && ntohs(get_u_int16_t(packet->payload, 0)) == 0x010c) - || (packet->payload_packet_len == 64 && ntohs(get_u_int16_t(packet->payload, 0)) == 0x010b) - || (packet->payload_packet_len > 100 && ntohs(get_u_int16_t(packet->payload, 0)) == 0x0115))) { - NDPI_LOG_INFO(ndpi_struct, "found aimini (64, 0x010b), (>300, 0x0115), " - "(16, 0x010c || 64, 0x010b), (16, 0x010c || 64, 0x010b || >100, 0x0115).\n"); - ndpi_int_aimini_add_connection(ndpi_struct, flow); - return; - } - - /* second packet chronology: (len, value): (136, 0x01c9), (136, 0x01c9),(136, 0x01c9),(136, 0x01c9 || 32, 0x01ca) */ - - if (flow->l4.udp.aimini_stage == 4 && packet->payload_packet_len == 136 - && (ntohs(get_u_int16_t(packet->payload, 0)) == 0x01c9 || ntohs(get_u_int16_t(packet->payload, 0)) == 0x0165)) { - flow->l4.udp.aimini_stage = 5; - NDPI_LOG_DBG2(ndpi_struct, "stage = 5\n"); - return; - } - if (flow->l4.udp.aimini_stage == 5 && (packet->payload_packet_len == 136 - && (ntohs(get_u_int16_t(packet->payload, 0)) == 0x01c9 - || ntohs(get_u_int16_t(packet->payload, 0)) == 0x0165))) { - flow->l4.udp.aimini_stage = 6; - NDPI_LOG_DBG2(ndpi_struct, "stage = 6\n"); - return; - } - if (flow->l4.udp.aimini_stage == 6 && ((packet->payload_packet_len == 136 - && ((ntohs(get_u_int16_t(packet->payload, 0)) == 0x0165) - || ntohs(get_u_int16_t(packet->payload, 0)) == 0x01c9)) - || (packet->payload_packet_len == 32 - && ntohs(get_u_int16_t(packet->payload, 0)) == 0x01ca))) { - NDPI_LOG_INFO(ndpi_struct, - "found aimini (136, 0x01c9), (136, 0x01c9)," "(136, 0x01c9),(136, 0x01c9 || 32, 0x01ca).\n"); - ndpi_int_aimini_add_connection(ndpi_struct, flow); - return; - } - - /* third packet chronology: (len, value): (88, 0x0101), (88, 0x0101),(88, 0x0101),(88, 0x0101) */ - - if (flow->l4.udp.aimini_stage == 7 && packet->payload_packet_len == 88 - && ntohs(get_u_int16_t(packet->payload, 0)) == 0x0101) { - flow->l4.udp.aimini_stage = 8; - NDPI_LOG_DBG2(ndpi_struct, "stage = 8\n"); - return; - } - if (flow->l4.udp.aimini_stage == 8 - && (packet->payload_packet_len == 88 && ntohs(get_u_int16_t(packet->payload, 0)) == 0x0101)) { - flow->l4.udp.aimini_stage = 9; - NDPI_LOG_DBG2(ndpi_struct, "stage = 9\n"); - return; - } - if (flow->l4.udp.aimini_stage == 9 - && (packet->payload_packet_len == 88 && ntohs(get_u_int16_t(packet->payload, 0)) == 0x0101)) { - NDPI_LOG_INFO(ndpi_struct, - "found aimini (88, 0x0101), (88, 0x0101)," "(88, 0x0101),(88, 0x0101).\n"); - ndpi_int_aimini_add_connection(ndpi_struct, flow); - return; - } - - /* fourth packet chronology: (len, value): (104, 0x0102), (104, 0x0102), (104, 0x0102), (104, 0x0102) */ - - if (flow->l4.udp.aimini_stage == 10 && packet->payload_packet_len == 104 - && ntohs(get_u_int16_t(packet->payload, 0)) == 0x0102) { - flow->l4.udp.aimini_stage = 11; - NDPI_LOG_DBG2(ndpi_struct, "stage = 11\n"); - return; - } - if (flow->l4.udp.aimini_stage == 11 - && (packet->payload_packet_len == 104 && ntohs(get_u_int16_t(packet->payload, 0)) == 0x0102)) { - flow->l4.udp.aimini_stage = 12; - NDPI_LOG_DBG2(ndpi_struct, "stage = 12\n"); - return; - } - if (flow->l4.udp.aimini_stage == 12 - && ((packet->payload_packet_len == 104 && ntohs(get_u_int16_t(packet->payload, 0)) == 0x0102) - || (packet->payload_packet_len == 32 && ntohs(get_u_int16_t(packet->payload, 0)) == 0x01ca))) { - NDPI_LOG_INFO(ndpi_struct, - "found aimini (104, 0x0102), (104, 0x0102), " "(104, 0x0102), (104, 0x0102).\n"); - ndpi_int_aimini_add_connection(ndpi_struct, flow); - return; - } - - /* fifth packet chronology (len, value): (32,0x01ca), (32,0x01ca), (32,0x01ca), ((136, 0x0166) || (32,0x01ca)) */ - - if (flow->l4.udp.aimini_stage == 13 && packet->payload_packet_len == 32 - && ntohs(get_u_int16_t(packet->payload, 0)) == 0x01ca) { - flow->l4.udp.aimini_stage = 14; - NDPI_LOG_DBG2(ndpi_struct, "stage = 14\n"); - return; - } - if (flow->l4.udp.aimini_stage == 14 - && ((packet->payload_packet_len == 32 && ntohs(get_u_int16_t(packet->payload, 0)) == 0x01ca) - || (packet->payload_packet_len == 136 && ntohs(get_u_int16_t(packet->payload, 0)) == 0x0166))) { - flow->l4.udp.aimini_stage = 15; - NDPI_LOG_DBG2(ndpi_struct, "stage = 15\n"); - return; - } - if (flow->l4.udp.aimini_stage == 15 - && ((packet->payload_packet_len == 136 && ntohs(get_u_int16_t(packet->payload, 0)) == 0x0166) - || (packet->payload_packet_len == 32 && ntohs(get_u_int16_t(packet->payload, 0)) == 0x01ca))) { - NDPI_LOG_INFO(ndpi_struct, - "found aimini (32,0x01ca), (32,0x01ca), (32,0x01ca), ((136, 0x0166)||(32,0x01ca)).\n"); - ndpi_int_aimini_add_connection(ndpi_struct, flow); - return; - } - - /* sixth packet chronology (len, value): (16, 0x010c), (16, 0x010c), (16, 0x010c), (16, 0x010c) */ - - if (flow->l4.udp.aimini_stage == 16 && packet->payload_packet_len == 16 - && ntohs(get_u_int16_t(packet->payload, 0)) == 0x010c) { - flow->l4.udp.aimini_stage = 17; - NDPI_LOG_DBG2(ndpi_struct, "stage = 17\n"); - return; - } - if (flow->l4.udp.aimini_stage == 17 - && (packet->payload_packet_len == 16 && ntohs(get_u_int16_t(packet->payload, 0)) == 0x010c)) { - flow->l4.udp.aimini_stage = 18; - NDPI_LOG_DBG2(ndpi_struct, "stage = 18\n"); - return; - } - if (flow->l4.udp.aimini_stage == 18 - && (packet->payload_packet_len == 16 && ntohs(get_u_int16_t(packet->payload, 0)) == 0x010c)) { - NDPI_LOG_INFO(ndpi_struct, - "found aimini (16, 0x010c), (16, 0x010c), (16, 0x010c), (16, 0x010c).\n"); - ndpi_int_aimini_add_connection(ndpi_struct, flow); - return; - } - } - - if (flow->detected_protocol_stack[0] == NDPI_PROTOCOL_HTTP) { - if (flow->http.method == NDPI_HTTP_METHOD_GET) - { - if ((LINE_STARTS(packet->http_url_name, "/download/") == 1 || - LINE_STARTS(packet->http_url_name, "/player/") == 1 || - LINE_STARTS(packet->http_url_name, "/webcounter/") == 1 || - LINE_STARTS(packet->http_url_name, "/play/") == 1 || - LINE_STARTS(packet->http_url_name, "/search/") == 1 || - LINE_STARTS(packet->http_url_name, "/member/") == 1) && - (LINE_ENDS(packet->host_line, ".aimini.net") == 1 || - LINE_ENDS(packet->host_line, ".aimini.com") == 1)) - { - NDPI_LOG_INFO(ndpi_struct, "found AIMINI HTTP traffic\n"); - ndpi_int_aimini_add_connection(ndpi_struct, flow); - return; - } - } else if (flow->http.method == NDPI_HTTP_METHOD_POST) - { - if ((LINE_STARTS(packet->http_url_name, "/upload/") == 1 || - LINE_STARTS(packet->http_url_name, "/member/") == 1) && - (LINE_ENDS(packet->host_line, ".aimini.net") == 1 || - LINE_ENDS(packet->host_line, ".aimini.com") == 1)) - { - NDPI_LOG_INFO(ndpi_struct, "found AIMINI HTTP traffic\n"); - ndpi_int_aimini_add_connection(ndpi_struct, flow); - return; - } - } - } - - NDPI_EXCLUDE_PROTO(ndpi_struct, flow); - -} - - -void init_aimini_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id) -{ - ndpi_set_bitmask_protocol_detection("Aimini", ndpi_struct, *id, - NDPI_PROTOCOL_AIMINI, - ndpi_search_aimini, - NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_OR_UDP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION, - SAVE_DETECTION_BITMASK_AS_UNKNOWN, - ADD_TO_DETECTION_BITMASK); - - *id += 1; -} diff --git a/src/lib/protocols/applejuice.c b/src/lib/protocols/applejuice.c deleted file mode 100644 index a8d2e810c..000000000 --- a/src/lib/protocols/applejuice.c +++ /dev/null @@ -1,67 +0,0 @@ -/* - * applejuice.c - * - * Copyright (C) 2009-11 - ipoque GmbH - * Copyright (C) 2011-22 - ntop.org - * - * This file is part of nDPI, an open source deep packet inspection - * library based on the OpenDPI and PACE technology by ipoque GmbH - * - * nDPI is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * nDPI is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with nDPI. If not, see . - * - */ - -#include "ndpi_protocol_ids.h" - -#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_APPLEJUICE - -#include "ndpi_api.h" - - -static void ndpi_int_applejuice_add_connection(struct ndpi_detection_module_struct *ndpi_struct, - struct ndpi_flow_struct *flow) -{ - ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_APPLEJUICE, NDPI_PROTOCOL_UNKNOWN, NDPI_CONFIDENCE_DPI); -} - -void ndpi_search_applejuice_tcp(struct ndpi_detection_module_struct *ndpi_struct, - struct ndpi_flow_struct *flow) -{ - struct ndpi_packet_struct *packet = &ndpi_struct->packet; - - NDPI_LOG_DBG(ndpi_struct, "search applejuice\n"); - - if ((packet->payload_packet_len > 7) && (packet->payload[6] == 0x0d) - && (packet->payload[7] == 0x0a) - && (memcmp(packet->payload, "ajprot", 6) == 0)) { - NDPI_LOG_INFO(ndpi_struct, "found applejuice\n"); - ndpi_int_applejuice_add_connection(ndpi_struct, flow); - return; - } - - NDPI_EXCLUDE_PROTO(ndpi_struct, flow); -} - - -void init_applejuice_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id) -{ - ndpi_set_bitmask_protocol_detection("AppleJuice", ndpi_struct, *id, - NDPI_PROTOCOL_APPLEJUICE, - ndpi_search_applejuice_tcp, - NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION, - SAVE_DETECTION_BITMASK_AS_UNKNOWN, - ADD_TO_DETECTION_BITMASK); - - *id += 1; -} diff --git a/src/lib/protocols/ayiya.c b/src/lib/protocols/ayiya.c deleted file mode 100644 index 43b0c84c9..000000000 --- a/src/lib/protocols/ayiya.c +++ /dev/null @@ -1,87 +0,0 @@ -/* - * ayiya.c - * - * Copyright (C) 2011-22 - ntop.org - * - * This file is part of nDPI, an open source deep packet inspection - * library based on the OpenDPI and PACE technology by ipoque GmbH - * - * nDPI is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * nDPI is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with nDPI. If not, see . - * - */ - -/* - http://en.wikipedia.org/wiki/Anything_In_Anything - http://tools.ietf.org/html/rfc4891 -*/ - -#include "ndpi_protocol_ids.h" - -#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_AYIYA - -#include "ndpi_api.h" - -struct ayiya { - u_int8_t flags[3]; - u_int8_t next_header; - u_int32_t epoch; - u_int8_t identity[16]; - u_int8_t signature[20]; -}; - -void ndpi_search_ayiya(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow) -{ - struct ndpi_packet_struct *packet = &ndpi_struct->packet; - - NDPI_LOG_DBG(ndpi_struct, "search AYIYA\n"); - - if(packet->udp && (flow->detected_protocol_stack[0] == NDPI_PROTOCOL_UNKNOWN)) { - /* Ayiya is udp based, port 5072 */ - u_int16_t port_to_match = htons(5072); - - if ((packet->udp->source == port_to_match || packet->udp->dest == port_to_match) - /* check for ayiya new packet */ - && (packet->payload_packet_len > 44) - ) { - /* FINISH */ - struct ayiya *a = (struct ayiya*)packet->payload; - u_int32_t epoch = ntohl(a->epoch), now; - u_int32_t fiveyears = 86400 * 365 * 5; - - now = packet->current_time_ms; - - if((epoch >= (now - fiveyears)) && (epoch <= (now+86400 /* 1 day */))) { - NDPI_LOG_INFO(ndpi_struct, "found AYIYA\n"); - ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_AYIYA, NDPI_PROTOCOL_UNKNOWN, NDPI_CONFIDENCE_DPI); - } - - return; - } - - NDPI_EXCLUDE_PROTO(ndpi_struct, flow); - } -} - - -void init_ayiya_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id) -{ - ndpi_set_bitmask_protocol_detection("Ayiya", ndpi_struct, *id, - NDPI_PROTOCOL_AYIYA, - ndpi_search_ayiya, - NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_UDP_WITH_PAYLOAD, - SAVE_DETECTION_BITMASK_AS_UNKNOWN, - ADD_TO_DETECTION_BITMASK); - - *id += 1; -} diff --git a/src/lib/protocols/directconnect.c b/src/lib/protocols/directconnect.c deleted file mode 100644 index 01caf79ff..000000000 --- a/src/lib/protocols/directconnect.c +++ /dev/null @@ -1,207 +0,0 @@ -/* - * directconnect.c - * - * Copyright (C) 2009-11 - ipoque GmbH - * Copyright (C) 2011-22 - ntop.org - * - * This file is part of nDPI, an open source deep packet inspection - * library based on the OpenDPI and PACE technology by ipoque GmbH - * - * nDPI is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * nDPI is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with nDPI. If not, see . - * - */ - - -#include "ndpi_protocol_ids.h" - -#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_DIRECTCONNECT - -#include "ndpi_api.h" - - -//#define NDPI_DEBUG_DIRECTCONNECT -//#define NDPI_DIRECTCONNECT_PORT_DEBUG -//#define NDPI_DEBUG_DIRECTCONNECT_CONN - - -#define DIRECT_CONNECT_TYPE_HUB 0 -#define DIRECT_CONNECT_TYPE_PEER 1 -#define DIRECT_CONNECT_ADC_PEER 2 - -static u_int32_t skip_unknown_headers(const u_int8_t * payload, u_int32_t payload_len, u_int32_t pos) -{ - u_int32_t i = pos; - while (i < payload_len && payload[i] != 0x0a) - i++; - - i++; - return i; - -} - -static u_int16_t parse_binf_message(struct ndpi_detection_module_struct - *ndpi_struct, const u_int8_t * payload, uint32_t payload_len) -{ - u_int32_t i = 4; - u_int16_t bytes_read = 0; - u_int16_t ssl_port = 0; - while (i < payload_len) { - i = skip_unknown_headers(payload, payload_len, i); - if((i + 30) < payload_len) { - if(memcmp(&payload[i], "DCTM", 4) == 0) { - if(memcmp(&payload[i + 15], "ADCS", 4) == 0) { - ssl_port = ntohs_ndpi_bytestream_to_number(&payload[i + 25], 5, &bytes_read); - NDPI_LOG_DBG2(ndpi_struct, "DC ssl port parsed %d\n", ssl_port); - } - } - } else { - break; - } - - } - return ssl_port; -} - -static void ndpi_int_directconnect_add_connection(struct ndpi_detection_module_struct *ndpi_struct, - struct ndpi_flow_struct *flow, - const u_int8_t connection_type) -{ - ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_DIRECTCONNECT, NDPI_PROTOCOL_UNKNOWN, NDPI_CONFIDENCE_DPI); -} - -static void ndpi_search_directconnect_tcp(struct ndpi_detection_module_struct *ndpi_struct, - struct ndpi_flow_struct *flow) { - struct ndpi_packet_struct *packet = &ndpi_struct->packet; - - if(flow->detected_protocol_stack[0] == NDPI_PROTOCOL_DIRECTCONNECT) { - if(packet->payload_packet_len >= 40 && memcmp(&packet->payload[0], "BINF", 4) == 0) { - parse_binf_message(ndpi_struct, - &packet->payload[4], - packet->payload_packet_len - 4); - } - - return; - - } - - if(flow->directconnect_stage == 0) { - - if(packet->payload_packet_len > 6) { - if(packet->payload[0] == '$' - && packet->payload[packet->payload_packet_len - 1] == '|' - && (memcmp(&packet->payload[1], "Lock ", 5) == 0)) { - NDPI_LOG_DBG2(ndpi_struct, "maybe first dc connect to hub detected\n"); - flow->directconnect_stage = 1; - return; - } - if(packet->payload_packet_len > 7 - && packet->payload[0] == '$' - && packet->payload[packet->payload_packet_len - 1] == '|' - && (memcmp(&packet->payload[1], "MyNick ", 7) == 0)) { - NDPI_LOG_DBG2(ndpi_struct, "maybe first dc connect between peers detected\n"); - flow->directconnect_stage = 2; - return; - } - - } - if(packet->payload_packet_len >= 11) { - /* did not see this pattern in any trace */ - if(memcmp(&packet->payload[0], "HSUP ADBAS0", 11) == 0 - || memcmp(&packet->payload[0], "HSUP ADBASE", 11) == 0) { - NDPI_LOG_INFO(ndpi_struct, "found DC HSUP ADBAS0 E\n"); - ndpi_int_directconnect_add_connection(ndpi_struct, flow, DIRECT_CONNECT_TYPE_HUB); - return; - /* did not see this pattern in any trace */ - } else if(memcmp(&packet->payload[0], "CSUP ADBAS0", 11) == 0 || - memcmp(&packet->payload[0], "CSUP ADBASE", 11) == 0) { - NDPI_LOG_INFO(ndpi_struct, "found DC CSUP ADBAS0 E\n"); - ndpi_int_directconnect_add_connection(ndpi_struct, flow, DIRECT_CONNECT_ADC_PEER); - return; - - } - - } - - } else if(flow->directconnect_stage == 1) { - if(packet->payload_packet_len >= 11) { - /* did not see this pattern in any trace */ - if(memcmp(&packet->payload[0], "HSUP ADBAS0", 11) == 0 - || memcmp(&packet->payload[0], "HSUP ADBASE", 11) == 0) { - NDPI_LOG_INFO(ndpi_struct, "found DC HSUP ADBAS E in second packet\n"); - ndpi_int_directconnect_add_connection(ndpi_struct, flow, DIRECT_CONNECT_TYPE_HUB); - return; - /* did not see this pattern in any trace */ - } else if(memcmp(&packet->payload[0], "CSUP ADBAS0", 11) == 0 || - memcmp(&packet->payload[0], "CSUP ADBASE", 11) == 0) { - NDPI_LOG_INFO(ndpi_struct, "found DC HSUP ADBAS0 E in second packet\n"); - ndpi_int_directconnect_add_connection(ndpi_struct, flow, DIRECT_CONNECT_ADC_PEER); - return; - - } - } - /* get client hello answer or server message */ - if(packet->payload_packet_len > 6) { - if((packet->payload[0] == '$' || packet->payload[0] == '<') - && packet->payload[packet->payload_packet_len - 1] == '|') { - NDPI_LOG_INFO(ndpi_struct, "found DC second\n"); - ndpi_int_directconnect_add_connection(ndpi_struct, flow, DIRECT_CONNECT_TYPE_HUB); - return; - } else { - NDPI_LOG_DBG2(ndpi_struct, "second dc not detected\n"); - } - - } - } else if(flow->directconnect_stage == 2) { - /* get client hello answer or server message */ - if(packet->payload_packet_len > 6) { - if(packet->payload[0] == '$' && packet->payload[packet->payload_packet_len - 1] == '|') { - NDPI_LOG_INFO(ndpi_struct, "found DC between peers\n"); - ndpi_int_directconnect_add_connection(ndpi_struct, flow, DIRECT_CONNECT_TYPE_PEER); - return; - } else { - NDPI_LOG_DBG2(ndpi_struct, "second dc between peers not detected\n"); - } - } - - } - - NDPI_EXCLUDE_PROTO(ndpi_struct, flow); - -} - -void ndpi_search_directconnect(struct ndpi_detection_module_struct - *ndpi_struct, struct ndpi_flow_struct *flow) -{ - struct ndpi_packet_struct *packet = &ndpi_struct->packet; - - NDPI_LOG_DBG(ndpi_struct, "search DC\n"); - - if(packet->tcp != NULL) { - ndpi_search_directconnect_tcp(ndpi_struct, flow); - } -} - - -void init_directconnect_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id) -{ - ndpi_set_bitmask_protocol_detection("DirectConnect", ndpi_struct, *id, - NDPI_PROTOCOL_DIRECTCONNECT, - ndpi_search_directconnect, - /* TODO: UDP?*/ - NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION, - SAVE_DETECTION_BITMASK_AS_UNKNOWN, - ADD_TO_DETECTION_BITMASK); - - *id += 1; -} diff --git a/src/lib/protocols/directdownloadlink.c b/src/lib/protocols/directdownloadlink.c deleted file mode 100644 index 2821490b6..000000000 --- a/src/lib/protocols/directdownloadlink.c +++ /dev/null @@ -1,726 +0,0 @@ -/* - * directdownloadlink.c - * - * Copyright (C) 2009-11 - ipoque GmbH - * Copyright (C) 2011-22 - ntop.org - * - * This file is part of nDPI, an open source deep packet inspection - * library based on the OpenDPI and PACE technology by ipoque GmbH - * - * nDPI is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * nDPI is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with nDPI. If not, see . - * - */ - - -#include "ndpi_protocol_ids.h" - -#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_DIRECT_DOWNLOAD_LINK - -#include "ndpi_api.h" - - -#ifdef NDPI_DEBUG_DIRECT_DOWNLOAD_LINK -//#define NDPI_DEBUG_DIRECT_DOWNLOAD_LINK_NOTHING_FOUND -//#define NDPI_DEBUG_DIRECT_DOWNLOAD_LINK_PACKET_TOO_SMALL -#define NDPI_DEBUG_DIRECT_DOWNLOAD_LINK_IP -#endif - -static void ndpi_int_direct_download_link_add_connection(struct ndpi_detection_module_struct *ndpi_struct, - struct ndpi_flow_struct *flow) -{ - ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_DIRECT_DOWNLOAD_LINK, NDPI_PROTOCOL_UNKNOWN, NDPI_CONFIDENCE_DPI); -} - - - -/* - return 0 if nothing has been detected - return 1 if it is a megaupload packet -*/ -u_int8_t search_ddl_domains(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow) -{ - struct ndpi_packet_struct *packet = &ndpi_struct->packet; - u_int16_t filename_start = 0; - u_int16_t i = 1; - u_int16_t host_line_len_without_port; - - if (packet->payload_packet_len < 100) { - NDPI_LOG_DBG2(ndpi_struct, "DDL: Packet too small\n"); - goto end_ddl_nothing_found; - } - - - - if (memcmp(packet->payload, "POST ", 5) == 0) { - filename_start = 5; // POST - NDPI_LOG_DBG2(ndpi_struct, "DDL: POST FOUND\n"); - } else if (memcmp(packet->payload, "GET ", 4) == 0) { - filename_start = 4; // GET - NDPI_LOG_DBG2(ndpi_struct, "DDL: GET FOUND\n"); - } else { - goto end_ddl_nothing_found; - } - // parse packet - ndpi_parse_packet_line_info(ndpi_struct, flow); - - if (packet->host_line.ptr == NULL) { - NDPI_LOG_DBG2(ndpi_struct, "DDL: NO HOST FOUND\n"); - goto end_ddl_nothing_found; - } - - NDPI_LOG_DBG2(ndpi_struct, "DDL: Host: found\n"); - - if (packet->line[0].len < 9 + filename_start - || memcmp(&packet->line[0].ptr[packet->line[0].len - 9], " HTTP/1.", 8) != 0) { - NDPI_LOG_DBG2(ndpi_struct, "DDL: PACKET NOT HTTP CONFORM.\nXXX%.*sXXX\n", - 8, &packet->line[0].ptr[packet->line[0].len - 9]); - goto end_ddl_nothing_found; - } - // BEGIN OF AUTOMATED CODE GENERATION - // first see if we have ':port' at the end of the line - host_line_len_without_port = packet->host_line.len; - if (host_line_len_without_port >= i && packet->host_line.ptr[host_line_len_without_port - i] >= '0' - && packet->host_line.ptr[packet->host_line.len - i] <= '9') { - i = 2; - while (host_line_len_without_port >= i && packet->host_line.ptr[host_line_len_without_port - i] >= '0' - && packet->host_line.ptr[host_line_len_without_port - i] <= '9') { - NDPI_LOG_DBG2(ndpi_struct, "DDL: number found\n"); - i++; - } - if (host_line_len_without_port >= i && packet->host_line.ptr[host_line_len_without_port - i] == ':') { - NDPI_LOG_DBG2(ndpi_struct, "DDL: ':' found\n"); - host_line_len_without_port = host_line_len_without_port - i; - } - } - // then start automated code generation - - if (host_line_len_without_port >= 0 + 4 - && memcmp((void *) &packet->host_line.ptr[host_line_len_without_port - 0 - 4], ".com", 4) == 0) { - if (host_line_len_without_port >= 4 + 1 && packet->host_line.ptr[host_line_len_without_port - 4 - 1] == 'd') { - if (host_line_len_without_port >= 5 + 6 + 1 - && memcmp((void *) &packet->host_line.ptr[host_line_len_without_port - 5 - 6], "4share", 6) == 0 - && (packet->host_line.ptr[host_line_len_without_port - 5 - 6 - 1] == ' ' - || packet->host_line.ptr[host_line_len_without_port - 5 - 6 - 1] == '.')) { - goto end_ddl_found; - } - if (host_line_len_without_port >= 5 + 8 + 1 - && memcmp((void *) &packet->host_line.ptr[host_line_len_without_port - 5 - 8], "fileclou", 8) == 0 - && (packet->host_line.ptr[host_line_len_without_port - 5 - 8 - 1] == ' ' - || packet->host_line.ptr[host_line_len_without_port - 5 - 8 - 1] == '.')) { - goto end_ddl_found; - } - if (host_line_len_without_port >= 5 + 5 - && memcmp((void *) &packet->host_line.ptr[host_line_len_without_port - 5 - 5], "uploa", 5) == 0) { - if (host_line_len_without_port >= 10 + 6 + 1 - && memcmp((void *) &packet->host_line.ptr[host_line_len_without_port - 10 - 6], "files-", 6) == 0 - && (packet->host_line.ptr[host_line_len_without_port - 10 - 6 - 1] == ' ' - || packet->host_line.ptr[host_line_len_without_port - 10 - 6 - 1] == '.')) { - goto end_ddl_found; - } - if (host_line_len_without_port >= 10 + 4 + 1 - && memcmp((void *) &packet->host_line.ptr[host_line_len_without_port - 10 - 4], "mega", 4) == 0 - && (packet->host_line.ptr[host_line_len_without_port - 10 - 4 - 1] == ' ' - || packet->host_line.ptr[host_line_len_without_port - 10 - 4 - 1] == '.')) { - goto end_ddl_found; - } - if (host_line_len_without_port >= 10 + 5 + 1 - && memcmp((void *) &packet->host_line.ptr[host_line_len_without_port - 10 - 5], "rapid", 5) == 0 - && (packet->host_line.ptr[host_line_len_without_port - 10 - 5 - 1] == ' ' - || packet->host_line.ptr[host_line_len_without_port - 10 - 5 - 1] == '.')) { - goto end_ddl_found; - } - if (host_line_len_without_port >= 10 + 5 + 1 - && memcmp((void *) &packet->host_line.ptr[host_line_len_without_port - 10 - 5], "turbo", 5) == 0 - && (packet->host_line.ptr[host_line_len_without_port - 10 - 5 - 1] == ' ' - || packet->host_line.ptr[host_line_len_without_port - 10 - 5 - 1] == '.')) { - goto end_ddl_found; - } - goto end_ddl_nothing_found; - } - goto end_ddl_nothing_found; - } - if (host_line_len_without_port >= 4 + 1 && packet->host_line.ptr[host_line_len_without_port - 4 - 1] == 'o') { - if (host_line_len_without_port >= 5 + 6 + 1 - && memcmp((void *) &packet->host_line.ptr[host_line_len_without_port - 5 - 6], "badong", 6) == 0 - && (packet->host_line.ptr[host_line_len_without_port - 5 - 6 - 1] == ' ' - || packet->host_line.ptr[host_line_len_without_port - 5 - 6 - 1] == '.')) { - goto end_ddl_found; - } - if (host_line_len_without_port >= 5 + 5 + 1 - && memcmp((void *) &packet->host_line.ptr[host_line_len_without_port - 5 - 5], "fileh", 5) == 0 - && (packet->host_line.ptr[host_line_len_without_port - 5 - 5 - 1] == ' ' - || packet->host_line.ptr[host_line_len_without_port - 5 - 5 - 1] == '.')) { - goto end_ddl_found; - } - goto end_ddl_nothing_found; - } - if (host_line_len_without_port >= 4 + 1 && packet->host_line.ptr[host_line_len_without_port - 4 - 1] == 'g') { - if (host_line_len_without_port >= 5 + 2 - && memcmp((void *) &packet->host_line.ptr[host_line_len_without_port - 5 - 2], "in", 2) == 0) { - if (host_line_len_without_port >= 7 + 4 - && memcmp((void *) &packet->host_line.ptr[host_line_len_without_port - 7 - 4], "shar", 4) == 0) { - if (host_line_len_without_port >= 11 + 4 + 1 - && memcmp((void *) &packet->host_line.ptr[host_line_len_without_port - 11 - 4], "best", 4) == 0 - && (packet->host_line.ptr[host_line_len_without_port - 11 - 4 - 1] == ' ' - || packet->host_line.ptr[host_line_len_without_port - 11 - 4 - 1] == '.')) { - goto end_ddl_found; - } - if (host_line_len_without_port >= 11 + 5 + 1 - && memcmp((void *) &packet->host_line.ptr[host_line_len_without_port - 11 - 5], "quick", 5) == 0 - && (packet->host_line.ptr[host_line_len_without_port - 11 - 5 - 1] == ' ' - || packet->host_line.ptr[host_line_len_without_port - 11 - 5 - 1] == '.')) { - goto end_ddl_found; - } - goto end_ddl_nothing_found; - } - if (host_line_len_without_port >= 7 + 6 + 1 - && memcmp((void *) &packet->host_line.ptr[host_line_len_without_port - 7 - 6], "upload", 6) == 0 - && (packet->host_line.ptr[host_line_len_without_port - 7 - 6 - 1] == ' ' - || packet->host_line.ptr[host_line_len_without_port - 7 - 6 - 1] == '.')) { - goto end_ddl_found; - } - goto end_ddl_nothing_found; - } - if (host_line_len_without_port >= 5 + 7 + 1 - && memcmp((void *) &packet->host_line.ptr[host_line_len_without_port - 5 - 7], "sharebi", 7) == 0 - && (packet->host_line.ptr[host_line_len_without_port - 5 - 7 - 1] == ' ' - || packet->host_line.ptr[host_line_len_without_port - 5 - 7 - 1] == '.')) { - goto end_ddl_found; - } - goto end_ddl_nothing_found; - } - if (host_line_len_without_port >= 4 + 8 + 1 - && memcmp((void *) &packet->host_line.ptr[host_line_len_without_port - 4 - 8], "bigfilez", 8) == 0 - && (packet->host_line.ptr[host_line_len_without_port - 4 - 8 - 1] == ' ' - || packet->host_line.ptr[host_line_len_without_port - 4 - 8 - 1] == '.')) { - goto end_ddl_found; - } - if (host_line_len_without_port >= 4 + 1 && packet->host_line.ptr[host_line_len_without_port - 4 - 1] == 'e') { - if (host_line_len_without_port >= 5 + 3 - && memcmp((void *) &packet->host_line.ptr[host_line_len_without_port - 5 - 3], "fil", 3) == 0) { - if (host_line_len_without_port >= 8 + 2 - && memcmp((void *) &packet->host_line.ptr[host_line_len_without_port - 8 - 2], "mo", 2) == 0) { - if (host_line_len_without_port >= 10 + 5 + 1 - && memcmp((void *) &packet->host_line.ptr[host_line_len_without_port - 10 - 5], "china", 5) == 0 - && (packet->host_line.ptr[host_line_len_without_port - 10 - 5 - 1] == ' ' - || packet->host_line.ptr[host_line_len_without_port - 10 - 5 - 1] == '.')) { - goto end_ddl_found; - } - if (host_line_len_without_port >= 8 + 2 + 1 - && (packet->host_line.ptr[host_line_len_without_port - 8 - 2 - 1] == ' ' - || packet->host_line.ptr[host_line_len_without_port - 8 - 2 - 1] == '.')) { - goto end_ddl_found; - } - } - if (host_line_len_without_port >= 8 + 3 + 1 - && memcmp((void *) &packet->host_line.ptr[host_line_len_without_port - 8 - 3], "hot", 3) == 0 - && (packet->host_line.ptr[host_line_len_without_port - 8 - 3 - 1] == ' ' - || packet->host_line.ptr[host_line_len_without_port - 8 - 3 - 1] == '.')) { - goto end_ddl_found; - } - if (host_line_len_without_port >= 8 + 6 + 1 - && memcmp((void *) &packet->host_line.ptr[host_line_len_without_port - 8 - 6], "keepmy", 6) == 0 - && (packet->host_line.ptr[host_line_len_without_port - 8 - 6 - 1] == ' ' - || packet->host_line.ptr[host_line_len_without_port - 8 - 6 - 1] == '.')) { - goto end_ddl_found; - } - if (host_line_len_without_port >= 8 + 1 - && packet->host_line.ptr[host_line_len_without_port - 8 - 1] == 'e') { - if (host_line_len_without_port >= 9 + 3 + 1 - && memcmp((void *) &packet->host_line.ptr[host_line_len_without_port - 9 - 3], "sav", 3) == 0 - && (packet->host_line.ptr[host_line_len_without_port - 9 - 3 - 1] == ' ' - || packet->host_line.ptr[host_line_len_without_port - 9 - 3 - 1] == '.')) { - goto end_ddl_found; - } - if (host_line_len_without_port >= 9 + 5 + 1 - && memcmp((void *) &packet->host_line.ptr[host_line_len_without_port - 9 - 5], "sendm", 5) == 0 - && (packet->host_line.ptr[host_line_len_without_port - 9 - 5 - 1] == ' ' - || packet->host_line.ptr[host_line_len_without_port - 9 - 5 - 1] == '.')) { - goto end_ddl_found; - } - goto end_ddl_nothing_found; - } - if (host_line_len_without_port >= 8 + 8 + 1 - && memcmp((void *) &packet->host_line.ptr[host_line_len_without_port - 8 - 8], "sharebig", 8) == 0 - && (packet->host_line.ptr[host_line_len_without_port - 8 - 8 - 1] == ' ' - || packet->host_line.ptr[host_line_len_without_port - 8 - 8 - 1] == '.')) { - goto end_ddl_found; - } - if (host_line_len_without_port >= 8 + 3 + 1 - && memcmp((void *) &packet->host_line.ptr[host_line_len_without_port - 8 - 3], "up-", 3) == 0 - && (packet->host_line.ptr[host_line_len_without_port - 8 - 3 - 1] == ' ' - || packet->host_line.ptr[host_line_len_without_port - 8 - 3 - 1] == '.')) { - goto end_ddl_found; - } - goto end_ddl_nothing_found; - } - if (host_line_len_without_port >= 5 + 1 && packet->host_line.ptr[host_line_len_without_port - 5 - 1] == 'r') { - if (host_line_len_without_port >= 6 + 3 - && memcmp((void *) &packet->host_line.ptr[host_line_len_without_port - 6 - 3], "sha", 3) == 0) { - if (host_line_len_without_port >= 9 + 1 - && packet->host_line.ptr[host_line_len_without_port - 9 - 1] == '-') { - if (host_line_len_without_port >= 10 + 4 + 1 - && memcmp((void *) &packet->host_line.ptr[host_line_len_without_port - 10 - 4], "easy", - 4) == 0 && (packet->host_line.ptr[host_line_len_without_port - 10 - 4 - 1] == ' ' - || packet->host_line.ptr[host_line_len_without_port - 10 - 4 - 1] == - '.')) { - goto end_ddl_found; - } - if (host_line_len_without_port >= 10 + 4 + 1 - && memcmp((void *) &packet->host_line.ptr[host_line_len_without_port - 10 - 4], "fast", - 4) == 0 && (packet->host_line.ptr[host_line_len_without_port - 10 - 4 - 1] == ' ' - || packet->host_line.ptr[host_line_len_without_port - 10 - 4 - 1] == - '.')) { - goto end_ddl_found; - } - if (host_line_len_without_port >= 10 + 4 + 1 - && memcmp((void *) &packet->host_line.ptr[host_line_len_without_port - 10 - 4], "live", - 4) == 0 && (packet->host_line.ptr[host_line_len_without_port - 10 - 4 - 1] == ' ' - || packet->host_line.ptr[host_line_len_without_port - 10 - 4 - 1] == - '.')) { - goto end_ddl_found; - } - goto end_ddl_nothing_found; - } - if (host_line_len_without_port >= 9 + 4 + 1 - && memcmp((void *) &packet->host_line.ptr[host_line_len_without_port - 9 - 4], "ftp2", 4) == 0 - && (packet->host_line.ptr[host_line_len_without_port - 9 - 4 - 1] == ' ' - || packet->host_line.ptr[host_line_len_without_port - 9 - 4 - 1] == '.')) { - goto end_ddl_found; - } - if (host_line_len_without_port >= 9 + 4 + 1 - && memcmp((void *) &packet->host_line.ptr[host_line_len_without_port - 9 - 4], "gige", 4) == 0 - && (packet->host_line.ptr[host_line_len_without_port - 9 - 4 - 1] == ' ' - || packet->host_line.ptr[host_line_len_without_port - 9 - 4 - 1] == '.')) { - goto end_ddl_found; - } - if (host_line_len_without_port >= 9 + 4 + 1 - && memcmp((void *) &packet->host_line.ptr[host_line_len_without_port - 9 - 4], "mega", 4) == 0 - && (packet->host_line.ptr[host_line_len_without_port - 9 - 4 - 1] == ' ' - || packet->host_line.ptr[host_line_len_without_port - 9 - 4 - 1] == '.')) { - goto end_ddl_found; - } - if (host_line_len_without_port >= 9 + 5 + 1 - && memcmp((void *) &packet->host_line.ptr[host_line_len_without_port - 9 - 5], "rapid", 5) == 0 - && (packet->host_line.ptr[host_line_len_without_port - 9 - 5 - 1] == ' ' - || packet->host_line.ptr[host_line_len_without_port - 9 - 5 - 1] == '.')) { - goto end_ddl_found; - } - goto end_ddl_nothing_found; - } - if (host_line_len_without_port >= 6 + 7 + 1 - && memcmp((void *) &packet->host_line.ptr[host_line_len_without_port - 6 - 7], "mediafi", 7) == 0 - && (packet->host_line.ptr[host_line_len_without_port - 6 - 7 - 1] == ' ' - || packet->host_line.ptr[host_line_len_without_port - 6 - 7 - 1] == '.')) { - goto end_ddl_found; - } - goto end_ddl_nothing_found; - } - if (host_line_len_without_port >= 5 + 7 + 1 - && memcmp((void *) &packet->host_line.ptr[host_line_len_without_port - 5 - 7], "gigasiz", 7) == 0 - && (packet->host_line.ptr[host_line_len_without_port - 5 - 7 - 1] == ' ' - || packet->host_line.ptr[host_line_len_without_port - 5 - 7 - 1] == '.')) { - goto end_ddl_found; - } - if (host_line_len_without_port >= 5 + 8 + 1 - && memcmp((void *) &packet->host_line.ptr[host_line_len_without_port - 5 - 8], "sendspac", 8) == 0 - && (packet->host_line.ptr[host_line_len_without_port - 5 - 8 - 1] == ' ' - || packet->host_line.ptr[host_line_len_without_port - 5 - 8 - 1] == '.')) { - goto end_ddl_found; - } - if (host_line_len_without_port >= 5 + 7 + 1 - && memcmp((void *) &packet->host_line.ptr[host_line_len_without_port - 5 - 7], "sharebe", 7) == 0 - && (packet->host_line.ptr[host_line_len_without_port - 5 - 7 - 1] == ' ' - || packet->host_line.ptr[host_line_len_without_port - 5 - 7 - 1] == '.')) { - goto end_ddl_found; - } - if (host_line_len_without_port >= 5 + 11 + 1 - && memcmp((void *) &packet->host_line.ptr[host_line_len_without_port - 5 - 11], "sharebigfli", 11) == 0 - && (packet->host_line.ptr[host_line_len_without_port - 5 - 11 - 1] == ' ' - || packet->host_line.ptr[host_line_len_without_port - 5 - 11 - 1] == '.')) { - goto end_ddl_found; - } - if (host_line_len_without_port >= 5 + 8 + 1 - && memcmp((void *) &packet->host_line.ptr[host_line_len_without_port - 5 - 8], "fileserv", 8) == 0 - && (packet->host_line.ptr[host_line_len_without_port - 5 - 8 - 1] == ' ' - || packet->host_line.ptr[host_line_len_without_port - 5 - 8 - 1] == '.')) { - goto end_ddl_found; - } - goto end_ddl_nothing_found; - } - if (host_line_len_without_port >= 4 + 1 && packet->host_line.ptr[host_line_len_without_port - 4 - 1] == 's') { - if (host_line_len_without_port >= 5 + 1 && packet->host_line.ptr[host_line_len_without_port - 5 - 1] == 'e') { - if (host_line_len_without_port >= 6 + 10 + 1 - && memcmp((void *) &packet->host_line.ptr[host_line_len_without_port - 6 - 10], "depositfil", - 10) == 0 && (packet->host_line.ptr[host_line_len_without_port - 6 - 10 - 1] == ' ' - || packet->host_line.ptr[host_line_len_without_port - 6 - 10 - 1] == '.')) { - goto end_ddl_found; - } - if (host_line_len_without_port >= 6 + 8 + 1 - && memcmp((void *) &packet->host_line.ptr[host_line_len_without_port - 6 - 8], "megashar", 8) == 0 - && (packet->host_line.ptr[host_line_len_without_port - 6 - 8 - 1] == ' ' - || packet->host_line.ptr[host_line_len_without_port - 6 - 8 - 1] == '.')) { - goto end_ddl_found; - } - goto end_ddl_nothing_found; - } - if (host_line_len_without_port >= 5 + 10 + 1 - && memcmp((void *) &packet->host_line.ptr[host_line_len_without_port - 5 - 10], "fileupyour", 10) == 0 - && (packet->host_line.ptr[host_line_len_without_port - 5 - 10 - 1] == ' ' - || packet->host_line.ptr[host_line_len_without_port - 5 - 10 - 1] == '.')) { - goto end_ddl_found; - } - goto end_ddl_nothing_found; - } - if (host_line_len_without_port >= 4 + 11 + 1 - && memcmp((void *) &packet->host_line.ptr[host_line_len_without_port - 4 - 11], "filefactory", 11) == 0 - && (packet->host_line.ptr[host_line_len_without_port - 4 - 11 - 1] == ' ' - || packet->host_line.ptr[host_line_len_without_port - 4 - 11 - 1] == '.')) { - goto end_ddl_found; - } - if (host_line_len_without_port >= 4 + 1 && packet->host_line.ptr[host_line_len_without_port - 4 - 1] == 't') { - if (host_line_len_without_port >= 5 + 8 + 1 - && memcmp((void *) &packet->host_line.ptr[host_line_len_without_port - 5 - 8], "filefron", 8) == 0 - && (packet->host_line.ptr[host_line_len_without_port - 5 - 8 - 1] == ' ' - || packet->host_line.ptr[host_line_len_without_port - 5 - 8 - 1] == '.')) { - goto end_ddl_found; - } - if (host_line_len_without_port >= 5 + 10 + 1 - && memcmp((void *) &packet->host_line.ptr[host_line_len_without_port - 5 - 10], "uploadingi", 10) == 0 - && (packet->host_line.ptr[host_line_len_without_port - 5 - 10 - 1] == ' ' - || packet->host_line.ptr[host_line_len_without_port - 5 - 10 - 1] == '.')) { - goto end_ddl_found; - } - if (host_line_len_without_port >= 5 + 11 + 1 - && memcmp((void *) &packet->host_line.ptr[host_line_len_without_port - 5 - 11], "yourfilehos", 11) == 0 - && (packet->host_line.ptr[host_line_len_without_port - 5 - 11 - 1] == ' ' - || packet->host_line.ptr[host_line_len_without_port - 5 - 11 - 1] == '.')) { - goto end_ddl_found; - } - goto end_ddl_nothing_found; - } - if (host_line_len_without_port >= 4 + 1 && packet->host_line.ptr[host_line_len_without_port - 4 - 1] == 'r') { - if (host_line_len_without_port >= 5 + 8 + 1 - && memcmp((void *) &packet->host_line.ptr[host_line_len_without_port - 5 - 8], "mytempdi", 8) == 0 - && (packet->host_line.ptr[host_line_len_without_port - 5 - 8 - 1] == ' ' - || packet->host_line.ptr[host_line_len_without_port - 5 - 8 - 1] == '.')) { - goto end_ddl_found; - } - if (host_line_len_without_port >= 5 + 10 + 1 - && memcmp((void *) &packet->host_line.ptr[host_line_len_without_port - 5 - 10], "uploadpowe", 10) == 0 - && (packet->host_line.ptr[host_line_len_without_port - 5 - 10 - 1] == ' ' - || packet->host_line.ptr[host_line_len_without_port - 5 - 10 - 1] == '.')) { - goto end_ddl_found; - } - goto end_ddl_nothing_found; - } - if (host_line_len_without_port >= 4 + 9 + 1 - && memcmp((void *) &packet->host_line.ptr[host_line_len_without_port - 4 - 9], "mega.1280", 9) == 0 - && (packet->host_line.ptr[host_line_len_without_port - 4 - 9 - 1] == ' ' - || packet->host_line.ptr[host_line_len_without_port - 4 - 9 - 1] == '.')) { - goto end_ddl_found; - } - if (host_line_len_without_port >= 4 + 9 + 1 - && memcmp((void *) &packet->host_line.ptr[host_line_len_without_port - 4 - 9], "filesonic", 9) == 0 - && (packet->host_line.ptr[host_line_len_without_port - 4 - 9 - 1] == ' ' - || packet->host_line.ptr[host_line_len_without_port - 4 - 9 - 1] == '.')) { - goto end_ddl_found; - } - goto end_ddl_nothing_found; - } - if (host_line_len_without_port >= 0 + 4 - && memcmp((void *) &packet->host_line.ptr[host_line_len_without_port - 0 - 4], ".net", 4) == 0) { - if (host_line_len_without_port >= 4 + 7 + 1 - && memcmp((void *) &packet->host_line.ptr[host_line_len_without_port - 4 - 7], "badongo", 7) == 0 - && (packet->host_line.ptr[host_line_len_without_port - 4 - 7 - 1] == ' ' - || packet->host_line.ptr[host_line_len_without_port - 4 - 7 - 1] == '.')) { - goto end_ddl_found; - } - if (host_line_len_without_port >= 4 + 1 && packet->host_line.ptr[host_line_len_without_port - 4 - 1] == 'd') { - if (host_line_len_without_port >= 5 + 3 - && memcmp((void *) &packet->host_line.ptr[host_line_len_without_port - 5 - 3], "loa", 3) == 0) { - if (host_line_len_without_port >= 8 + 5 + 1 - && memcmp((void *) &packet->host_line.ptr[host_line_len_without_port - 8 - 5], "fast-", 5) == 0 - && (packet->host_line.ptr[host_line_len_without_port - 8 - 5 - 1] == ' ' - || packet->host_line.ptr[host_line_len_without_port - 8 - 5 - 1] == '.')) { - goto end_ddl_found; - } - if (host_line_len_without_port >= 8 + 2 - && memcmp((void *) &packet->host_line.ptr[host_line_len_without_port - 8 - 2], "up", 2) == 0) { - if (host_line_len_without_port >= 10 + 5 + 1 - && memcmp((void *) &packet->host_line.ptr[host_line_len_without_port - 10 - 5], "file-", 5) == 0 - && (packet->host_line.ptr[host_line_len_without_port - 10 - 5 - 1] == ' ' - || packet->host_line.ptr[host_line_len_without_port - 10 - 5 - 1] == '.')) { - goto end_ddl_found; - } - if (host_line_len_without_port >= 10 + 6 + 1 - && memcmp((void *) &packet->host_line.ptr[host_line_len_without_port - 10 - 6], "simple", - 6) == 0 && (packet->host_line.ptr[host_line_len_without_port - 10 - 6 - 1] == ' ' - || packet->host_line.ptr[host_line_len_without_port - 10 - 6 - 1] == - '.')) { - goto end_ddl_found; - } - if (host_line_len_without_port >= 10 + 3 + 1 - && memcmp((void *) &packet->host_line.ptr[host_line_len_without_port - 10 - 3], "wii", 3) == 0 - && (packet->host_line.ptr[host_line_len_without_port - 10 - 3 - 1] == ' ' - || packet->host_line.ptr[host_line_len_without_port - 10 - 3 - 1] == '.')) { - goto end_ddl_found; - } - goto end_ddl_nothing_found; - } - goto end_ddl_nothing_found; - } - if (host_line_len_without_port >= 5 + 7 + 1 - && memcmp((void *) &packet->host_line.ptr[host_line_len_without_port - 5 - 7], "filesen", 7) == 0 - && (packet->host_line.ptr[host_line_len_without_port - 5 - 7 - 1] == ' ' - || packet->host_line.ptr[host_line_len_without_port - 5 - 7 - 1] == '.')) { - goto end_ddl_found; - } - goto end_ddl_nothing_found; - } - if (host_line_len_without_port >= 4 + 5 + 1 - && memcmp((void *) &packet->host_line.ptr[host_line_len_without_port - 4 - 5], "filer", 5) == 0 - && (packet->host_line.ptr[host_line_len_without_port - 4 - 5 - 1] == ' ' - || packet->host_line.ptr[host_line_len_without_port - 4 - 5 - 1] == '.')) { - goto end_ddl_found; - } - if (host_line_len_without_port >= 4 + 9 + 1 - && memcmp((void *) &packet->host_line.ptr[host_line_len_without_port - 4 - 9], "livedepot", 9) == 0 - && (packet->host_line.ptr[host_line_len_without_port - 4 - 9 - 1] == ' ' - || packet->host_line.ptr[host_line_len_without_port - 4 - 9 - 1] == '.')) { - goto end_ddl_found; - } - if (host_line_len_without_port >= 4 + 1 && packet->host_line.ptr[host_line_len_without_port - 4 - 1] == 'e') { - if (host_line_len_without_port >= 5 + 5 + 1 - && memcmp((void *) &packet->host_line.ptr[host_line_len_without_port - 5 - 5], "mofil", 5) == 0 - && (packet->host_line.ptr[host_line_len_without_port - 5 - 5 - 1] == ' ' - || packet->host_line.ptr[host_line_len_without_port - 5 - 5 - 1] == '.')) { - goto end_ddl_found; - } - if (host_line_len_without_port >= 5 + 17 + 1 - && memcmp((void *) &packet->host_line.ptr[host_line_len_without_port - 5 - 17], "odsiebie.najlepsz", - 17) == 0 && (packet->host_line.ptr[host_line_len_without_port - 5 - 17 - 1] == ' ' - || packet->host_line.ptr[host_line_len_without_port - 5 - 17 - 1] == '.')) { - goto end_ddl_found; - } - if (host_line_len_without_port >= 5 + 5 + 1 - && memcmp((void *) &packet->host_line.ptr[host_line_len_without_port - 5 - 5], "zshar", 5) == 0 - && (packet->host_line.ptr[host_line_len_without_port - 5 - 5 - 1] == ' ' - || packet->host_line.ptr[host_line_len_without_port - 5 - 5 - 1] == '.')) { - goto end_ddl_found; - } - goto end_ddl_nothing_found; - } - goto end_ddl_nothing_found; - } - if (host_line_len_without_port >= 0 + 1 && packet->host_line.ptr[host_line_len_without_port - 0 - 1] == 'u') { - if (host_line_len_without_port >= 1 + 6 + 1 - && memcmp((void *) &packet->host_line.ptr[host_line_len_without_port - 1 - 6], "data.h", 6) == 0 - && (packet->host_line.ptr[host_line_len_without_port - 1 - 6 - 1] == ' ' - || packet->host_line.ptr[host_line_len_without_port - 1 - 6 - 1] == '.')) { - goto end_ddl_found; - } - if (host_line_len_without_port >= 1 + 2 - && memcmp((void *) &packet->host_line.ptr[host_line_len_without_port - 1 - 2], ".r", 2) == 0) { - if (host_line_len_without_port >= 3 + 10 + 1 - && memcmp((void *) &packet->host_line.ptr[host_line_len_without_port - 3 - 10], "filearchiv", 10) == 0 - && (packet->host_line.ptr[host_line_len_without_port - 3 - 10 - 1] == ' ' - || packet->host_line.ptr[host_line_len_without_port - 3 - 10 - 1] == '.')) { - goto end_ddl_found; - } - if (host_line_len_without_port >= 3 + 8 + 1 - && memcmp((void *) &packet->host_line.ptr[host_line_len_without_port - 3 - 8], "filepost", 8) == 0 - && (packet->host_line.ptr[host_line_len_without_port - 3 - 8 - 1] == ' ' - || packet->host_line.ptr[host_line_len_without_port - 3 - 8 - 1] == '.')) { - goto end_ddl_found; - } - if (host_line_len_without_port >= 3 + 7 + 1 - && memcmp((void *) &packet->host_line.ptr[host_line_len_without_port - 3 - 7], "ifolder", 7) == 0 - && (packet->host_line.ptr[host_line_len_without_port - 3 - 7 - 1] == ' ' - || packet->host_line.ptr[host_line_len_without_port - 3 - 7 - 1] == '.')) { - goto end_ddl_found; - } - goto end_ddl_nothing_found; - } - goto end_ddl_nothing_found; - } - if (host_line_len_without_port >= 0 + 11 + 1 - && memcmp((void *) &packet->host_line.ptr[host_line_len_without_port - 0 - 11], "filehost.tv", 11) == 0 - && (packet->host_line.ptr[host_line_len_without_port - 0 - 11 - 1] == ' ' - || packet->host_line.ptr[host_line_len_without_port - 0 - 11 - 1] == '.')) { - goto end_ddl_found; - } - if (host_line_len_without_port >= 0 + 3 - && memcmp((void *) &packet->host_line.ptr[host_line_len_without_port - 0 - 3], ".to", 3) == 0) { - if (host_line_len_without_port >= 3 + 1 && packet->host_line.ptr[host_line_len_without_port - 3 - 1] == 'e') { - if (host_line_len_without_port >= 4 + 7 + 1 - && memcmp((void *) &packet->host_line.ptr[host_line_len_without_port - 4 - 7], "filesaf", 7) == 0 - && (packet->host_line.ptr[host_line_len_without_port - 4 - 7 - 1] == ' ' - || packet->host_line.ptr[host_line_len_without_port - 4 - 7 - 1] == '.')) { - goto end_ddl_found; - } - if (host_line_len_without_port >= 4 + 8 + 1 - && memcmp((void *) &packet->host_line.ptr[host_line_len_without_port - 4 - 8], "sharebas", 8) == 0 - && (packet->host_line.ptr[host_line_len_without_port - 4 - 8 - 1] == ' ' - || packet->host_line.ptr[host_line_len_without_port - 4 - 8 - 1] == '.')) { - goto end_ddl_found; - } - goto end_ddl_nothing_found; - } - if (host_line_len_without_port >= 3 + 5 + 1 - && memcmp((void *) &packet->host_line.ptr[host_line_len_without_port - 3 - 5], "files", 5) == 0 - && (packet->host_line.ptr[host_line_len_without_port - 3 - 5 - 1] == ' ' - || packet->host_line.ptr[host_line_len_without_port - 3 - 5 - 1] == '.')) { - goto end_ddl_found; - } - if (host_line_len_without_port >= 3 + 1 && packet->host_line.ptr[host_line_len_without_port - 3 - 1] == 'd') { - if (host_line_len_without_port >= 4 + 3 - && memcmp((void *) &packet->host_line.ptr[host_line_len_without_port - 4 - 3], "loa", 3) == 0) { - if (host_line_len_without_port >= 7 + 7 + 1 - && memcmp((void *) &packet->host_line.ptr[host_line_len_without_port - 7 - 7], "file-up", 7) == 0 - && (packet->host_line.ptr[host_line_len_without_port - 7 - 7 - 1] == ' ' - || packet->host_line.ptr[host_line_len_without_port - 7 - 7 - 1] == '.')) { - goto end_ddl_found; - } - if (host_line_len_without_port >= 4 + 3 + 1 - && (packet->host_line.ptr[host_line_len_without_port - 4 - 3 - 1] == ' ' - || packet->host_line.ptr[host_line_len_without_port - 4 - 3 - 1] == '.')) { - goto end_ddl_found; - } - } - if (host_line_len_without_port >= 4 + 7 + 1 - && memcmp((void *) &packet->host_line.ptr[host_line_len_without_port - 4 - 7], "uploade", 7) == 0 - && (packet->host_line.ptr[host_line_len_without_port - 4 - 7 - 1] == ' ' - || packet->host_line.ptr[host_line_len_without_port - 4 - 7 - 1] == '.')) { - goto end_ddl_found; - } - goto end_ddl_nothing_found; - } - goto end_ddl_nothing_found; - } - if (host_line_len_without_port >= 0 + 1 && packet->host_line.ptr[host_line_len_without_port - 0 - 1] == 'z') { - if (host_line_len_without_port >= 1 + 14 + 1 - && memcmp((void *) &packet->host_line.ptr[host_line_len_without_port - 1 - 14], "leteckaposta.c", 14) == 0 - && (packet->host_line.ptr[host_line_len_without_port - 1 - 14 - 1] == ' ' - || packet->host_line.ptr[host_line_len_without_port - 1 - 14 - 1] == '.')) { - goto end_ddl_found; - } - if (host_line_len_without_port >= 1 + 12 + 1 - && memcmp((void *) &packet->host_line.ptr[host_line_len_without_port - 1 - 12], "yourfiles.bi", 12) == 0 - && (packet->host_line.ptr[host_line_len_without_port - 1 - 12 - 1] == ' ' - || packet->host_line.ptr[host_line_len_without_port - 1 - 12 - 1] == '.')) { - goto end_ddl_found; - } - goto end_ddl_nothing_found; - } - if (host_line_len_without_port >= 0 + 1 && packet->host_line.ptr[host_line_len_without_port - 0 - 1] == 'n') { - if (host_line_len_without_port >= 1 + 9 + 1 - && memcmp((void *) &packet->host_line.ptr[host_line_len_without_port - 1 - 9], "netload.i", 9) == 0 - && (packet->host_line.ptr[host_line_len_without_port - 1 - 9 - 1] == ' ' - || packet->host_line.ptr[host_line_len_without_port - 1 - 9 - 1] == '.')) { - goto end_ddl_found; - } - if (host_line_len_without_port >= 1 + 2 - && memcmp((void *) &packet->host_line.ptr[host_line_len_without_port - 1 - 2], ".v", 2) == 0) { - if (host_line_len_without_port >= 3 + 7 + 1 - && memcmp((void *) &packet->host_line.ptr[host_line_len_without_port - 3 - 7], "4shared", 7) == 0 - && (packet->host_line.ptr[host_line_len_without_port - 3 - 7 - 1] == ' ' - || packet->host_line.ptr[host_line_len_without_port - 3 - 7 - 1] == '.')) { - goto end_ddl_found; - } - if (host_line_len_without_port >= 3 + 9 + 1 - && memcmp((void *) &packet->host_line.ptr[host_line_len_without_port - 3 - 9], "megashare", 9) == 0 - && (packet->host_line.ptr[host_line_len_without_port - 3 - 9 - 1] == ' ' - || packet->host_line.ptr[host_line_len_without_port - 3 - 9 - 1] == '.')) { - goto end_ddl_found; - } - goto end_ddl_nothing_found; - } - goto end_ddl_nothing_found; - } - if (host_line_len_without_port >= 0 + 3 - && memcmp((void *) &packet->host_line.ptr[host_line_len_without_port - 0 - 3], ".de", 3) == 0) { - if (host_line_len_without_port >= 3 + 5 - && memcmp((void *) &packet->host_line.ptr[host_line_len_without_port - 3 - 5], "share", 5) == 0) { - if (host_line_len_without_port >= 8 + 5 + 1 - && memcmp((void *) &packet->host_line.ptr[host_line_len_without_port - 8 - 5], "rapid", 5) == 0 - && (packet->host_line.ptr[host_line_len_without_port - 8 - 5 - 1] == ' ' - || packet->host_line.ptr[host_line_len_without_port - 8 - 5 - 1] == '.')) { - goto end_ddl_found; - } - if (host_line_len_without_port >= 8 + 5 + 1 - && memcmp((void *) &packet->host_line.ptr[host_line_len_without_port - 8 - 5], "ultra", 5) == 0 - && (packet->host_line.ptr[host_line_len_without_port - 8 - 5 - 1] == ' ' - || packet->host_line.ptr[host_line_len_without_port - 8 - 5 - 1] == '.')) { - goto end_ddl_found; - } - goto end_ddl_nothing_found; - } - if (host_line_len_without_port >= 3 + 15 + 1 - && memcmp((void *) &packet->host_line.ptr[host_line_len_without_port - 3 - 15], "uploadyourfiles", 15) == 0 - && (packet->host_line.ptr[host_line_len_without_port - 3 - 15 - 1] == ' ' - || packet->host_line.ptr[host_line_len_without_port - 3 - 15 - 1] == '.')) { - goto end_ddl_found; - } - goto end_ddl_nothing_found; - } - if (host_line_len_without_port >= 0 + 14 + 1 - && memcmp((void *) &packet->host_line.ptr[host_line_len_without_port - 0 - 14], "speedshare.org", 14) == 0 - && (packet->host_line.ptr[host_line_len_without_port - 0 - 14 - 1] == ' ' - || packet->host_line.ptr[host_line_len_without_port - 0 - 14 - 1] == '.')) { - goto end_ddl_found; - } - // END OF AUTOMATED CODE GENERATION - - /* This is the hard way. We do this in order to find the download of services when other - domains are involved. This is not significant if ddl is blocked. --> then the link can not be started because - the ads are not viewed. But when ddl is only limited then the download is the important part. - */ - - end_ddl_nothing_found: - NDPI_LOG_DBG2(ndpi_struct, - "Nothing Found\n"); - return 0; - - end_ddl_found: - NDPI_LOG_INFO(ndpi_struct, "found DIRECT DOWNLOAD LINK\n"); - ndpi_int_direct_download_link_add_connection(ndpi_struct, flow); - return 1; -} - - -void ndpi_search_direct_download_link_tcp(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow) -{ - /* do not detect again if it is already ddl */ - if (flow->detected_protocol_stack[0] != NDPI_PROTOCOL_DIRECT_DOWNLOAD_LINK) { - if (search_ddl_domains(ndpi_struct, flow) != 0) { - return; - } - NDPI_EXCLUDE_PROTO(ndpi_struct, flow); - } - -} - -void init_directdownloadlink_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id) -{ - ndpi_set_bitmask_protocol_detection("Direct_Download_Link", ndpi_struct, *id, - NDPI_PROTOCOL_DIRECT_DOWNLOAD_LINK, - ndpi_search_direct_download_link_tcp, - NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION, - SAVE_DETECTION_BITMASK_AS_UNKNOWN, - ADD_TO_DETECTION_BITMASK); - - *id += 1; -} - diff --git a/src/lib/protocols/fasttrack.c b/src/lib/protocols/fasttrack.c deleted file mode 100644 index 88693967a..000000000 --- a/src/lib/protocols/fasttrack.c +++ /dev/null @@ -1,95 +0,0 @@ -/* - * fasttrack.c - * - * Copyright (C) 2009-11 - ipoque GmbH - * Copyright (C) 2011-22 - ntop.org - * - * This file is part of nDPI, an open source deep packet inspection - * library based on the OpenDPI and PACE technology by ipoque GmbH - * - * nDPI is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * nDPI is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with nDPI. If not, see . - * - */ - -#include "ndpi_protocol_ids.h" - -#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_FASTTRACK - -#include "ndpi_api.h" - - -static void ndpi_int_fasttrack_add_connection(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow) -{ - ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_FASTTRACK, NDPI_PROTOCOL_UNKNOWN, NDPI_CONFIDENCE_DPI); -} - - -void ndpi_search_fasttrack_tcp(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow) -{ - struct ndpi_packet_struct *packet = &ndpi_struct->packet; - - NDPI_LOG_DBG(ndpi_struct, "search FASTTRACK\n"); - - if ( (packet->payload != NULL) - && (packet->payload_packet_len > 6) - && (ntohs(get_u_int16_t(packet->payload, packet->payload_packet_len - 2)) == 0x0d0a)) { - NDPI_LOG_DBG2(ndpi_struct, "detected 0d0a at the end of the packet\n"); - - if (memcmp(packet->payload, "GIVE ", 5) == 0 && packet->payload_packet_len >= 8) { - u_int16_t i; - for (i = 5; i < (packet->payload_packet_len - 2); i++) { - // make shure that the argument to GIVE is numeric - if (!(packet->payload[i] >= '0' && packet->payload[i] <= '9')) { - goto exclude_fasttrack; - } - } - - NDPI_LOG_INFO(ndpi_struct, "found FASTTRACK\n"); - ndpi_int_fasttrack_add_connection(ndpi_struct, flow); - return; - } - - if (packet->payload_packet_len > 50 && memcmp(packet->payload, "GET /", 5) == 0) { - u_int16_t a = 0; - NDPI_LOG_DBG2(ndpi_struct, "detected GET /. \n"); - - ndpi_parse_packet_line_info(ndpi_struct, flow); - for (a = 0; a < packet->parsed_lines; a++) { - if ((packet->line[a].len > 17 && memcmp(packet->line[a].ptr, "X-Kazaa-Username: ", 18) == 0) - || (packet->line[a].len > 23 && memcmp(packet->line[a].ptr, "User-Agent: PeerEnabler/", 24) == 0)) { - NDPI_LOG_INFO(ndpi_struct, - "found FASTTRACK X-Kazaa-Username: || User-Agent: PeerEnabler/\n"); - ndpi_int_fasttrack_add_connection(ndpi_struct, flow); - return; - } - } - } - } - - exclude_fasttrack: - NDPI_EXCLUDE_PROTO(ndpi_struct, flow); -} - - -void init_fasttrack_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id) -{ - ndpi_set_bitmask_protocol_detection("FastTrack", ndpi_struct, *id, - NDPI_PROTOCOL_FASTTRACK, - ndpi_search_fasttrack_tcp, - NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION, - SAVE_DETECTION_BITMASK_AS_UNKNOWN, - ADD_TO_DETECTION_BITMASK); - - *id += 1; -} diff --git a/src/lib/protocols/fiesta.c b/src/lib/protocols/fiesta.c deleted file mode 100644 index 40e813bf1..000000000 --- a/src/lib/protocols/fiesta.c +++ /dev/null @@ -1,105 +0,0 @@ -/* - * fiesta.c - * - * Copyright (C) 2009-11 - ipoque GmbH - * Copyright (C) 2011-22 - ntop.org - * - * This file is part of nDPI, an open source deep packet inspection - * library based on the OpenDPI and PACE technology by ipoque GmbH - * - * nDPI is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * nDPI is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with nDPI. If not, see . - * - */ - -#include "ndpi_protocol_ids.h" - -#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_FIESTA - -#include "ndpi_api.h" - - -static void ndpi_int_fiesta_add_connection(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow) -{ - ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_FIESTA, NDPI_PROTOCOL_UNKNOWN, NDPI_CONFIDENCE_DPI); -} - -void ndpi_search_fiesta(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow) -{ - struct ndpi_packet_struct *packet = &ndpi_struct->packet; - - NDPI_LOG_DBG(ndpi_struct, "search fiesta\n"); - - if (flow->l4.tcp.fiesta_stage == 0 && packet->payload_packet_len == 5 - && get_u_int16_t(packet->payload, 0) == ntohs(0x0407) - && (packet->payload[2] == 0x08) - && (packet->payload[4] == 0x00 || packet->payload[4] == 0x01)) { - - NDPI_LOG_DBG2(ndpi_struct, "maybe fiesta symmetric, first packet\n"); - flow->l4.tcp.fiesta_stage = 1 + packet->packet_direction; - goto maybe_fiesta; - } - if (flow->l4.tcp.fiesta_stage == (2 - packet->packet_direction) - && ((packet->payload_packet_len > 1 && packet->payload_packet_len - 1 == packet->payload[0]) - || (packet->payload_packet_len > 3 && packet->payload[0] == 0 - && get_l16(packet->payload, 1) == packet->payload_packet_len - 3))) { - NDPI_LOG_DBG2(ndpi_struct, "Maybe fiesta\n"); - goto maybe_fiesta; - } - if (flow->l4.tcp.fiesta_stage == (1 + packet->packet_direction)) { - if (packet->payload_packet_len == 4 && get_u_int32_t(packet->payload, 0) == htonl(0x03050c01)) { - goto add_fiesta; - } - if (packet->payload_packet_len == 5 && get_u_int32_t(packet->payload, 0) == htonl(0x04030c01) - && packet->payload[4] == 0) { - goto add_fiesta; - } - if (packet->payload_packet_len == 6 && get_u_int32_t(packet->payload, 0) == htonl(0x050e080b)) { - goto add_fiesta; - } - if (packet->payload_packet_len == 100 && packet->payload[0] == 0x63 && packet->payload[61] == 0x52 - && packet->payload[81] == 0x5a && get_u_int16_t(packet->payload, 1) == htons(0x3810) - && get_u_int16_t(packet->payload, 62) == htons(0x6f75)) { - goto add_fiesta; - } - if (packet->payload_packet_len > 3 && packet->payload_packet_len - 1 == packet->payload[0] - && get_u_int16_t(packet->payload, 1) == htons(0x140c)) { - goto add_fiesta; - } - } - - NDPI_EXCLUDE_PROTO(ndpi_struct, flow); - return; - - maybe_fiesta: - NDPI_LOG_DBG2(ndpi_struct, "Stage is set to %d\n", flow->l4.tcp.fiesta_stage); - return; - - add_fiesta: - NDPI_LOG_INFO(ndpi_struct, "found fiesta\n"); - ndpi_int_fiesta_add_connection(ndpi_struct, flow); - return; -} - - -void init_fiesta_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id) -{ - ndpi_set_bitmask_protocol_detection("Fiesta", ndpi_struct, *id, - NDPI_PROTOCOL_FIESTA, - ndpi_search_fiesta, - NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION, - SAVE_DETECTION_BITMASK_AS_UNKNOWN, - ADD_TO_DETECTION_BITMASK); - - *id += 1; -} diff --git a/src/lib/protocols/florensia.c b/src/lib/protocols/florensia.c deleted file mode 100644 index 13bbe7d4d..000000000 --- a/src/lib/protocols/florensia.c +++ /dev/null @@ -1,130 +0,0 @@ -/* - * florensia.c - * - * Copyright (C) 2009-11 - ipoque GmbH - * Copyright (C) 2011-22 - ntop.org - * - * This file is part of nDPI, an open source deep packet inspection - * library based on the OpenDPI and PACE technology by ipoque GmbH - * - * nDPI is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * nDPI is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with nDPI. If not, see . - * - */ - -#include "ndpi_protocol_ids.h" - -#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_FLORENSIA - -#include "ndpi_api.h" - - -static void ndpi_florensia_add_connection(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow) -{ - ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_FLORENSIA, NDPI_PROTOCOL_UNKNOWN, NDPI_CONFIDENCE_DPI); -} - -void ndpi_search_florensia(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow) -{ - struct ndpi_packet_struct *packet = &ndpi_struct->packet; - - NDPI_LOG_DBG(ndpi_struct, "search florensia\n"); - - if (packet->tcp != NULL) { - if (packet->payload_packet_len == 5 && get_l16(packet->payload, 0) == packet->payload_packet_len - && packet->payload[2] == 0x65 && packet->payload[4] == 0xff) { - if (flow->florensia_stage == 1) { - NDPI_LOG_INFO(ndpi_struct, "found florensia\n"); - ndpi_florensia_add_connection(ndpi_struct, flow); - return; - } - NDPI_LOG_DBG2(ndpi_struct, "maybe florensia -> stage is set to 1\n"); - flow->florensia_stage = 1; - return; - } - if (packet->payload_packet_len > 8 && get_l16(packet->payload, 0) == packet->payload_packet_len - && get_u_int16_t(packet->payload, 2) == htons(0x0201) && get_u_int32_t(packet->payload, 4) == htonl(0xFFFFFFFF)) { - NDPI_LOG_DBG2(ndpi_struct, "maybe florensia -> stage is set to 1\n"); - flow->florensia_stage = 1; - return; - } - if (packet->payload_packet_len == 406 && get_l16(packet->payload, 0) == packet->payload_packet_len - && packet->payload[2] == 0x63) { - NDPI_LOG_DBG2(ndpi_struct, "maybe florensia -> stage is set to 1\n"); - flow->florensia_stage = 1; - return; - } - if (packet->payload_packet_len == 12 && get_l16(packet->payload, 0) == packet->payload_packet_len - && get_u_int16_t(packet->payload, 2) == htons(0x0301)) { - if (flow->florensia_stage == 1) { - NDPI_LOG_INFO(ndpi_struct, "found florensia\n"); - ndpi_florensia_add_connection(ndpi_struct, flow); - return; - } - NDPI_LOG_DBG2(ndpi_struct, "maybe florensia -> stage is set to 1\n"); - flow->florensia_stage = 1; - return; - } - - if (flow->florensia_stage == 1) { - if (packet->payload_packet_len == 8 && get_l16(packet->payload, 0) == packet->payload_packet_len - && get_u_int16_t(packet->payload, 2) == htons(0x0302) && get_u_int32_t(packet->payload, 4) == htonl(0xFFFFFFFF)) { - NDPI_LOG_INFO(ndpi_struct, "found florensia asymmetrically\n"); - ndpi_florensia_add_connection(ndpi_struct, flow); - return; - } - if (packet->payload_packet_len == 24 && get_l16(packet->payload, 0) == packet->payload_packet_len - && get_u_int16_t(packet->payload, 2) == htons(0x0202) - && get_u_int32_t(packet->payload, packet->payload_packet_len - 4) == htonl(0xFFFFFFFF)) { - NDPI_LOG_INFO(ndpi_struct, "found florensia\n"); - ndpi_florensia_add_connection(ndpi_struct, flow); - return; - } - if (flow->packet_counter < 10 && packet->payload_packet_len >=2 && - get_l16(packet->payload, 0) == packet->payload_packet_len) { - NDPI_LOG_DBG2(ndpi_struct, "maybe florensia\n"); - return; - } - } - } - - if (packet->udp != NULL) { - if (flow->florensia_stage == 0 && packet->payload_packet_len == 6 - && get_u_int16_t(packet->payload, 0) == ntohs(0x0503) && get_u_int32_t(packet->payload, 2) == htonl(0xFFFF0000)) { - NDPI_LOG_DBG2(ndpi_struct, "maybe florensia -> stage is set to 1\n"); - flow->florensia_stage = 1; - return; - } - if (flow->florensia_stage == 1 && packet->payload_packet_len == 8 - && get_u_int16_t(packet->payload, 0) == ntohs(0x0500) && get_u_int16_t(packet->payload, 4) == htons(0x4191)) { - NDPI_LOG_INFO(ndpi_struct, "found florensia\n"); - ndpi_florensia_add_connection(ndpi_struct, flow); - return; - } - } - - NDPI_EXCLUDE_PROTO(ndpi_struct, flow); -} - - -void init_florensia_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id) -{ - ndpi_set_bitmask_protocol_detection("Florensia", ndpi_struct, *id, - NDPI_PROTOCOL_FLORENSIA, - ndpi_search_florensia, - NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_OR_UDP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION, - SAVE_DETECTION_BITMASK_AS_UNKNOWN, - ADD_TO_DETECTION_BITMASK); - - *id += 1; -} diff --git a/src/lib/protocols/openft.c b/src/lib/protocols/openft.c deleted file mode 100644 index c9bfd4ea8..000000000 --- a/src/lib/protocols/openft.c +++ /dev/null @@ -1,67 +0,0 @@ -/* - * openft.c - * - * Copyright (C) 2009-11 - ipoque GmbH - * Copyright (C) 2011-22 - ntop.org - * - * This file is part of nDPI, an open source deep packet inspection - * library based on the OpenDPI and PACE technology by ipoque GmbH - * - * nDPI is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * nDPI is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with nDPI. If not, see . - * - */ - -#include "ndpi_protocol_ids.h" - -#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_OPENFT - -#include "ndpi_api.h" - -static void ndpi_int_openft_add_connection(struct ndpi_detection_module_struct - *ndpi_struct, struct ndpi_flow_struct *flow) -{ - ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_OPENFT, NDPI_PROTOCOL_UNKNOWN, NDPI_CONFIDENCE_DPI); -} - -void ndpi_search_openft_tcp(struct ndpi_detection_module_struct - *ndpi_struct, struct ndpi_flow_struct *flow) -{ - struct ndpi_packet_struct *packet = &ndpi_struct->packet; - - if (packet->payload_packet_len > 5 && memcmp(packet->payload, "GET /", 5) == 0) { - NDPI_LOG_DBG2(ndpi_struct, "HTTP packet detected\n"); - ndpi_parse_packet_line_info(ndpi_struct, flow); - if (packet->parsed_lines >= 2 - && packet->line[1].len > 13 && memcmp(packet->line[1].ptr, "X-OpenftAlias:", 14) == 0) { - NDPI_LOG_INFO(ndpi_struct, "found OpenFT\n"); - ndpi_int_openft_add_connection(ndpi_struct, flow); - return; - } - } - - NDPI_EXCLUDE_PROTO(ndpi_struct, flow); -} - - -void init_openft_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id) -{ - ndpi_set_bitmask_protocol_detection("OpenFT", ndpi_struct, *id, - NDPI_PROTOCOL_OPENFT, - ndpi_search_openft_tcp, - NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION, - SAVE_DETECTION_BITMASK_AS_UNKNOWN, - ADD_TO_DETECTION_BITMASK); - - *id += 1; -} diff --git a/src/lib/protocols/ppstream.c b/src/lib/protocols/ppstream.c index d54a994af..a1c68e404 100644 --- a/src/lib/protocols/ppstream.c +++ b/src/lib/protocols/ppstream.c @@ -228,7 +228,7 @@ void init_ppstream_dissector(struct ndpi_detection_module_struct *ndpi_struct, u ndpi_set_bitmask_protocol_detection("PPStream", ndpi_struct, *id, NDPI_PROTOCOL_PPSTREAM, ndpi_search_ppstream, - NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_OR_UDP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION, + NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_UDP_WITH_PAYLOAD, SAVE_DETECTION_BITMASK_AS_UNKNOWN, ADD_TO_DETECTION_BITMASK); diff --git a/src/lib/protocols/shoutcast.c b/src/lib/protocols/shoutcast.c deleted file mode 100644 index 155e2cea7..000000000 --- a/src/lib/protocols/shoutcast.c +++ /dev/null @@ -1,118 +0,0 @@ -/* - * shoutcast.c - * - * Copyright (C) 2009-11 - ipoque GmbH - * Copyright (C) 2011-22 - ntop.org - * - * This file is part of nDPI, an open source deep packet inspection - * library based on the OpenDPI and PACE technology by ipoque GmbH - * - * nDPI is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * nDPI is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with nDPI. If not, see . - * - */ - -#include "ndpi_protocol_ids.h" - -#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_SHOUTCAST - -#include "ndpi_api.h" - -static void ndpi_int_shoutcast_add_connection(struct ndpi_detection_module_struct - *ndpi_struct, struct ndpi_flow_struct *flow) -{ - ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_SHOUTCAST, NDPI_PROTOCOL_UNKNOWN, NDPI_CONFIDENCE_DPI); -} - -void ndpi_search_shoutcast_tcp(struct ndpi_detection_module_struct - *ndpi_struct, struct ndpi_flow_struct *flow) -{ - struct ndpi_packet_struct *packet = &ndpi_struct->packet; - - - NDPI_LOG_DBG(ndpi_struct, "search shoutcast\n"); - - if (flow->packet_counter == 1) { -/* this case in paul_upload_oddcast_002.pcap */ - if (packet->payload_packet_len >= 6 - && packet->payload_packet_len < 80 && memcmp(packet->payload, "123456", 6) == 0) { - NDPI_LOG_DBG2(ndpi_struct, "Shoutcast stage 1, \"123456\"\n"); - return; - } - if (flow->packet_counter < 3 - && flow->detected_protocol_stack[0] == NDPI_PROTOCOL_HTTP - ) { - NDPI_LOG_DBG2(ndpi_struct, - "http detected, need next packet for shoutcast detection.\n"); - if (packet->payload_packet_len > 4 - && get_u_int32_t(packet->payload, packet->payload_packet_len - 4) != htonl(0x0d0a0d0a)) { - NDPI_LOG_DBG2(ndpi_struct, "segmented packet found\n"); - flow->l4.tcp.shoutcast_stage = 1 + packet->packet_direction; - } - return; - } - - - /* else - goto exclude_shoutcast; */ - - } - /* evtl. für asym detection noch User-Agent:Winamp dazunehmen. */ - if (packet->payload_packet_len > 11 && memcmp(packet->payload, "ICY 200 OK\x0d\x0a", 12) == 0) { - NDPI_LOG_INFO(ndpi_struct, "found shoutcast by ICY 200 OK\n"); - ndpi_int_shoutcast_add_connection(ndpi_struct, flow); - return; - } - if (flow->l4.tcp.shoutcast_stage == 1 + packet->packet_direction - && flow->packet_direction_counter[packet->packet_direction] < 5) { - return; - } - - if (flow->packet_counter == 2) { - if (packet->payload_packet_len == 2 && memcmp(packet->payload, "\x0d\x0a", 2) == 0) { - NDPI_LOG_DBG2(ndpi_struct, "Shoutcast stage 1 continuation\n"); - return; - } else if (packet->payload_packet_len > 3 && memcmp(&packet->payload[0], "OK2", 3) == 0) { - NDPI_LOG_DBG2(ndpi_struct, "Shoutcast stage 2, OK2 found\n"); - return; - } else - goto exclude_shoutcast; - } else if (flow->packet_counter == 3 || flow->packet_counter == 4) { - if (packet->payload_packet_len > 3 && memcmp(&packet->payload[0], "OK2", 3) == 0) { - NDPI_LOG_DBG2(ndpi_struct, "Shoutcast stage 2, OK2 found\n"); - return; - } else if (packet->payload_packet_len > 4 && memcmp(&packet->payload[0], "icy-", 4) == 0) { - NDPI_LOG_INFO(ndpi_struct, "found Shoutcast\n"); - ndpi_int_shoutcast_add_connection(ndpi_struct, flow); - return; - } else - goto exclude_shoutcast; - } - - exclude_shoutcast: - NDPI_EXCLUDE_PROTO(ndpi_struct, flow); -} - - -void init_shoutcast_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id) -{ - ndpi_set_bitmask_protocol_detection("ShoutCast", ndpi_struct, *id, - NDPI_PROTOCOL_SHOUTCAST, - ndpi_search_shoutcast_tcp, - NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION, - SAVE_DETECTION_BITMASK_AS_UNKNOWN, - ADD_TO_DETECTION_BITMASK); - - *id += 1; -} - diff --git a/src/lib/protocols/sopcast.c b/src/lib/protocols/sopcast.c deleted file mode 100644 index b903538cc..000000000 --- a/src/lib/protocols/sopcast.c +++ /dev/null @@ -1,223 +0,0 @@ -/* - * sopcast.c - * - * Copyright (C) 2009-11 - ipoque GmbH - * Copyright (C) 2011-22 - ntop.org - * - * This file is part of nDPI, an open source deep packet inspection - * library based on the OpenDPI and PACE technology by ipoque GmbH - * - * nDPI is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * nDPI is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with nDPI. If not, see . - * - */ - -#include "ndpi_protocol_ids.h" - -#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_SOPCAST - -#include "ndpi_api.h" - - -static void ndpi_int_sopcast_add_connection(struct ndpi_detection_module_struct - *ndpi_struct, struct ndpi_flow_struct *flow) -{ - ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_SOPCAST, NDPI_PROTOCOL_UNKNOWN, NDPI_CONFIDENCE_DPI); -} - -/** - * this function checks for sopcast tcp pattern - * - * NOTE: if you add more patterns please keep the number of if levels - * low, it is already complex enough - */ - -#if !defined(WIN32) -static inline -#elif defined(MINGW_GCC) -__mingw_forceinline static -#else -__forceinline static -#endif -u_int8_t ndpi_int_is_sopcast_tcp(const u_int8_t * payload, const u_int16_t payload_len) -{ - if (payload[2] != payload[3] - 4 && payload[2] != payload[3] + 4) - return 0; - - if (payload[2] != payload[4] - 1 && payload[2] != payload[4] + 1) - return 0; - - if (payload[25] != payload[25 + 16 - 1] + 1 && payload[25] != payload[25 + 16 - 1] - 1) { - - if (payload[3] != payload[25] && - payload[3] != payload[25] - 4 && payload[3] != payload[25] + 4 && payload[3] != payload[25] - 21) { - return 0; - } - } - - if (payload[4] != payload[28] || - payload[28] != payload[30] || - payload[30] != payload[31] || - get_u_int16_t(payload, 30) != get_u_int16_t(payload, 32) || get_u_int16_t(payload, 32) != get_u_int16_t(payload, 34)) { - - if ((payload[2] != payload[5] - 1 && payload[2] != payload[5] + 1) || - payload[2] != payload[25] || - payload[4] != payload[28] || - payload[4] != payload[31] || - payload[4] != payload[32] || - payload[4] != payload[33] || - payload[4] != payload[34] || - payload[4] != payload[35] || payload[4] != payload[30] || payload[2] != payload[36]) { - return 0; - } - } - - if (payload[42] != payload[53]) - return 0; - - if (payload[45] != payload[46] + 1 && payload[45] != payload[46] - 1) - return 0; - - if (payload[45] != payload[49] || payload[46] != payload[50] || payload[47] != payload[51]) - return 0; - - return 1; -} - -static void ndpi_search_sopcast_tcp(struct ndpi_detection_module_struct - *ndpi_struct, struct ndpi_flow_struct *flow) -{ - - struct ndpi_packet_struct *packet = &ndpi_struct->packet; - - if (flow->packet_counter == 1 && packet->payload_packet_len == 54 && get_u_int16_t(packet->payload, 0) == ntohs(0x0036)) { - if (ndpi_int_is_sopcast_tcp(packet->payload, packet->payload_packet_len)) { - NDPI_LOG_INFO(ndpi_struct, "found sopcast TCP \n"); - ndpi_int_sopcast_add_connection(ndpi_struct, flow); - return; - } - } - - NDPI_EXCLUDE_PROTO(ndpi_struct, flow); - -} - -static void ndpi_search_sopcast_udp(struct ndpi_detection_module_struct - *ndpi_struct, struct ndpi_flow_struct *flow) -{ - struct ndpi_packet_struct *packet = &ndpi_struct->packet; - - NDPI_LOG_DBG(ndpi_struct, "search sopcast. \n"); - - if (packet->payload_packet_len == 52 && packet->payload[0] == 0xff - && packet->payload[1] == 0xff && packet->payload[2] == 0x01 - && packet->payload[8] == 0x02 && packet->payload[9] == 0xff - && packet->payload[10] == 0x00 && packet->payload[11] == 0x2c - && packet->payload[12] == 0x00 && packet->payload[13] == 0x00 && packet->payload[14] == 0x00) { - NDPI_LOG_INFO(ndpi_struct, "found sopcast with if I. \n"); - ndpi_int_sopcast_add_connection(ndpi_struct, flow); - return; - } - if ((packet->payload_packet_len == 80 || packet->payload_packet_len == 28 || packet->payload_packet_len == 94) - && packet->payload[0] == 0x00 && (packet->payload[2] == 0x02 || packet->payload[2] == 0x01) - && packet->payload[8] == 0x01 && packet->payload[9] == 0xff - && packet->payload[10] == 0x00 && packet->payload[11] == 0x14 - && packet->payload[12] == 0x00 && packet->payload[13] == 0x00) { - NDPI_LOG_INFO(ndpi_struct, "found sopcast with if II. \n"); - ndpi_int_sopcast_add_connection(ndpi_struct, flow); - return; - } - /* this case has been seen once. Please remove this comment, if you see it another time */ - if (packet->payload_packet_len == 60 && packet->payload[0] == 0x00 - && packet->payload[2] == 0x01 - && packet->payload[8] == 0x03 && packet->payload[9] == 0xff - && packet->payload[10] == 0x00 && packet->payload[11] == 0x34 - && packet->payload[12] == 0x00 && packet->payload[13] == 0x00 && packet->payload[14] == 0x00) { - NDPI_LOG_INFO(ndpi_struct, "found sopcast with if III. \n"); - ndpi_int_sopcast_add_connection(ndpi_struct, flow); - return; - } - if (packet->payload_packet_len == 42 && packet->payload[0] == 0x00 - && packet->payload[1] == 0x02 && packet->payload[2] == 0x01 - && packet->payload[3] == 0x07 && packet->payload[4] == 0x03 - && packet->payload[8] == 0x06 - && packet->payload[9] == 0x01 && packet->payload[10] == 0x00 - && packet->payload[11] == 0x22 && packet->payload[12] == 0x00 && packet->payload[13] == 0x00) { - NDPI_LOG_INFO(ndpi_struct, "found sopcast with if IV. \n"); - ndpi_int_sopcast_add_connection(ndpi_struct, flow); - return; - } - if (packet->payload_packet_len == 28 && packet->payload[0] == 0x00 - && packet->payload[1] == 0x0c && packet->payload[2] == 0x01 - && packet->payload[3] == 0x07 && packet->payload[4] == 0x00 - && packet->payload[8] == 0x01 - && packet->payload[9] == 0x01 && packet->payload[10] == 0x00 - && packet->payload[11] == 0x14 && packet->payload[12] == 0x00 && packet->payload[13] == 0x00) { - NDPI_LOG_INFO(ndpi_struct, "found sopcast with if V. \n"); - ndpi_int_sopcast_add_connection(ndpi_struct, flow); - return; - } - /* this case has been seen once. Please remove this comment, if you see it another time */ - if (packet->payload_packet_len == 286 && packet->payload[0] == 0x00 - && packet->payload[1] == 0x02 && packet->payload[2] == 0x01 - && packet->payload[3] == 0x07 && packet->payload[4] == 0x03 - && packet->payload[8] == 0x06 - && packet->payload[9] == 0x01 && packet->payload[10] == 0x01 - && packet->payload[11] == 0x16 && packet->payload[12] == 0x00 && packet->payload[13] == 0x00) { - NDPI_LOG_INFO(ndpi_struct, "found sopcast with if VI. \n"); - ndpi_int_sopcast_add_connection(ndpi_struct, flow); - return; - } - if (packet->payload_packet_len == 76 && packet->payload[0] == 0xff - && packet->payload[1] == 0xff && packet->payload[2] == 0x01 - && packet->payload[8] == 0x0c && packet->payload[9] == 0xff - && packet->payload[10] == 0x00 && packet->payload[11] == 0x44 - && packet->payload[16] == 0x01 && packet->payload[15] == 0x01 - && packet->payload[12] == 0x00 && packet->payload[13] == 0x00 && packet->payload[14] == 0x00) { - NDPI_LOG_INFO(ndpi_struct, "found sopcast with if VII. \n"); - ndpi_int_sopcast_add_connection(ndpi_struct, flow); - return; - } - - /* Attention please: no asymmetric detection necessary. This detection works asymmetrically as well. */ - - NDPI_LOG_DBG(ndpi_struct, "exclude sopcast. \n"); - NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_SOPCAST); - -} - -void ndpi_search_sopcast(struct ndpi_detection_module_struct - *ndpi_struct, struct ndpi_flow_struct *flow) -{ - struct ndpi_packet_struct *packet = &ndpi_struct->packet; - - if (packet->udp != NULL) - ndpi_search_sopcast_udp(ndpi_struct, flow); - if (packet->tcp != NULL) - ndpi_search_sopcast_tcp(ndpi_struct, flow); - -} - - -void init_sopcast_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id) -{ - ndpi_set_bitmask_protocol_detection("Sopcast", ndpi_struct, *id, - NDPI_PROTOCOL_SOPCAST, - ndpi_search_sopcast, - NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_OR_UDP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION, - SAVE_DETECTION_BITMASK_AS_UNKNOWN, - ADD_TO_DETECTION_BITMASK); - - *id += 1; -} - diff --git a/src/lib/protocols/stealthnet.c b/src/lib/protocols/stealthnet.c deleted file mode 100644 index f4099e194..000000000 --- a/src/lib/protocols/stealthnet.c +++ /dev/null @@ -1,69 +0,0 @@ -/* - * stealthnet.c - * - * Copyright (C) 2009-11 - ipoque GmbH - * Copyright (C) 2011-22 - ntop.org - * - * This file is part of nDPI, an open source deep packet inspection - * library based on the OpenDPI and PACE technology by ipoque GmbH - * - * nDPI is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * nDPI is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with nDPI. If not, see . - * - */ - -#include "ndpi_protocol_ids.h" - -#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_STEALTHNET - -#include "ndpi_api.h" - - -static void ndpi_int_stealthnet_add_connection(struct ndpi_detection_module_struct - *ndpi_struct, struct ndpi_flow_struct *flow) -{ - ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_STEALTHNET, NDPI_PROTOCOL_UNKNOWN, NDPI_CONFIDENCE_DPI); -} - -void ndpi_search_stealthnet(struct ndpi_detection_module_struct - *ndpi_struct, struct ndpi_flow_struct *flow) -{ - struct ndpi_packet_struct *packet = &ndpi_struct->packet; - - NDPI_LOG_DBG(ndpi_struct, "search stealthnet\n"); - - if (packet->payload_packet_len > 40 - && memcmp(packet->payload, "LARS REGENSBURGER'S FILE SHARING PROTOCOL", 41) == 0) { - NDPI_LOG_INFO(ndpi_struct, "found stealthnet\n"); - ndpi_int_stealthnet_add_connection(ndpi_struct, flow); - return; - } - - NDPI_EXCLUDE_PROTO(ndpi_struct, flow); - -} - - -void init_stealthnet_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id) -{ - - ndpi_set_bitmask_protocol_detection("Stealthnet", ndpi_struct, *id, - NDPI_PROTOCOL_STEALTHNET, - ndpi_search_stealthnet, - NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION, - SAVE_DETECTION_BITMASK_AS_UNKNOWN, - ADD_TO_DETECTION_BITMASK); - - *id += 1; -} - diff --git a/src/lib/protocols/thunder.c b/src/lib/protocols/thunder.c deleted file mode 100644 index 258e7750f..000000000 --- a/src/lib/protocols/thunder.c +++ /dev/null @@ -1,193 +0,0 @@ -/* - * thunder.c - * - * Copyright (C) 2009-11 - ipoque GmbH - * Copyright (C) 2011-22 - ntop.org - * - * This file is part of nDPI, an open source deep packet inspection - * library based on the OpenDPI and PACE technology by ipoque GmbH - * - * nDPI is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * nDPI is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with nDPI. If not, see . - * - */ - -#include "ndpi_protocol_ids.h" - -#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_THUNDER - -#include "ndpi_api.h" - - -static void ndpi_int_thunder_add_connection(struct ndpi_detection_module_struct *ndpi_struct, - struct ndpi_flow_struct *flow/* , ndpi_protocol_type_t protocol_type */) -{ - ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_THUNDER, NDPI_PROTOCOL_UNKNOWN, NDPI_CONFIDENCE_DPI); -} - - - -#if !defined(WIN32) -static inline -#elif defined(MINGW_GCC) -__mingw_forceinline static -#else -__forceinline static -#endif -void ndpi_int_search_thunder_udp(struct ndpi_detection_module_struct - *ndpi_struct, struct ndpi_flow_struct *flow) -{ - struct ndpi_packet_struct *packet = &ndpi_struct->packet; - - if (packet->payload_packet_len > 8 && packet->payload[0] >= 0x30 - && packet->payload[0] < 0x40 && packet->payload[1] == 0 && packet->payload[2] == 0 && packet->payload[3] == 0) { - if (flow->thunder_stage == 3) { - NDPI_LOG_INFO(ndpi_struct, "found THUNDER udp\n"); - ndpi_int_thunder_add_connection(ndpi_struct, flow); - return; - } - - flow->thunder_stage++; - NDPI_LOG_DBG2(ndpi_struct, - "maybe thunder udp packet detected, stage increased to %u\n", flow->thunder_stage); - return; - } - - NDPI_LOG_DBG(ndpi_struct, "excluding thunder udp at stage %u\n", flow->thunder_stage); - NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_THUNDER); -} - - -#if !defined(WIN32) -static inline -#elif defined(MINGW_GCC) -__mingw_forceinline static -#else -__forceinline static -#endif -void ndpi_int_search_thunder_tcp(struct ndpi_detection_module_struct - *ndpi_struct, struct ndpi_flow_struct *flow) -{ - struct ndpi_packet_struct *packet = &ndpi_struct->packet; - - if (packet->payload_packet_len > 8 && packet->payload[0] >= 0x30 - && packet->payload[0] < 0x40 && packet->payload[1] == 0 && packet->payload[2] == 0 && packet->payload[3] == 0) { - if (flow->thunder_stage == 3) { - NDPI_LOG_INFO(ndpi_struct, "found THUNDER tcp\n"); - ndpi_int_thunder_add_connection(ndpi_struct, flow); - return; - } - - flow->thunder_stage++; - NDPI_LOG_DBG2(ndpi_struct, - "maybe thunder tcp packet detected, stage increased to %u\n", flow->thunder_stage); - return; - } - - if (flow->thunder_stage == 0 && packet->payload_packet_len > 17 - && memcmp(packet->payload, "POST / HTTP/1.1\r\n", 17) == 0) { - ndpi_parse_packet_line_info(ndpi_struct, flow); - - NDPI_LOG_DBG2(ndpi_struct, - "maybe thunder http POST packet detected, parsed packet lines: %u, empty line set %u (at: %u)\n", - packet->parsed_lines, packet->empty_line_position_set, packet->empty_line_position); - - if (packet->empty_line_position_set != 0 && - packet->content_line.ptr != NULL && - packet->content_line.len == 24 && - memcmp(packet->content_line.ptr, "application/octet-stream", - 24) == 0 && packet->empty_line_position_set < (packet->payload_packet_len - 8) - && packet->payload_packet_len > (packet->empty_line_position + 5) - && packet->payload[packet->empty_line_position + 2] >= 0x30 - && packet->payload[packet->empty_line_position + 2] < 0x40 - && packet->payload[packet->empty_line_position + 3] == 0x00 - && packet->payload[packet->empty_line_position + 4] == 0x00 - && packet->payload[packet->empty_line_position + 5] == 0x00) { - NDPI_LOG_INFO(ndpi_struct, - "found thunder http POST packet application does match\n"); - ndpi_int_thunder_add_connection(ndpi_struct, flow); - return; - } - } - NDPI_LOG_DBG(ndpi_struct, "excluding thunder tcp at stage %u\n", flow->thunder_stage); - NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_THUNDER); -} - - -#if !defined(WIN32) -static inline -#elif defined(MINGW_GCC) -__mingw_forceinline static -#else -__forceinline static -#endif -void ndpi_int_search_thunder_http(struct ndpi_detection_module_struct - *ndpi_struct, struct ndpi_flow_struct *flow) -{ - struct ndpi_packet_struct *packet = &ndpi_struct->packet; - - if (packet->payload_packet_len > 5 - && memcmp(packet->payload, "GET /", 5) == 0) { - NDPI_LOG_DBG2(ndpi_struct, "HTTP packet detected\n"); - ndpi_parse_packet_line_info(ndpi_struct, flow); - - if (packet->parsed_lines > 7 - && packet->parsed_lines < 11 - && packet->line[1].len > 10 - && memcmp(packet->line[1].ptr, "Accept: */*", 11) == 0 - && packet->line[2].len > 22 - && memcmp(packet->line[2].ptr, "Cache-Control: no-cache", - 23) == 0 && packet->line[3].len > 16 - && memcmp(packet->line[3].ptr, "Connection: close", 17) == 0 - && packet->line[4].len > 6 - && memcmp(packet->line[4].ptr, "Host: ", 6) == 0 - && packet->line[5].len > 15 - && memcmp(packet->line[5].ptr, "Pragma: no-cache", 16) == 0 - && packet->user_agent_line.ptr != NULL - && packet->user_agent_line.len > 49 - && memcmp(packet->user_agent_line.ptr, - "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.0)", 50) == 0) { - NDPI_LOG_INFO(ndpi_struct, - "found thunder HTTP download detected\n"); - ndpi_int_thunder_add_connection(ndpi_struct, flow); - } - } -} - -void ndpi_search_thunder(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow) -{ - struct ndpi_packet_struct *packet = &ndpi_struct->packet; - // - //struct ndpi_id_struct *src = flow->src; - //struct ndpi_id_struct *dst = flow->dst; - - if (packet->tcp != NULL) { - ndpi_int_search_thunder_http(ndpi_struct, flow); - ndpi_int_search_thunder_tcp(ndpi_struct, flow); - } else if (packet->udp != NULL) { - ndpi_int_search_thunder_udp(ndpi_struct, flow); - } -} - - -void init_thunder_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id) -{ - ndpi_set_bitmask_protocol_detection("Thunder", ndpi_struct, *id, - NDPI_PROTOCOL_THUNDER, - ndpi_search_thunder, - NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_OR_UDP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION, - SAVE_DETECTION_BITMASK_AS_UNKNOWN, - ADD_TO_DETECTION_BITMASK); - - *id += 1; -} diff --git a/tests/pcap/aimini-http.pcap b/tests/pcap/aimini-http.pcap deleted file mode 100644 index e844cd094b2f97b0e284397e6ca4cf004b92ff58..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 91784 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 UHvg+nIOE%80{FQ 10.102.0.2:80 [proto: 7.99/HTTP.Aimini][IP: 0/Unknown][ClearText][Confidence: DPI][cat: Download/7][38 pkts/36756 bytes <-> 34 pkts/28010 bytes][Goodput ratio: 94/93][0.00 sec][Hostname/SNI: www.aimini.net][bytes ratio: 0.135 (Mixed)][IAT c2s/s2c min/avg/max/stddev: 0/0 0/0 1/0 0/0][Pkt Len c2s/s2c min/avg/max/stddev: 60/60 967/824 1514/1514 664/699][URL: www.aimini.net/member/signup/][StatusCode: 200][User-Agent: Mozilla/5.0 (Windows; U; Windows NT 6.1; en-US; rv:1.9.2.17) Gecko/20110420 Firefox/3.6.17][PLAIN TEXT (GET /member/signup/ HTTP/1.1)][Plen Bins: 0,0,0,0,0,0,0,4,0,0,0,0,0,0,0,0,0,0,4,0,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4,0,0,0,0,0,0,0,0,0,83,0,0] - 2 TCP 10.101.0.2:28503 <-> 10.102.0.2:80 [proto: 7.99/HTTP.Aimini][IP: 0/Unknown][ClearText][Confidence: DPI][cat: Download/7][12 pkts/1920 bytes <-> 18 pkts/13384 bytes][Goodput ratio: 63/92][0.00 sec][Hostname/SNI: www.aimini.net][bytes ratio: -0.749 (Download)][IAT c2s/s2c min/avg/max/stddev: 0/0 0/0 0/0 0/0][Pkt Len c2s/s2c min/avg/max/stddev: 60/60 160/744 658/1514 223/696][URL: www.aimini.net/search/?q=pictures&sca=][StatusCode: 200][User-Agent: Mozilla/5.0 (Windows; U; Windows NT 6.1; en-US; rv:1.9.2.17) Gecko/20110420 Firefox/3.6.17][PLAIN TEXT (GET /search/)][Plen Bins: 0,0,0,0,0,0,0,0,0,0,16,0,0,0,0,0,0,0,16,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,67,0,0] - 3 TCP 10.101.0.2:28502 <-> 10.102.0.2:80 [proto: 7.99/HTTP.Aimini][IP: 0/Unknown][ClearText][Confidence: DPI][cat: Download/7][10 pkts/2690 bytes <-> 8 pkts/1544 bytes][Goodput ratio: 78/70][0.00 sec][Hostname/SNI: www.aimini.com][bytes ratio: 0.271 (Upload)][IAT c2s/s2c min/avg/max/stddev: 0/0 0/0 0/0 0/0][Pkt Len c2s/s2c min/avg/max/stddev: 60/60 269/193 585/339 255/132][URL: www.aimini.com/webcounter/w.php?___hm=.net_SignUp_&_lh_=http://www.aimini.net/member/signup/&__Refer_=http://www.aimini.net/][StatusCode: 200][User-Agent: Mozilla/5.0 (Windows; U; Windows NT 6.1; en-US; rv:1.9.2.17) Gecko/20110420 Firefox/3.6.17][PLAIN TEXT (GET /webcounter/w.php)][Plen Bins: 0,0,0,0,0,0,0,0,50,0,0,0,0,0,0,0,50,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] - 4 TCP 10.101.0.2:28504 <-> 10.102.0.2:80 [proto: 7.99/HTTP.Aimini][IP: 0/Unknown][ClearText][Confidence: DPI][cat: Download/7][8 pkts/1556 bytes <-> 5 pkts/862 bytes][Goodput ratio: 70/66][0.00 sec][Hostname/SNI: www.aimini.com][bytes ratio: 0.287 (Upload)][IAT c2s/s2c min/avg/max/stddev: 0/0 0/0 0/0 0/0][Pkt Len c2s/s2c min/avg/max/stddev: 60/60 194/172 596/339 232/136][URL: www.aimini.com/webcounter/w.php?___hm=.net_Search_&_lh_=http://www.aimini.net/search/?q=pictures&sca=&__Refer_=http://www.aimini.net/][StatusCode: 200][User-Agent: Mozilla/5.0 (Windows; U; Windows NT 6.1; en-US; rv:1.9.2.17) Gecko/20110420 Firefox/3.6.17][PLAIN TEXT (GET /webcounter/w.php)][Plen Bins: 0,0,0,0,0,0,0,0,50,0,0,0,0,0,0,0,50,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0] diff --git a/tests/result/alexa-app.pcapng.out b/tests/result/alexa-app.pcapng.out index 3653e8723..de0e954d4 100644 --- a/tests/result/alexa-app.pcapng.out +++ b/tests/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: 543 (3.39 diss/flow) +Num dissector calls: 473 (2.96 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/alicloud.pcap.out b/tests/result/alicloud.pcap.out index 42898e5eb..784c08309 100644 --- a/tests/result/alicloud.pcap.out +++ b/tests/result/alicloud.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (TCP): 60 (4.00 pkts/flow) Confidence DPI : 15 (flows) -Num dissector calls: 1830 (122.00 diss/flow) +Num dissector calls: 1635 (109.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/amqp.pcap.out b/tests/result/amqp.pcap.out index f5ba7759d..715270f24 100644 --- a/tests/result/amqp.pcap.out +++ b/tests/result/amqp.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (TCP): 9 (3.00 pkts/flow) Confidence DPI : 3 (flows) -Num dissector calls: 413 (137.67 diss/flow) +Num dissector calls: 371 (123.67 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/3/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/android.pcap.out b/tests/result/android.pcap.out index c3aa80b39..475fa0a7c 100644 --- a/tests/result/android.pcap.out +++ b/tests/result/android.pcap.out @@ -6,7 +6,7 @@ DPI Packets (other): 4 (1.00 pkts/flow) Confidence Unknown : 1 (flows) Confidence Match by port : 2 (flows) Confidence DPI : 60 (flows) -Num dissector calls: 280 (4.44 diss/flow) +Num dissector calls: 257 (4.08 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/3/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/anyconnect-vpn.pcap.out b/tests/result/anyconnect-vpn.pcap.out index c3be0a420..74b455c6d 100644 --- a/tests/result/anyconnect-vpn.pcap.out +++ b/tests/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: 939 (13.61 diss/flow) +Num dissector calls: 877 (12.71 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/9/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/avast.pcap.out b/tests/result/avast.pcap.out index 2aed40a3d..5c6e9d9f8 100644 --- a/tests/result/avast.pcap.out +++ b/tests/result/avast.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (TCP): 40 (4.00 pkts/flow) Confidence DPI : 10 (flows) -Num dissector calls: 1230 (123.00 diss/flow) +Num dissector calls: 1100 (110.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/avast_securedns.pcapng.out b/tests/result/avast_securedns.pcapng.out index 5b0f63c05..547cb991a 100644 --- a/tests/result/avast_securedns.pcapng.out +++ b/tests/result/avast_securedns.pcapng.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (UDP): 39 (1.00 pkts/flow) Confidence DPI : 39 (flows) -Num dissector calls: 3549 (91.00 diss/flow) +Num dissector calls: 3354 (86.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/117/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/bittorrent.pcap.out b/tests/result/bittorrent.pcap.out index 8d03ee46a..3ac65446e 100644 --- a/tests/result/bittorrent.pcap.out +++ b/tests/result/bittorrent.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (TCP): 24 (1.00 pkts/flow) Confidence DPI : 24 (flows) -Num dissector calls: 2114 (88.08 diss/flow) +Num dissector calls: 1828 (76.17 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 120/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/bittorrent_utp.pcap.out b/tests/result/bittorrent_utp.pcap.out index 6fa47e0ea..1b0be1fd3 100644 --- a/tests/result/bittorrent_utp.pcap.out +++ b/tests/result/bittorrent_utp.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (UDP): 4 (4.00 pkts/flow) Confidence DPI : 1 (flows) -Num dissector calls: 81 (81.00 diss/flow) +Num dissector calls: 76 (76.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 5/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/bot.pcap.out b/tests/result/bot.pcap.out index 5e1bc143e..783dc6a41 100644 --- a/tests/result/bot.pcap.out +++ b/tests/result/bot.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (TCP): 6 (6.00 pkts/flow) Confidence DPI : 1 (flows) -Num dissector calls: 15 (15.00 diss/flow) +Num dissector calls: 12 (12.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/cassandra.pcap.out b/tests/result/cassandra.pcap.out index 4c128f6e6..a8bd4e04b 100644 --- a/tests/result/cassandra.pcap.out +++ b/tests/result/cassandra.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (TCP): 18 (9.00 pkts/flow) Confidence DPI : 2 (flows) -Num dissector calls: 362 (181.00 diss/flow) +Num dissector calls: 332 (166.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/cloudflare-warp.pcap.out b/tests/result/cloudflare-warp.pcap.out index 0cd0f0068..12075cb10 100644 --- a/tests/result/cloudflare-warp.pcap.out +++ b/tests/result/cloudflare-warp.pcap.out @@ -4,7 +4,7 @@ DPI Packets (TCP): 41 (5.12 pkts/flow) Confidence Unknown : 1 (flows) Confidence Match by port : 2 (flows) Confidence DPI : 5 (flows) -Num dissector calls: 188 (23.50 diss/flow) +Num dissector calls: 173 (21.62 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/3/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/coap_mqtt.pcap.out b/tests/result/coap_mqtt.pcap.out index fb346a0f5..5c9d7be1c 100644 --- a/tests/result/coap_mqtt.pcap.out +++ b/tests/result/coap_mqtt.pcap.out @@ -3,7 +3,7 @@ Guessed flow protos: 0 DPI Packets (TCP): 7 (1.75 pkts/flow) DPI Packets (UDP): 12 (1.00 pkts/flow) Confidence DPI : 16 (flows) -Num dissector calls: 352 (22.00 diss/flow) +Num dissector calls: 300 (18.75 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/collectd.pcap.out b/tests/result/collectd.pcap.out index 983a5355f..33fa52f54 100644 --- a/tests/result/collectd.pcap.out +++ b/tests/result/collectd.pcap.out @@ -3,7 +3,7 @@ Guessed flow protos: 3 DPI Packets (UDP): 13 (1.62 pkts/flow) Confidence Match by port : 3 (flows) Confidence DPI : 5 (flows) -Num dissector calls: 404 (50.50 diss/flow) +Num dissector calls: 389 (48.62 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/3/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/corba.pcap.out b/tests/result/corba.pcap.out index 9b2bba127..c0dcf2cc9 100644 --- a/tests/result/corba.pcap.out +++ b/tests/result/corba.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (TCP): 12 (4.00 pkts/flow) Confidence DPI : 3 (flows) -Num dissector calls: 228 (76.00 diss/flow) +Num dissector calls: 189 (63.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/crynet.pcap.out b/tests/result/crynet.pcap.out index 129b7256d..9da37d657 100644 --- a/tests/result/crynet.pcap.out +++ b/tests/result/crynet.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (UDP): 4 (1.00 pkts/flow) Confidence DPI : 4 (flows) -Num dissector calls: 424 (106.00 diss/flow) +Num dissector calls: 404 (101.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/dcerpc.pcap.out b/tests/result/dcerpc.pcap.out index b172bf1ce..d89f5c3e4 100644 --- a/tests/result/dcerpc.pcap.out +++ b/tests/result/dcerpc.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (UDP): 4 (1.00 pkts/flow) Confidence DPI : 4 (flows) -Num dissector calls: 216 (54.00 diss/flow) +Num dissector calls: 196 (49.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/dhcp-fuzz.pcapng.out b/tests/result/dhcp-fuzz.pcapng.out index b4099f936..c00dffeb8 100644 --- a/tests/result/dhcp-fuzz.pcapng.out +++ b/tests/result/dhcp-fuzz.pcapng.out @@ -2,7 +2,7 @@ Guessed flow protos: 1 DPI Packets (UDP): 1 (1.00 pkts/flow) Confidence Match by port : 1 (flows) -Num dissector calls: 109 (109.00 diss/flow) +Num dissector calls: 104 (104.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/discord.pcap.out b/tests/result/discord.pcap.out index a525f5cd7..b401a2914 100644 --- a/tests/result/discord.pcap.out +++ b/tests/result/discord.pcap.out @@ -3,7 +3,7 @@ Guessed flow protos: 0 DPI Packets (TCP): 5 (5.00 pkts/flow) DPI Packets (UDP): 60 (1.82 pkts/flow) Confidence DPI : 34 (flows) -Num dissector calls: 4069 (119.68 diss/flow) +Num dissector calls: 3904 (114.82 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/dnscrypt-v1-and-resolver-pings.pcap.out b/tests/result/dnscrypt-v1-and-resolver-pings.pcap.out index febea1f67..a6101325e 100644 --- a/tests/result/dnscrypt-v1-and-resolver-pings.pcap.out +++ b/tests/result/dnscrypt-v1-and-resolver-pings.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (UDP): 256 (1.04 pkts/flow) Confidence DPI : 245 (flows) -Num dissector calls: 21984 (89.73 diss/flow) +Num dissector calls: 20759 (84.73 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/513/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/dnscrypt-v2.pcap.out b/tests/result/dnscrypt-v2.pcap.out index 06ba9367e..8545b48ad 100644 --- a/tests/result/dnscrypt-v2.pcap.out +++ b/tests/result/dnscrypt-v2.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (UDP): 6 (2.00 pkts/flow) Confidence DPI : 3 (flows) -Num dissector calls: 378 (126.00 diss/flow) +Num dissector calls: 363 (121.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/dnscrypt_skype_false_positive.pcapng.out b/tests/result/dnscrypt_skype_false_positive.pcapng.out index 9f1fc3382..69bcbfb59 100644 --- a/tests/result/dnscrypt_skype_false_positive.pcapng.out +++ b/tests/result/dnscrypt_skype_false_positive.pcapng.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (UDP): 2 (2.00 pkts/flow) Confidence DPI : 1 (flows) -Num dissector calls: 127 (127.00 diss/flow) +Num dissector calls: 122 (122.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/3/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/doq.pcapng.out b/tests/result/doq.pcapng.out index 09e71bd61..e4674ee61 100644 --- a/tests/result/doq.pcapng.out +++ b/tests/result/doq.pcapng.out @@ -3,7 +3,7 @@ Guessed flow protos: 0 DPI Packets (UDP): 1 (1.00 pkts/flow) DPI Packets (other): 1 (1.00 pkts/flow) Confidence DPI : 2 (flows) -Num dissector calls: 65 (32.50 diss/flow) +Num dissector calls: 60 (30.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/doq_adguard.pcapng.out b/tests/result/doq_adguard.pcapng.out index 2680d038f..0aae97804 100644 --- a/tests/result/doq_adguard.pcapng.out +++ b/tests/result/doq_adguard.pcapng.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (UDP): 1 (1.00 pkts/flow) Confidence DPI : 1 (flows) -Num dissector calls: 66 (66.00 diss/flow) +Num dissector calls: 61 (61.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/drda_db2.pcap.out b/tests/result/drda_db2.pcap.out index 74972d68d..463468ae6 100644 --- a/tests/result/drda_db2.pcap.out +++ b/tests/result/drda_db2.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (TCP): 4 (4.00 pkts/flow) Confidence DPI : 1 (flows) -Num dissector calls: 89 (89.00 diss/flow) +Num dissector calls: 76 (76.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/elasticsearch.pcap.out b/tests/result/elasticsearch.pcap.out index ce7c4fa67..220a24486 100644 --- a/tests/result/elasticsearch.pcap.out +++ b/tests/result/elasticsearch.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (TCP): 16 (2.29 pkts/flow) Confidence DPI : 7 (flows) -Num dissector calls: 896 (128.00 diss/flow) +Num dissector calls: 805 (115.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/emotet.pcap.out b/tests/result/emotet.pcap.out index b677fab60..3f32bb523 100644 --- a/tests/result/emotet.pcap.out +++ b/tests/result/emotet.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (TCP): 48 (8.00 pkts/flow) Confidence DPI : 6 (flows) -Num dissector calls: 206 (34.33 diss/flow) +Num dissector calls: 183 (30.50 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/ethereum.pcap.out b/tests/result/ethereum.pcap.out index f6e9b61d4..0f365da67 100644 --- a/tests/result/ethereum.pcap.out +++ b/tests/result/ethereum.pcap.out @@ -4,7 +4,7 @@ DPI Packets (TCP): 217 (3.88 pkts/flow) DPI Packets (UDP): 18 (1.00 pkts/flow) Confidence Match by port : 3 (flows) Confidence DPI : 71 (flows) -Num dissector calls: 593 (8.01 diss/flow) +Num dissector calls: 539 (7.28 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/exe_download.pcap.out b/tests/result/exe_download.pcap.out index c31e90f01..202d39f73 100644 --- a/tests/result/exe_download.pcap.out +++ b/tests/result/exe_download.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (TCP): 6 (6.00 pkts/flow) Confidence DPI : 1 (flows) -Num dissector calls: 15 (15.00 diss/flow) +Num dissector calls: 12 (12.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/exe_download_as_png.pcap.out b/tests/result/exe_download_as_png.pcap.out index 988402dc0..7d0eb973b 100644 --- a/tests/result/exe_download_as_png.pcap.out +++ b/tests/result/exe_download_as_png.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (TCP): 6 (6.00 pkts/flow) Confidence DPI : 1 (flows) -Num dissector calls: 15 (15.00 diss/flow) +Num dissector calls: 12 (12.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/fastcgi.pcap.out b/tests/result/fastcgi.pcap.out index df0f4dc5c..e27ee2872 100644 --- a/tests/result/fastcgi.pcap.out +++ b/tests/result/fastcgi.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (TCP): 6 (6.00 pkts/flow) Confidence DPI : 1 (flows) -Num dissector calls: 160 (160.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 zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/fix.pcap.out b/tests/result/fix.pcap.out index 036f11e53..a2cd932c9 100644 --- a/tests/result/fix.pcap.out +++ b/tests/result/fix.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (TCP): 12 (1.00 pkts/flow) Confidence DPI : 12 (flows) -Num dissector calls: 1104 (92.00 diss/flow) +Num dissector calls: 948 (79.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/fix2.pcap.out b/tests/result/fix2.pcap.out index f1711651d..7abddbc4f 100644 --- a/tests/result/fix2.pcap.out +++ b/tests/result/fix2.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (TCP): 8 (4.00 pkts/flow) Confidence DPI : 2 (flows) -Num dissector calls: 184 (92.00 diss/flow) +Num dissector calls: 158 (79.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/ftp-start-tls.pcap.out b/tests/result/ftp-start-tls.pcap.out index e7351527c..96d79a4e2 100644 --- a/tests/result/ftp-start-tls.pcap.out +++ b/tests/result/ftp-start-tls.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (TCP): 17 (17.00 pkts/flow) Confidence DPI : 1 (flows) -Num dissector calls: 159 (159.00 diss/flow) +Num dissector calls: 145 (145.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/ftp.pcap.out b/tests/result/ftp.pcap.out index e6eeefaf8..1af6b3147 100644 --- a/tests/result/ftp.pcap.out +++ b/tests/result/ftp.pcap.out @@ -3,7 +3,7 @@ Guessed flow protos: 1 DPI Packets (TCP): 49 (16.33 pkts/flow) Confidence Unknown : 1 (flows) Confidence DPI : 2 (flows) -Num dissector calls: 669 (223.00 diss/flow) +Num dissector calls: 612 (204.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/3/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/ftp_failed.pcap.out b/tests/result/ftp_failed.pcap.out index 063713433..3537298e0 100644 --- a/tests/result/ftp_failed.pcap.out +++ b/tests/result/ftp_failed.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (TCP): 8 (8.00 pkts/flow) Confidence DPI : 1 (flows) -Num dissector calls: 159 (159.00 diss/flow) +Num dissector calls: 145 (145.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/fuzz-2006-06-26-2594.pcap.out b/tests/result/fuzz-2006-06-26-2594.pcap.out index 131583b5d..3b1a8963c 100644 --- a/tests/result/fuzz-2006-06-26-2594.pcap.out +++ b/tests/result/fuzz-2006-06-26-2594.pcap.out @@ -6,7 +6,7 @@ DPI Packets (other): 5 (1.00 pkts/flow) Confidence Unknown : 30 (flows) Confidence Match by port : 28 (flows) Confidence DPI : 193 (flows) -Num dissector calls: 5648 (22.50 diss/flow) +Num dissector calls: 5305 (21.14 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/129/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/fuzz-2006-09-29-28586.pcap.out b/tests/result/fuzz-2006-09-29-28586.pcap.out index 7f2cb6d99..73f2ed1a9 100644 --- a/tests/result/fuzz-2006-09-29-28586.pcap.out +++ b/tests/result/fuzz-2006-09-29-28586.pcap.out @@ -5,7 +5,7 @@ DPI Packets (other): 1 (1.00 pkts/flow) Confidence Unknown : 3 (flows) Confidence Match by port : 26 (flows) Confidence DPI : 11 (flows) -Num dissector calls: 1043 (26.08 diss/flow) +Num dissector calls: 928 (23.20 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/9/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/fuzz-2020-02-16-11740.pcap.out b/tests/result/fuzz-2020-02-16-11740.pcap.out index 3be32e644..59851d41f 100644 --- a/tests/result/fuzz-2020-02-16-11740.pcap.out +++ b/tests/result/fuzz-2020-02-16-11740.pcap.out @@ -5,7 +5,7 @@ DPI Packets (other): 7 (1.00 pkts/flow) Confidence Unknown : 19 (flows) Confidence Match by port : 3 (flows) Confidence DPI : 55 (flows) -Num dissector calls: 1805 (23.44 diss/flow) +Num dissector calls: 1725 (22.40 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/57/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/fuzz-2021-10-13.pcap.out b/tests/result/fuzz-2021-10-13.pcap.out index 8f3509f57..92c94af44 100644 --- a/tests/result/fuzz-2021-10-13.pcap.out +++ b/tests/result/fuzz-2021-10-13.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 1 DPI Packets (TCP): 1 (1.00 pkts/flow) Confidence Unknown : 1 (flows) -Num dissector calls: 128 (128.00 diss/flow) +Num dissector calls: 115 (115.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/3/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/genshin-impact.pcap.out b/tests/result/genshin-impact.pcap.out index 6d2cc266b..45ae7b81f 100644 --- a/tests/result/genshin-impact.pcap.out +++ b/tests/result/genshin-impact.pcap.out @@ -3,7 +3,7 @@ Guessed flow protos: 0 DPI Packets (TCP): 12 (4.00 pkts/flow) DPI Packets (UDP): 3 (1.00 pkts/flow) Confidence DPI : 6 (flows) -Num dissector calls: 520 (86.67 diss/flow) +Num dissector calls: 471 (78.50 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/gnutella.pcap.out b/tests/result/gnutella.pcap.out index 66f19a91e..94d25b2c7 100644 --- a/tests/result/gnutella.pcap.out +++ b/tests/result/gnutella.pcap.out @@ -6,7 +6,7 @@ DPI Packets (other): 10 (1.00 pkts/flow) Confidence Unknown : 592 (flows) Confidence Match by port : 1 (flows) Confidence DPI : 167 (flows) -Num dissector calls: 67770 (89.17 diss/flow) +Num dissector calls: 65122 (85.69 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/1776/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/google_ssl.pcap.out b/tests/result/google_ssl.pcap.out index 2d0e41957..cf8dfa984 100644 --- a/tests/result/google_ssl.pcap.out +++ b/tests/result/google_ssl.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 1 DPI Packets (TCP): 28 (28.00 pkts/flow) Confidence Match by port : 1 (flows) -Num dissector calls: 225 (225.00 diss/flow) +Num dissector calls: 206 (206.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/3/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/gtp_false_positive.pcapng.out b/tests/result/gtp_false_positive.pcapng.out index 675436f39..26a806c21 100644 --- a/tests/result/gtp_false_positive.pcapng.out +++ b/tests/result/gtp_false_positive.pcapng.out @@ -3,7 +3,7 @@ Guessed flow protos: 3 DPI Packets (UDP): 7 (2.33 pkts/flow) Confidence Unknown : 1 (flows) Confidence Match by port : 2 (flows) -Num dissector calls: 400 (133.33 diss/flow) +Num dissector calls: 385 (128.33 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/3/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/gtp_prime.pcapng.out b/tests/result/gtp_prime.pcapng.out index 985fda54c..e919ff079 100644 --- a/tests/result/gtp_prime.pcapng.out +++ b/tests/result/gtp_prime.pcapng.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (UDP): 1 (1.00 pkts/flow) Confidence DPI : 1 (flows) -Num dissector calls: 52 (52.00 diss/flow) +Num dissector calls: 47 (47.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/h323.pcap.out b/tests/result/h323.pcap.out index 9a0e28b48..697d98084 100644 --- a/tests/result/h323.pcap.out +++ b/tests/result/h323.pcap.out @@ -3,7 +3,7 @@ Guessed flow protos: 0 DPI Packets (TCP): 2 (2.00 pkts/flow) DPI Packets (UDP): 1 (1.00 pkts/flow) Confidence DPI : 2 (flows) -Num dissector calls: 131 (65.50 diss/flow) +Num dissector calls: 118 (59.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/hangout.pcap.out b/tests/result/hangout.pcap.out index 95ee7343e..a46af7701 100644 --- a/tests/result/hangout.pcap.out +++ b/tests/result/hangout.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (UDP): 1 (1.00 pkts/flow) Confidence DPI : 1 (flows) -Num dissector calls: 74 (74.00 diss/flow) +Num dissector calls: 69 (69.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/hpvirtgrp.pcap.out b/tests/result/hpvirtgrp.pcap.out index f60d605f3..9c00c1dda 100644 --- a/tests/result/hpvirtgrp.pcap.out +++ b/tests/result/hpvirtgrp.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (TCP): 37 (4.11 pkts/flow) Confidence DPI : 9 (flows) -Num dissector calls: 1008 (112.00 diss/flow) +Num dissector calls: 891 (99.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/hsrp2_ipv6.pcapng.out b/tests/result/hsrp2_ipv6.pcapng.out index 4b40c2608..60b4c56b2 100644 --- a/tests/result/hsrp2_ipv6.pcapng.out +++ b/tests/result/hsrp2_ipv6.pcapng.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (UDP): 2 (1.00 pkts/flow) Confidence DPI : 2 (flows) -Num dissector calls: 102 (51.00 diss/flow) +Num dissector calls: 92 (46.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/http-crash-content-disposition.pcap.out b/tests/result/http-crash-content-disposition.pcap.out index 9c4c81da4..dfca9cff7 100644 --- a/tests/result/http-crash-content-disposition.pcap.out +++ b/tests/result/http-crash-content-disposition.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (TCP): 8 (8.00 pkts/flow) Confidence DPI : 1 (flows) -Num dissector calls: 15 (15.00 diss/flow) +Num dissector calls: 12 (12.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/http-lines-split.pcap.out b/tests/result/http-lines-split.pcap.out index 492fa7ea6..5f504a7c1 100644 --- a/tests/result/http-lines-split.pcap.out +++ b/tests/result/http-lines-split.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (TCP): 8 (8.00 pkts/flow) Confidence DPI : 1 (flows) -Num dissector calls: 15 (15.00 diss/flow) +Num dissector calls: 12 (12.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/http-manipulated.pcap.out b/tests/result/http-manipulated.pcap.out index d82e912ad..6f3bec10f 100644 --- a/tests/result/http-manipulated.pcap.out +++ b/tests/result/http-manipulated.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (TCP): 12 (6.00 pkts/flow) Confidence DPI : 2 (flows) -Num dissector calls: 30 (15.00 diss/flow) +Num dissector calls: 24 (12.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/http_auth.pcap.out b/tests/result/http_auth.pcap.out index e0258b66d..cb692fd24 100644 --- a/tests/result/http_auth.pcap.out +++ b/tests/result/http_auth.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (TCP): 6 (6.00 pkts/flow) Confidence DPI : 1 (flows) -Num dissector calls: 15 (15.00 diss/flow) +Num dissector calls: 12 (12.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/http_guessed_host_and_guessed.pcapng.out b/tests/result/http_guessed_host_and_guessed.pcapng.out index 22ae008c8..da647d33f 100644 --- a/tests/result/http_guessed_host_and_guessed.pcapng.out +++ b/tests/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: 129 (129.00 diss/flow) +Num dissector calls: 116 (116.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/http_ipv6.pcap.out b/tests/result/http_ipv6.pcap.out index 552c91149..d7a7c81e0 100644 --- a/tests/result/http_ipv6.pcap.out +++ b/tests/result/http_ipv6.pcap.out @@ -4,7 +4,7 @@ DPI Packets (TCP): 77 (5.92 pkts/flow) DPI Packets (UDP): 4 (2.00 pkts/flow) Confidence Match by port : 7 (flows) Confidence DPI : 8 (flows) -Num dissector calls: 147 (9.80 diss/flow) +Num dissector calls: 142 (9.47 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/http_on_sip_port.pcap.out b/tests/result/http_on_sip_port.pcap.out index 453544e72..dcc7ccd1b 100644 --- a/tests/result/http_on_sip_port.pcap.out +++ b/tests/result/http_on_sip_port.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (TCP): 4 (4.00 pkts/flow) Confidence DPI : 1 (flows) -Num dissector calls: 16 (16.00 diss/flow) +Num dissector calls: 13 (13.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/i3d.pcap.out b/tests/result/i3d.pcap.out index f4ff7ed89..56bb959d8 100644 --- a/tests/result/i3d.pcap.out +++ b/tests/result/i3d.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (UDP): 4 (1.00 pkts/flow) Confidence DPI : 4 (flows) -Num dissector calls: 392 (98.00 diss/flow) +Num dissector calls: 372 (93.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/imap-starttls.pcap.out b/tests/result/imap-starttls.pcap.out index ce3f964a0..724ffa060 100644 --- a/tests/result/imap-starttls.pcap.out +++ b/tests/result/imap-starttls.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (TCP): 19 (19.00 pkts/flow) Confidence DPI : 1 (flows) -Num dissector calls: 211 (211.00 diss/flow) +Num dissector calls: 195 (195.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/imap.pcap.out b/tests/result/imap.pcap.out index 995793594..a887c0463 100644 --- a/tests/result/imap.pcap.out +++ b/tests/result/imap.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (TCP): 11 (11.00 pkts/flow) Confidence DPI : 1 (flows) -Num dissector calls: 211 (211.00 diss/flow) +Num dissector calls: 195 (195.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/imo.pcap.out b/tests/result/imo.pcap.out index 284442798..10598135e 100644 --- a/tests/result/imo.pcap.out +++ b/tests/result/imo.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (UDP): 7 (3.50 pkts/flow) Confidence DPI : 2 (flows) -Num dissector calls: 290 (145.00 diss/flow) +Num dissector calls: 280 (140.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/instagram.pcap.out b/tests/result/instagram.pcap.out index 8272b481e..ad441bba8 100644 --- a/tests/result/instagram.pcap.out +++ b/tests/result/instagram.pcap.out @@ -6,7 +6,7 @@ DPI Packets (other): 1 (1.00 pkts/flow) Confidence Unknown : 1 (flows) Confidence Match by port : 7 (flows) Confidence DPI : 30 (flows) -Num dissector calls: 1927 (50.71 diss/flow) +Num dissector calls: 1780 (46.84 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/15/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/iphone.pcap.out b/tests/result/iphone.pcap.out index c9c7b63f2..0354a9eea 100644 --- a/tests/result/iphone.pcap.out +++ b/tests/result/iphone.pcap.out @@ -5,7 +5,7 @@ DPI Packets (UDP): 55 (1.77 pkts/flow) DPI Packets (other): 5 (1.00 pkts/flow) Confidence Match by port : 1 (flows) Confidence DPI : 50 (flows) -Num dissector calls: 363 (7.12 diss/flow) +Num dissector calls: 344 (6.75 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/ipp.pcap.out b/tests/result/ipp.pcap.out index f72b05502..2f6289423 100644 --- a/tests/result/ipp.pcap.out +++ b/tests/result/ipp.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (TCP): 21 (7.00 pkts/flow) Confidence DPI : 3 (flows) -Num dissector calls: 57 (19.00 diss/flow) +Num dissector calls: 48 (16.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/irc.pcap.out b/tests/result/irc.pcap.out index 4a38b51fb..f47cd8437 100644 --- a/tests/result/irc.pcap.out +++ b/tests/result/irc.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (TCP): 7 (7.00 pkts/flow) Confidence DPI : 1 (flows) -Num dissector calls: 165 (165.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 zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/jabber.pcap.out b/tests/result/jabber.pcap.out index e40262529..2c10d5f2b 100644 --- a/tests/result/jabber.pcap.out +++ b/tests/result/jabber.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (TCP): 74 (6.17 pkts/flow) Confidence DPI : 12 (flows) -Num dissector calls: 1481 (123.42 diss/flow) +Num dissector calls: 1346 (112.17 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/kerberos.pcap.out b/tests/result/kerberos.pcap.out index ad0451509..b969ba6b7 100644 --- a/tests/result/kerberos.pcap.out +++ b/tests/result/kerberos.pcap.out @@ -4,7 +4,7 @@ DPI Packets (TCP): 77 (2.14 pkts/flow) Confidence Unknown : 2 (flows) Confidence Match by port : 23 (flows) Confidence DPI : 11 (flows) -Num dissector calls: 4096 (113.78 diss/flow) +Num dissector calls: 3741 (103.92 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/6/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/kismet.pcap.out b/tests/result/kismet.pcap.out index 7bd36e174..9dffaf72d 100644 --- a/tests/result/kismet.pcap.out +++ b/tests/result/kismet.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (TCP): 4 (4.00 pkts/flow) Confidence DPI : 1 (flows) -Num dissector calls: 125 (125.00 diss/flow) +Num dissector calls: 112 (112.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/kontiki.pcap.out b/tests/result/kontiki.pcap.out index 8b5089fb6..5410162f9 100644 --- a/tests/result/kontiki.pcap.out +++ b/tests/result/kontiki.pcap.out @@ -4,7 +4,7 @@ DPI Packets (UDP): 6 (1.50 pkts/flow) DPI Packets (other): 4 (1.00 pkts/flow) Confidence Unknown : 2 (flows) Confidence DPI : 6 (flows) -Num dissector calls: 328 (41.00 diss/flow) +Num dissector calls: 312 (39.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/6/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/line.pcap.out b/tests/result/line.pcap.out index 6ab60aa43..fbb93a2cb 100644 --- a/tests/result/line.pcap.out +++ b/tests/result/line.pcap.out @@ -3,7 +3,7 @@ Guessed flow protos: 0 DPI Packets (TCP): 13 (6.50 pkts/flow) DPI Packets (UDP): 40 (13.33 pkts/flow) Confidence DPI : 5 (flows) -Num dissector calls: 722 (144.40 diss/flow) +Num dissector calls: 707 (141.40 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/9/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/lisp_registration.pcap.out b/tests/result/lisp_registration.pcap.out index c8f398b07..18e64595f 100644 --- a/tests/result/lisp_registration.pcap.out +++ b/tests/result/lisp_registration.pcap.out @@ -3,7 +3,7 @@ Guessed flow protos: 0 DPI Packets (TCP): 8 (4.00 pkts/flow) DPI Packets (UDP): 2 (1.00 pkts/flow) Confidence DPI : 4 (flows) -Num dissector calls: 202 (50.50 diss/flow) +Num dissector calls: 176 (44.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/log4j-webapp-exploit.pcap.out b/tests/result/log4j-webapp-exploit.pcap.out index 7fdd7de7f..75ca0ee27 100644 --- a/tests/result/log4j-webapp-exploit.pcap.out +++ b/tests/result/log4j-webapp-exploit.pcap.out @@ -3,7 +3,7 @@ Guessed flow protos: 2 DPI Packets (TCP): 63 (9.00 pkts/flow) Confidence Unknown : 2 (flows) Confidence DPI : 5 (flows) -Num dissector calls: 470 (67.14 diss/flow) +Num dissector calls: 416 (59.43 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/6/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/lru_ipv6_caches.pcapng.out b/tests/result/lru_ipv6_caches.pcapng.out index dca6f6d78..8d8ed3ca5 100644 --- a/tests/result/lru_ipv6_caches.pcapng.out +++ b/tests/result/lru_ipv6_caches.pcapng.out @@ -5,7 +5,7 @@ DPI Packets (UDP): 42 (4.67 pkts/flow) Confidence Unknown : 4 (flows) Confidence DPI (cache) : 2 (flows) Confidence DPI : 6 (flows) -Num dissector calls: 1253 (104.42 diss/flow) +Num dissector calls: 1208 (100.67 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/12/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/malware.pcap.out b/tests/result/malware.pcap.out index 3d8eef892..8bd6bfc97 100644 --- a/tests/result/malware.pcap.out +++ b/tests/result/malware.pcap.out @@ -5,7 +5,7 @@ DPI Packets (UDP): 2 (2.00 pkts/flow) DPI Packets (other): 1 (1.00 pkts/flow) Confidence Match by port : 1 (flows) Confidence DPI : 4 (flows) -Num dissector calls: 18 (3.60 diss/flow) +Num dissector calls: 15 (3.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/memcached.cap.out b/tests/result/memcached.cap.out index 48cde8f9b..241e1dfd7 100644 --- a/tests/result/memcached.cap.out +++ b/tests/result/memcached.cap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (TCP): 6 (6.00 pkts/flow) Confidence DPI : 1 (flows) -Num dissector calls: 130 (130.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 zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/mgcp.pcapng.out b/tests/result/mgcp.pcapng.out index 74efbc869..1098d00cf 100644 --- a/tests/result/mgcp.pcapng.out +++ b/tests/result/mgcp.pcapng.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (UDP): 2 (1.00 pkts/flow) Confidence DPI : 2 (flows) -Num dissector calls: 38 (19.00 diss/flow) +Num dissector calls: 36 (18.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/monero.pcap.out b/tests/result/monero.pcap.out index 29ebc58fd..b66f89920 100644 --- a/tests/result/monero.pcap.out +++ b/tests/result/monero.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (TCP): 8 (4.00 pkts/flow) Confidence DPI : 2 (flows) -Num dissector calls: 64 (32.00 diss/flow) +Num dissector calls: 52 (26.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/mongo_false_positive.pcapng.out b/tests/result/mongo_false_positive.pcapng.out index 226a29dfc..575897f83 100644 --- a/tests/result/mongo_false_positive.pcapng.out +++ b/tests/result/mongo_false_positive.pcapng.out @@ -2,7 +2,7 @@ Guessed flow protos: 1 DPI Packets (TCP): 26 (26.00 pkts/flow) Confidence Match by port : 1 (flows) -Num dissector calls: 435 (435.00 diss/flow) +Num dissector calls: 401 (401.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/3/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/mongodb.pcap.out b/tests/result/mongodb.pcap.out index 9ba93870a..3e47797f5 100644 --- a/tests/result/mongodb.pcap.out +++ b/tests/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: 115 (14.38 diss/flow) +Num dissector calls: 102 (12.75 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/3/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/mpeg-dash.pcap.out b/tests/result/mpeg-dash.pcap.out index 3d561c496..17a1f47f5 100644 --- a/tests/result/mpeg-dash.pcap.out +++ b/tests/result/mpeg-dash.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 3 DPI Packets (TCP): 13 (3.25 pkts/flow) Confidence DPI : 4 (flows) -Num dissector calls: 76 (19.00 diss/flow) +Num dissector calls: 64 (16.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/mpeg.pcap.out b/tests/result/mpeg.pcap.out index 2b5ab16b0..92375b083 100644 --- a/tests/result/mpeg.pcap.out +++ b/tests/result/mpeg.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (TCP): 6 (6.00 pkts/flow) Confidence DPI : 1 (flows) -Num dissector calls: 15 (15.00 diss/flow) +Num dissector calls: 12 (12.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/mpegts.pcap.out b/tests/result/mpegts.pcap.out index 07e3c1a91..2884fbfc8 100644 --- a/tests/result/mpegts.pcap.out +++ b/tests/result/mpegts.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (UDP): 1 (1.00 pkts/flow) Confidence DPI : 1 (flows) -Num dissector calls: 69 (69.00 diss/flow) +Num dissector calls: 64 (64.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/mssql_tds.pcap.out b/tests/result/mssql_tds.pcap.out index 942901b76..dbb86e0f7 100644 --- a/tests/result/mssql_tds.pcap.out +++ b/tests/result/mssql_tds.pcap.out @@ -3,7 +3,7 @@ Guessed flow protos: 1 DPI Packets (TCP): 18 (1.50 pkts/flow) Confidence Match by port : 1 (flows) Confidence DPI : 11 (flows) -Num dissector calls: 299 (24.92 diss/flow) +Num dissector calls: 280 (23.33 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/nats.pcap.out b/tests/result/nats.pcap.out index 126264521..1cf24e6a9 100644 --- a/tests/result/nats.pcap.out +++ b/tests/result/nats.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (TCP): 10 (5.00 pkts/flow) Confidence DPI : 2 (flows) -Num dissector calls: 24 (12.00 diss/flow) +Num dissector calls: 20 (10.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/ndpi_match_string_subprotocol__error.pcapng.out b/tests/result/ndpi_match_string_subprotocol__error.pcapng.out index 45052ad00..0227259c2 100644 --- a/tests/result/ndpi_match_string_subprotocol__error.pcapng.out +++ b/tests/result/ndpi_match_string_subprotocol__error.pcapng.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (TCP): 3 (3.00 pkts/flow) Confidence DPI : 1 (flows) -Num dissector calls: 18 (18.00 diss/flow) +Num dissector calls: 15 (15.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/nest_log_sink.pcap.out b/tests/result/nest_log_sink.pcap.out index 66a081a1d..a9f00bb7f 100644 --- a/tests/result/nest_log_sink.pcap.out +++ b/tests/result/nest_log_sink.pcap.out @@ -4,7 +4,7 @@ DPI Packets (TCP): 130 (10.00 pkts/flow) DPI Packets (UDP): 2 (2.00 pkts/flow) Confidence Match by port : 1 (flows) Confidence DPI : 13 (flows) -Num dissector calls: 1933 (138.07 diss/flow) +Num dissector calls: 1765 (126.07 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/netbios.pcap.out b/tests/result/netbios.pcap.out index 81f0b0de4..1ac20952f 100644 --- a/tests/result/netbios.pcap.out +++ b/tests/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: 143 (9.53 diss/flow) +Num dissector calls: 130 (8.67 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/netflix.pcap.out b/tests/result/netflix.pcap.out index 0d9b93a1c..da4c406c8 100644 --- a/tests/result/netflix.pcap.out +++ b/tests/result/netflix.pcap.out @@ -5,7 +5,7 @@ DPI Packets (UDP): 27 (2.08 pkts/flow) DPI Packets (other): 1 (1.00 pkts/flow) Confidence Match by port : 1 (flows) Confidence DPI : 60 (flows) -Num dissector calls: 456 (7.48 diss/flow) +Num dissector calls: 375 (6.15 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/netflowv9.pcap.out b/tests/result/netflowv9.pcap.out index aa34159ac..a511aa78a 100644 --- a/tests/result/netflowv9.pcap.out +++ b/tests/result/netflowv9.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (UDP): 1 (1.00 pkts/flow) Confidence DPI : 1 (flows) -Num dissector calls: 55 (55.00 diss/flow) +Num dissector calls: 50 (50.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/nfsv2.pcap.out b/tests/result/nfsv2.pcap.out index cda555a23..ed0aa8e1b 100644 --- a/tests/result/nfsv2.pcap.out +++ b/tests/result/nfsv2.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (UDP): 7 (1.00 pkts/flow) Confidence DPI : 7 (flows) -Num dissector calls: 162 (23.14 diss/flow) +Num dissector calls: 147 (21.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/nfsv3.pcap.out b/tests/result/nfsv3.pcap.out index 218986cdc..20ec44279 100644 --- a/tests/result/nfsv3.pcap.out +++ b/tests/result/nfsv3.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (UDP): 8 (1.00 pkts/flow) Confidence DPI : 8 (flows) -Num dissector calls: 194 (24.25 diss/flow) +Num dissector calls: 176 (22.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/nintendo.pcap.out b/tests/result/nintendo.pcap.out index c7cba9cc9..30f14ae5f 100644 --- a/tests/result/nintendo.pcap.out +++ b/tests/result/nintendo.pcap.out @@ -6,7 +6,7 @@ DPI Packets (other): 2 (1.00 pkts/flow) Confidence Unknown : 5 (flows) Confidence Match by port : 1 (flows) Confidence DPI : 15 (flows) -Num dissector calls: 1310 (62.38 diss/flow) +Num dissector calls: 1250 (59.52 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/15/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/nntp.pcap.out b/tests/result/nntp.pcap.out index c06d0e81a..61d020eba 100644 --- a/tests/result/nntp.pcap.out +++ b/tests/result/nntp.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (TCP): 6 (6.00 pkts/flow) Confidence DPI : 1 (flows) -Num dissector calls: 137 (137.00 diss/flow) +Num dissector calls: 124 (124.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/ocs.pcap.out b/tests/result/ocs.pcap.out index c69b88a05..e7cf619ed 100644 --- a/tests/result/ocs.pcap.out +++ b/tests/result/ocs.pcap.out @@ -4,7 +4,7 @@ DPI Packets (TCP): 92 (7.67 pkts/flow) DPI Packets (UDP): 8 (1.00 pkts/flow) Confidence Unknown : 2 (flows) Confidence DPI : 18 (flows) -Num dissector calls: 88 (4.40 diss/flow) +Num dissector calls: 73 (3.65 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/6/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/ocsp.pcapng.out b/tests/result/ocsp.pcapng.out index 037e6cc05..41fcc3268 100644 --- a/tests/result/ocsp.pcapng.out +++ b/tests/result/ocsp.pcapng.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (TCP): 60 (6.00 pkts/flow) Confidence DPI : 10 (flows) -Num dissector calls: 150 (15.00 diss/flow) +Num dissector calls: 120 (12.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/ookla.pcap.out b/tests/result/ookla.pcap.out index 31a75000a..51ce83bdc 100644 --- a/tests/result/ookla.pcap.out +++ b/tests/result/ookla.pcap.out @@ -3,7 +3,7 @@ Guessed flow protos: 0 DPI Packets (TCP): 16 (8.00 pkts/flow) Confidence DPI (cache) : 1 (flows) Confidence DPI : 1 (flows) -Num dissector calls: 113 (56.50 diss/flow) +Num dissector calls: 97 (48.50 diss/flow) LRU cache ookla: 3/1/1 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/openvpn.pcap.out b/tests/result/openvpn.pcap.out index 999f386b4..97d0f32bd 100644 --- a/tests/result/openvpn.pcap.out +++ b/tests/result/openvpn.pcap.out @@ -3,7 +3,7 @@ Guessed flow protos: 0 DPI Packets (TCP): 6 (6.00 pkts/flow) DPI Packets (UDP): 5 (2.50 pkts/flow) Confidence DPI : 3 (flows) -Num dissector calls: 409 (136.33 diss/flow) +Num dissector calls: 385 (128.33 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/oracle12.pcapng.out b/tests/result/oracle12.pcapng.out index 6dd44d55e..66b742c81 100644 --- a/tests/result/oracle12.pcapng.out +++ b/tests/result/oracle12.pcapng.out @@ -2,7 +2,7 @@ Guessed flow protos: 1 DPI Packets (TCP): 20 (20.00 pkts/flow) Confidence Match by port : 1 (flows) -Num dissector calls: 305 (305.00 diss/flow) +Num dissector calls: 282 (282.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/3/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/pgsql.pcap.out b/tests/result/pgsql.pcap.out index a8c024ee9..0d1c5d4fe 100644 --- a/tests/result/pgsql.pcap.out +++ b/tests/result/pgsql.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (TCP): 36 (6.00 pkts/flow) Confidence DPI : 6 (flows) -Num dissector calls: 780 (130.00 diss/flow) +Num dissector calls: 702 (117.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/pop3.pcap.out b/tests/result/pop3.pcap.out index b1c1e33d7..a91d37329 100644 --- a/tests/result/pop3.pcap.out +++ b/tests/result/pop3.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (TCP): 10 (10.00 pkts/flow) Confidence DPI : 1 (flows) -Num dissector calls: 186 (186.00 diss/flow) +Num dissector calls: 171 (171.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/pop3_stls.pcap.out b/tests/result/pop3_stls.pcap.out index ccce236ec..16497e800 100644 --- a/tests/result/pop3_stls.pcap.out +++ b/tests/result/pop3_stls.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (TCP): 18 (18.00 pkts/flow) Confidence DPI : 1 (flows) -Num dissector calls: 241 (241.00 diss/flow) +Num dissector calls: 223 (223.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/pps.pcap.out b/tests/result/pps.pcap.out index 8370b157e..6b4d0ed13 100644 --- a/tests/result/pps.pcap.out +++ b/tests/result/pps.pcap.out @@ -5,7 +5,7 @@ DPI Packets (UDP): 201 (4.57 pkts/flow) Confidence Unknown : 34 (flows) Confidence Match by port : 2 (flows) Confidence DPI : 71 (flows) -Num dissector calls: 6631 (61.97 diss/flow) +Num dissector calls: 6248 (58.39 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/102/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/pptp.pcap.out b/tests/result/pptp.pcap.out index 801f19b61..3a5bda306 100644 --- a/tests/result/pptp.pcap.out +++ b/tests/result/pptp.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (TCP): 4 (4.00 pkts/flow) Confidence DPI : 1 (flows) -Num dissector calls: 51 (51.00 diss/flow) +Num dissector calls: 42 (42.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/punycode-idn.pcap.out b/tests/result/punycode-idn.pcap.out index 909b1d5af..84219891a 100644 --- a/tests/result/punycode-idn.pcap.out +++ b/tests/result/punycode-idn.pcap.out @@ -3,7 +3,7 @@ Guessed flow protos: 1 DPI Packets (TCP): 8 (8.00 pkts/flow) DPI Packets (UDP): 4 (2.00 pkts/flow) Confidence DPI : 3 (flows) -Num dissector calls: 17 (5.67 diss/flow) +Num dissector calls: 14 (4.67 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/quic-33.pcapng.out b/tests/result/quic-33.pcapng.out index a092cff38..a503b0ba4 100644 --- a/tests/result/quic-33.pcapng.out +++ b/tests/result/quic-33.pcapng.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (UDP): 1 (1.00 pkts/flow) Confidence DPI : 1 (flows) -Num dissector calls: 64 (64.00 diss/flow) +Num dissector calls: 59 (59.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/quic-34.pcap.out b/tests/result/quic-34.pcap.out index 41c542d06..a96e536d8 100644 --- a/tests/result/quic-34.pcap.out +++ b/tests/result/quic-34.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (UDP): 1 (1.00 pkts/flow) Confidence DPI : 1 (flows) -Num dissector calls: 66 (66.00 diss/flow) +Num dissector calls: 61 (61.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/quic-fuzz-overflow.pcapng.out b/tests/result/quic-fuzz-overflow.pcapng.out index 6cda2cccd..d3a71d6ce 100644 --- a/tests/result/quic-fuzz-overflow.pcapng.out +++ b/tests/result/quic-fuzz-overflow.pcapng.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (UDP): 1 (1.00 pkts/flow) Confidence DPI : 1 (flows) -Num dissector calls: 66 (66.00 diss/flow) +Num dissector calls: 61 (61.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/quic-v2-01.pcapng.out b/tests/result/quic-v2-01.pcapng.out index 2d478d915..ac44400a9 100644 --- a/tests/result/quic-v2-01.pcapng.out +++ b/tests/result/quic-v2-01.pcapng.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (UDP): 1 (1.00 pkts/flow) Confidence DPI : 1 (flows) -Num dissector calls: 66 (66.00 diss/flow) +Num dissector calls: 61 (61.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/quic.pcap.out b/tests/result/quic.pcap.out index f56017673..3502a3dd9 100644 --- a/tests/result/quic.pcap.out +++ b/tests/result/quic.pcap.out @@ -3,7 +3,7 @@ Guessed flow protos: 1 DPI Packets (UDP): 12 (1.20 pkts/flow) Confidence Match by port : 1 (flows) Confidence DPI : 9 (flows) -Num dissector calls: 218 (21.80 diss/flow) +Num dissector calls: 208 (20.80 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/3/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/quic_0RTT.pcap.out b/tests/result/quic_0RTT.pcap.out index e3b745250..5f54739a4 100644 --- a/tests/result/quic_0RTT.pcap.out +++ b/tests/result/quic_0RTT.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (UDP): 4 (2.00 pkts/flow) Confidence DPI : 2 (flows) -Num dissector calls: 193 (96.50 diss/flow) +Num dissector calls: 183 (91.50 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/3/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/quic_frags_ch_in_multiple_packets.pcapng.out b/tests/result/quic_frags_ch_in_multiple_packets.pcapng.out index 1b33a5bfa..94f6d7e65 100644 --- a/tests/result/quic_frags_ch_in_multiple_packets.pcapng.out +++ b/tests/result/quic_frags_ch_in_multiple_packets.pcapng.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (UDP): 2 (2.00 pkts/flow) Confidence DPI : 1 (flows) -Num dissector calls: 64 (64.00 diss/flow) +Num dissector calls: 59 (59.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/quic_interop_V.pcapng.out b/tests/result/quic_interop_V.pcapng.out index 9af2e3711..c1c451367 100644 --- a/tests/result/quic_interop_V.pcapng.out +++ b/tests/result/quic_interop_V.pcapng.out @@ -3,7 +3,7 @@ Guessed flow protos: 0 DPI Packets (UDP): 63 (1.00 pkts/flow) DPI Packets (other): 14 (1.00 pkts/flow) Confidence DPI : 77 (flows) -Num dissector calls: 2767 (35.94 diss/flow) +Num dissector calls: 2557 (33.21 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/quickplay.pcap.out b/tests/result/quickplay.pcap.out index 2c5abaf2c..f09de7f12 100644 --- a/tests/result/quickplay.pcap.out +++ b/tests/result/quickplay.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 8 DPI Packets (TCP): 78 (3.71 pkts/flow) Confidence DPI : 21 (flows) -Num dissector calls: 245 (11.67 diss/flow) +Num dissector calls: 197 (9.38 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/radius_false_positive.pcapng.out b/tests/result/radius_false_positive.pcapng.out index 2b49c58b5..c1602413c 100644 --- a/tests/result/radius_false_positive.pcapng.out +++ b/tests/result/radius_false_positive.pcapng.out @@ -2,7 +2,7 @@ Guessed flow protos: 1 DPI Packets (UDP): 10 (10.00 pkts/flow) Confidence Match by port : 1 (flows) -Num dissector calls: 203 (203.00 diss/flow) +Num dissector calls: 198 (198.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/raknet.pcap.out b/tests/result/raknet.pcap.out index 4f747e0de..4d7ad1fe7 100644 --- a/tests/result/raknet.pcap.out +++ b/tests/result/raknet.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (UDP): 24 (2.00 pkts/flow) Confidence DPI : 12 (flows) -Num dissector calls: 1458 (121.50 diss/flow) +Num dissector calls: 1398 (116.50 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/reasm_crash_anon.pcapng.out b/tests/result/reasm_crash_anon.pcapng.out index 62d15db2f..1abdea29e 100644 --- a/tests/result/reasm_crash_anon.pcapng.out +++ b/tests/result/reasm_crash_anon.pcapng.out @@ -2,7 +2,7 @@ Guessed flow protos: 1 DPI Packets (TCP): 33 (33.00 pkts/flow) Confidence Unknown : 1 (flows) -Num dissector calls: 343 (343.00 diss/flow) +Num dissector calls: 315 (315.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/3/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/reasm_segv_anon.pcapng.out b/tests/result/reasm_segv_anon.pcapng.out index 2df04b557..1dc811455 100644 --- a/tests/result/reasm_segv_anon.pcapng.out +++ b/tests/result/reasm_segv_anon.pcapng.out @@ -2,7 +2,7 @@ Guessed flow protos: 1 DPI Packets (TCP): 33 (33.00 pkts/flow) Confidence Match by port : 1 (flows) -Num dissector calls: 273 (273.00 diss/flow) +Num dissector calls: 251 (251.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/3/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/riotgames.pcap.out b/tests/result/riotgames.pcap.out index 8474e1ae3..00889bc7b 100644 --- a/tests/result/riotgames.pcap.out +++ b/tests/result/riotgames.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (UDP): 9 (1.00 pkts/flow) Confidence DPI : 9 (flows) -Num dissector calls: 897 (99.67 diss/flow) +Num dissector calls: 852 (94.67 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/rsh.pcap.out b/tests/result/rsh.pcap.out index 114ad230d..3e5b3cb10 100644 --- a/tests/result/rsh.pcap.out +++ b/tests/result/rsh.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (TCP): 12 (6.00 pkts/flow) Confidence DPI : 2 (flows) -Num dissector calls: 314 (157.00 diss/flow) +Num dissector calls: 286 (143.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/rsync.pcap.out b/tests/result/rsync.pcap.out index 2678406d4..6b383384a 100644 --- a/tests/result/rsync.pcap.out +++ b/tests/result/rsync.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (TCP): 9 (9.00 pkts/flow) Confidence DPI : 1 (flows) -Num dissector calls: 179 (179.00 diss/flow) +Num dissector calls: 164 (164.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/rtmp.pcap.out b/tests/result/rtmp.pcap.out index 3667763d4..e009962e9 100644 --- a/tests/result/rtmp.pcap.out +++ b/tests/result/rtmp.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (TCP): 8 (8.00 pkts/flow) Confidence DPI : 1 (flows) -Num dissector calls: 160 (160.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 zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/rx.pcap.out b/tests/result/rx.pcap.out index 9875ada36..e623c3e32 100644 --- a/tests/result/rx.pcap.out +++ b/tests/result/rx.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (UDP): 10 (2.00 pkts/flow) Confidence DPI : 5 (flows) -Num dissector calls: 627 (125.40 diss/flow) +Num dissector calls: 602 (120.40 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/sflow.pcap.out b/tests/result/sflow.pcap.out index e13b4a615..4b3d418ab 100644 --- a/tests/result/sflow.pcap.out +++ b/tests/result/sflow.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (UDP): 2 (2.00 pkts/flow) Confidence DPI : 1 (flows) -Num dissector calls: 110 (110.00 diss/flow) +Num dissector calls: 105 (105.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/sip.pcap.out b/tests/result/sip.pcap.out index 753a54f21..c0c600956 100644 --- a/tests/result/sip.pcap.out +++ b/tests/result/sip.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (UDP): 4 (1.00 pkts/flow) Confidence DPI : 4 (flows) -Num dissector calls: 67 (16.75 diss/flow) +Num dissector calls: 62 (15.50 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/sip_hello.pcapng.out b/tests/result/sip_hello.pcapng.out index f7a4fa217..a1b689827 100644 --- a/tests/result/sip_hello.pcapng.out +++ b/tests/result/sip_hello.pcapng.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (UDP): 9 (9.00 pkts/flow) Confidence DPI : 1 (flows) -Num dissector calls: 213 (213.00 diss/flow) +Num dissector calls: 208 (208.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/3/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/sites.pcapng.out b/tests/result/sites.pcapng.out index a96206e11..7b955fd5b 100644 --- a/tests/result/sites.pcapng.out +++ b/tests/result/sites.pcapng.out @@ -4,7 +4,7 @@ DPI Packets (TCP): 229 (5.20 pkts/flow) DPI Packets (UDP): 3 (1.00 pkts/flow) Confidence Match by port : 4 (flows) Confidence DPI : 43 (flows) -Num dissector calls: 57 (1.21 diss/flow) +Num dissector calls: 54 (1.15 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/skype.pcap.out b/tests/result/skype.pcap.out index 64ee5595a..e06726df2 100644 --- a/tests/result/skype.pcap.out +++ b/tests/result/skype.pcap.out @@ -6,7 +6,7 @@ DPI Packets (other): 5 (1.00 pkts/flow) Confidence Unknown : 59 (flows) Confidence Match by port : 28 (flows) Confidence DPI : 206 (flows) -Num dissector calls: 29278 (99.92 diss/flow) +Num dissector calls: 27117 (92.55 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/213/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/skype_no_unknown.pcap.out b/tests/result/skype_no_unknown.pcap.out index e8e136d6c..e5efef9e8 100644 --- a/tests/result/skype_no_unknown.pcap.out +++ b/tests/result/skype_no_unknown.pcap.out @@ -6,7 +6,7 @@ DPI Packets (other): 5 (1.00 pkts/flow) Confidence Unknown : 44 (flows) Confidence Match by port : 22 (flows) Confidence DPI : 201 (flows) -Num dissector calls: 24315 (91.07 diss/flow) +Num dissector calls: 22551 (84.46 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/156/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/skype_udp.pcap.out b/tests/result/skype_udp.pcap.out index 2e427c6af..62c0c6639 100644 --- a/tests/result/skype_udp.pcap.out +++ b/tests/result/skype_udp.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (UDP): 2 (2.00 pkts/flow) Confidence DPI : 1 (flows) -Num dissector calls: 126 (126.00 diss/flow) +Num dissector calls: 121 (121.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/smb_frags.pcap.out b/tests/result/smb_frags.pcap.out index 3d41aeb3d..047163150 100644 --- a/tests/result/smb_frags.pcap.out +++ b/tests/result/smb_frags.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (TCP): 5 (5.00 pkts/flow) Confidence DPI : 1 (flows) -Num dissector calls: 160 (160.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 zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/smbv1.pcap.out b/tests/result/smbv1.pcap.out index b68989c25..c6c1e2a00 100644 --- a/tests/result/smbv1.pcap.out +++ b/tests/result/smbv1.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (TCP): 3 (3.00 pkts/flow) Confidence DPI : 1 (flows) -Num dissector calls: 162 (162.00 diss/flow) +Num dissector calls: 148 (148.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/smpp_in_general.pcap.out b/tests/result/smpp_in_general.pcap.out index e3cd8bbd2..f4b642538 100644 --- a/tests/result/smpp_in_general.pcap.out +++ b/tests/result/smpp_in_general.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (TCP): 4 (4.00 pkts/flow) Confidence DPI : 1 (flows) -Num dissector calls: 90 (90.00 diss/flow) +Num dissector calls: 77 (77.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/smtp-starttls.pcap.out b/tests/result/smtp-starttls.pcap.out index 715f38cc3..486224b15 100644 --- a/tests/result/smtp-starttls.pcap.out +++ b/tests/result/smtp-starttls.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (TCP): 26 (13.00 pkts/flow) Confidence DPI : 2 (flows) -Num dissector calls: 158 (79.00 diss/flow) +Num dissector calls: 144 (72.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/smtp.pcap.out b/tests/result/smtp.pcap.out index ec6b56ab4..8eb99708f 100644 --- a/tests/result/smtp.pcap.out +++ b/tests/result/smtp.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (TCP): 11 (11.00 pkts/flow) Confidence DPI : 1 (flows) -Num dissector calls: 205 (205.00 diss/flow) +Num dissector calls: 189 (189.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/soap.pcap.out b/tests/result/soap.pcap.out index f755b9706..3f8904ca6 100644 --- a/tests/result/soap.pcap.out +++ b/tests/result/soap.pcap.out @@ -3,7 +3,7 @@ Guessed flow protos: 2 DPI Packets (TCP): 20 (6.67 pkts/flow) Confidence Match by port : 1 (flows) Confidence DPI : 2 (flows) -Num dissector calls: 393 (131.00 diss/flow) +Num dissector calls: 360 (120.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/socks-http-example.pcap.out b/tests/result/socks-http-example.pcap.out index 84c2cb3e4..c2c92aa6b 100644 --- a/tests/result/socks-http-example.pcap.out +++ b/tests/result/socks-http-example.pcap.out @@ -3,7 +3,7 @@ Guessed flow protos: 1 DPI Packets (TCP): 29 (9.67 pkts/flow) Confidence Match by port : 1 (flows) Confidence DPI : 2 (flows) -Num dissector calls: 500 (166.67 diss/flow) +Num dissector calls: 455 (151.67 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/softether.pcap.out b/tests/result/softether.pcap.out index f83f93faa..b7bee6d0c 100644 --- a/tests/result/softether.pcap.out +++ b/tests/result/softether.pcap.out @@ -3,7 +3,7 @@ Guessed flow protos: 1 DPI Packets (TCP): 4 (4.00 pkts/flow) DPI Packets (UDP): 31 (10.33 pkts/flow) Confidence DPI : 4 (flows) -Num dissector calls: 379 (94.75 diss/flow) +Num dissector calls: 361 (90.25 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/someip-tp.pcap.out b/tests/result/someip-tp.pcap.out index e1f69fd0b..41ab4505a 100644 --- a/tests/result/someip-tp.pcap.out +++ b/tests/result/someip-tp.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (UDP): 1 (1.00 pkts/flow) Confidence DPI : 1 (flows) -Num dissector calls: 72 (72.00 diss/flow) +Num dissector calls: 67 (67.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/someip-udp-method-call.pcapng.out b/tests/result/someip-udp-method-call.pcapng.out index 2a2b44d93..cba79dea0 100644 --- a/tests/result/someip-udp-method-call.pcapng.out +++ b/tests/result/someip-udp-method-call.pcapng.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (UDP): 2 (1.00 pkts/flow) Confidence DPI : 2 (flows) -Num dissector calls: 144 (72.00 diss/flow) +Num dissector calls: 134 (67.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/sql_injection.pcap.out b/tests/result/sql_injection.pcap.out index 05bb71628..871e2e895 100644 --- a/tests/result/sql_injection.pcap.out +++ b/tests/result/sql_injection.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (TCP): 3 (3.00 pkts/flow) Confidence DPI : 1 (flows) -Num dissector calls: 15 (15.00 diss/flow) +Num dissector calls: 12 (12.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/ssdp-m-search-ua.pcap.out b/tests/result/ssdp-m-search-ua.pcap.out index a8af95315..fa13e91c7 100644 --- a/tests/result/ssdp-m-search-ua.pcap.out +++ b/tests/result/ssdp-m-search-ua.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (UDP): 1 (1.00 pkts/flow) Confidence DPI : 1 (flows) -Num dissector calls: 33 (33.00 diss/flow) +Num dissector calls: 30 (30.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/ssdp-m-search.pcap.out b/tests/result/ssdp-m-search.pcap.out index 0c021104e..ba7f0b8ca 100644 --- a/tests/result/ssdp-m-search.pcap.out +++ b/tests/result/ssdp-m-search.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (UDP): 1 (1.00 pkts/flow) Confidence DPI : 1 (flows) -Num dissector calls: 33 (33.00 diss/flow) +Num dissector calls: 30 (30.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/starcraft_battle.pcap.out b/tests/result/starcraft_battle.pcap.out index 88f46f7b9..226cdb0e2 100644 --- a/tests/result/starcraft_battle.pcap.out +++ b/tests/result/starcraft_battle.pcap.out @@ -6,7 +6,7 @@ DPI Packets (other): 1 (1.00 pkts/flow) Confidence Unknown : 1 (flows) Confidence Match by port : 12 (flows) Confidence DPI : 39 (flows) -Num dissector calls: 1541 (29.63 diss/flow) +Num dissector calls: 1410 (27.12 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/6/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/steam.pcap.out b/tests/result/steam.pcap.out index 4ab0c91b9..70ec32fe4 100644 --- a/tests/result/steam.pcap.out +++ b/tests/result/steam.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (UDP): 55 (1.00 pkts/flow) Confidence DPI : 55 (flows) -Num dissector calls: 1485 (27.00 diss/flow) +Num dissector calls: 1320 (24.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/steam_datagram_relay_ping.pcapng.out b/tests/result/steam_datagram_relay_ping.pcapng.out index 5472477e8..4437b1115 100644 --- a/tests/result/steam_datagram_relay_ping.pcapng.out +++ b/tests/result/steam_datagram_relay_ping.pcapng.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (UDP): 1 (1.00 pkts/flow) Confidence DPI : 1 (flows) -Num dissector calls: 27 (27.00 diss/flow) +Num dissector calls: 24 (24.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/stun.pcap.out b/tests/result/stun.pcap.out index bba1726c0..7e1dc7c26 100644 --- a/tests/result/stun.pcap.out +++ b/tests/result/stun.pcap.out @@ -3,7 +3,7 @@ Guessed flow protos: 0 DPI Packets (TCP): 4 (4.00 pkts/flow) DPI Packets (UDP): 13 (4.33 pkts/flow) Confidence DPI : 4 (flows) -Num dissector calls: 596 (149.00 diss/flow) +Num dissector calls: 567 (141.75 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/stun_signal.pcapng.out b/tests/result/stun_signal.pcapng.out index 05bb9ebd5..16c5f7183 100644 --- a/tests/result/stun_signal.pcapng.out +++ b/tests/result/stun_signal.pcapng.out @@ -4,7 +4,7 @@ DPI Packets (UDP): 72 (3.43 pkts/flow) DPI Packets (other): 2 (1.00 pkts/flow) Confidence DPI (partial) : 1 (flows) Confidence DPI : 22 (flows) -Num dissector calls: 2330 (101.30 diss/flow) +Num dissector calls: 2255 (98.04 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/24/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/syncthing.pcap.out b/tests/result/syncthing.pcap.out index 1eb3d054c..433e94139 100644 --- a/tests/result/syncthing.pcap.out +++ b/tests/result/syncthing.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (UDP): 4 (1.00 pkts/flow) Confidence DPI : 4 (flows) -Num dissector calls: 414 (103.50 diss/flow) +Num dissector calls: 394 (98.50 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/syslog.pcap.out b/tests/result/syslog.pcap.out index 943c02462..08c7caba3 100644 --- a/tests/result/syslog.pcap.out +++ b/tests/result/syslog.pcap.out @@ -4,7 +4,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: 63 (2.86 diss/flow) +Num dissector calls: 55 (2.50 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/3/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/targusdataspeed_false_positives.pcap.out b/tests/result/targusdataspeed_false_positives.pcap.out index 452a4e7a3..64e91893e 100644 --- a/tests/result/targusdataspeed_false_positives.pcap.out +++ b/tests/result/targusdataspeed_false_positives.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 2 DPI Packets (UDP): 4 (2.00 pkts/flow) Confidence DPI : 2 (flows) -Num dissector calls: 162 (81.00 diss/flow) +Num dissector calls: 152 (76.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 10/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/teams.pcap.out b/tests/result/teams.pcap.out index d8897466b..e7887be4b 100644 --- a/tests/result/teams.pcap.out +++ b/tests/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: 615 (7.41 diss/flow) +Num dissector calls: 591 (7.12 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/6/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/teamspeak3.pcap.out b/tests/result/teamspeak3.pcap.out index 6fb97b23e..d658fb01d 100644 --- a/tests/result/teamspeak3.pcap.out +++ b/tests/result/teamspeak3.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (UDP): 4 (2.00 pkts/flow) Confidence DPI : 2 (flows) -Num dissector calls: 205 (102.50 diss/flow) +Num dissector calls: 195 (97.50 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/teamviewer.pcap.out b/tests/result/teamviewer.pcap.out index c72e293cd..999da0e1b 100644 --- a/tests/result/teamviewer.pcap.out +++ b/tests/result/teamviewer.pcap.out @@ -3,7 +3,7 @@ Guessed flow protos: 0 DPI Packets (TCP): 4 (4.00 pkts/flow) DPI Packets (UDP): 4 (4.00 pkts/flow) Confidence DPI : 2 (flows) -Num dissector calls: 154 (77.00 diss/flow) +Num dissector calls: 149 (74.50 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/telegram.pcap.out b/tests/result/telegram.pcap.out index f15009a94..9047a2518 100644 --- a/tests/result/telegram.pcap.out +++ b/tests/result/telegram.pcap.out @@ -3,7 +3,7 @@ Guessed flow protos: 5 DPI Packets (UDP): 93 (1.94 pkts/flow) Confidence Unknown : 2 (flows) Confidence DPI : 46 (flows) -Num dissector calls: 1676 (34.92 diss/flow) +Num dissector calls: 1576 (32.83 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/6/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/telnet.pcap.out b/tests/result/telnet.pcap.out index 8f596797a..b3a662978 100644 --- a/tests/result/telnet.pcap.out +++ b/tests/result/telnet.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (TCP): 33 (33.00 pkts/flow) Confidence DPI : 1 (flows) -Num dissector calls: 159 (159.00 diss/flow) +Num dissector calls: 145 (145.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/tftp.pcap.out b/tests/result/tftp.pcap.out index 1f60b251e..6597ed37a 100644 --- a/tests/result/tftp.pcap.out +++ b/tests/result/tftp.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (UDP): 13 (1.86 pkts/flow) Confidence DPI : 7 (flows) -Num dissector calls: 317 (45.29 diss/flow) +Num dissector calls: 307 (43.86 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/threema.pcap.out b/tests/result/threema.pcap.out index 8202050e3..ba12fa1d2 100644 --- a/tests/result/threema.pcap.out +++ b/tests/result/threema.pcap.out @@ -3,7 +3,7 @@ Guessed flow protos: 2 DPI Packets (TCP): 66 (11.00 pkts/flow) Confidence Unknown : 2 (flows) Confidence DPI : 4 (flows) -Num dissector calls: 1308 (218.00 diss/flow) +Num dissector calls: 1208 (201.33 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/6/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/tinc.pcap.out b/tests/result/tinc.pcap.out index 77ef30ec6..87664acc1 100644 --- a/tests/result/tinc.pcap.out +++ b/tests/result/tinc.pcap.out @@ -4,7 +4,7 @@ DPI Packets (TCP): 19 (9.50 pkts/flow) DPI Packets (UDP): 2 (1.00 pkts/flow) Confidence DPI (cache) : 2 (flows) Confidence DPI : 2 (flows) -Num dissector calls: 544 (136.00 diss/flow) +Num dissector calls: 502 (125.50 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/tls-appdata.pcap.out b/tests/result/tls-appdata.pcap.out index 5ec5aed1f..34305588e 100644 --- a/tests/result/tls-appdata.pcap.out +++ b/tests/result/tls-appdata.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 1 DPI Packets (TCP): 17 (8.50 pkts/flow) Confidence DPI : 2 (flows) -Num dissector calls: 131 (65.50 diss/flow) +Num dissector calls: 118 (59.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/tls_certificate_too_long.pcap.out b/tests/result/tls_certificate_too_long.pcap.out index ce9ee3032..0388f5b2a 100644 --- a/tests/result/tls_certificate_too_long.pcap.out +++ b/tests/result/tls_certificate_too_long.pcap.out @@ -6,7 +6,7 @@ DPI Packets (other): 2 (1.00 pkts/flow) Confidence Unknown : 1 (flows) Confidence Match by port : 1 (flows) Confidence DPI : 33 (flows) -Num dissector calls: 620 (17.71 diss/flow) +Num dissector calls: 569 (16.26 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/3/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/tls_false_positives.pcapng.out b/tests/result/tls_false_positives.pcapng.out index 1fe286f61..ebff2f8be 100644 --- a/tests/result/tls_false_positives.pcapng.out +++ b/tests/result/tls_false_positives.pcapng.out @@ -2,7 +2,7 @@ Guessed flow protos: 1 DPI Packets (TCP): 30 (30.00 pkts/flow) Confidence Unknown : 1 (flows) -Num dissector calls: 442 (442.00 diss/flow) +Num dissector calls: 401 (401.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/3/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/tls_invalid_reads.pcap.out b/tests/result/tls_invalid_reads.pcap.out index 8efdbccb6..9f0427ab0 100644 --- a/tests/result/tls_invalid_reads.pcap.out +++ b/tests/result/tls_invalid_reads.pcap.out @@ -3,7 +3,7 @@ Guessed flow protos: 2 DPI Packets (TCP): 10 (3.33 pkts/flow) Confidence Match by port : 1 (flows) Confidence DPI : 2 (flows) -Num dissector calls: 131 (43.67 diss/flow) +Num dissector calls: 118 (39.33 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/tls_missing_ch_frag.pcap.out b/tests/result/tls_missing_ch_frag.pcap.out index c994a7f36..5d5ffdc45 100644 --- a/tests/result/tls_missing_ch_frag.pcap.out +++ b/tests/result/tls_missing_ch_frag.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (TCP): 3 (3.00 pkts/flow) Confidence DPI : 1 (flows) -Num dissector calls: 130 (130.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 zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/toca-boca.pcap.out b/tests/result/toca-boca.pcap.out index 2f95f4812..1472f0181 100644 --- a/tests/result/toca-boca.pcap.out +++ b/tests/result/toca-boca.pcap.out @@ -3,7 +3,7 @@ Guessed flow protos: 4 DPI Packets (UDP): 21 (1.00 pkts/flow) Confidence Match by port : 4 (flows) Confidence DPI : 17 (flows) -Num dissector calls: 453 (21.57 diss/flow) +Num dissector calls: 433 (20.62 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/tor.pcap.out b/tests/result/tor.pcap.out index eb9b2aa19..ce013fadb 100644 --- a/tests/result/tor.pcap.out +++ b/tests/result/tor.pcap.out @@ -4,7 +4,7 @@ DPI Packets (TCP): 43 (5.38 pkts/flow) DPI Packets (UDP): 3 (1.00 pkts/flow) Confidence Match by port : 1 (flows) Confidence DPI : 10 (flows) -Num dissector calls: 51 (4.64 diss/flow) +Num dissector calls: 48 (4.36 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/trickbot.pcap.out b/tests/result/trickbot.pcap.out index 7253a9d92..a0584603d 100644 --- a/tests/result/trickbot.pcap.out +++ b/tests/result/trickbot.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (TCP): 8 (8.00 pkts/flow) Confidence DPI : 1 (flows) -Num dissector calls: 15 (15.00 diss/flow) +Num dissector calls: 12 (12.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/ultrasurf.pcap.out b/tests/result/ultrasurf.pcap.out index a9d60e757..e71dc8b8f 100644 --- a/tests/result/ultrasurf.pcap.out +++ b/tests/result/ultrasurf.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (TCP): 13 (4.33 pkts/flow) Confidence DPI : 3 (flows) -Num dissector calls: 126 (42.00 diss/flow) +Num dissector calls: 113 (37.67 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/viber.pcap.out b/tests/result/viber.pcap.out index 5f2fa7561..90344d491 100644 --- a/tests/result/viber.pcap.out +++ b/tests/result/viber.pcap.out @@ -5,7 +5,7 @@ DPI Packets (UDP): 27 (1.93 pkts/flow) DPI Packets (other): 2 (1.00 pkts/flow) Confidence Match by port : 4 (flows) Confidence DPI : 25 (flows) -Num dissector calls: 553 (19.07 diss/flow) +Num dissector calls: 518 (17.86 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/6/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/vnc.pcap.out b/tests/result/vnc.pcap.out index 781c217c3..0e8b3667d 100644 --- a/tests/result/vnc.pcap.out +++ b/tests/result/vnc.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (TCP): 10 (5.00 pkts/flow) Confidence DPI : 2 (flows) -Num dissector calls: 274 (137.00 diss/flow) +Num dissector calls: 246 (123.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/wa_video.pcap.out b/tests/result/wa_video.pcap.out index dc33be885..8dbcfe738 100644 --- a/tests/result/wa_video.pcap.out +++ b/tests/result/wa_video.pcap.out @@ -4,7 +4,7 @@ DPI Packets (TCP): 33 (33.00 pkts/flow) DPI Packets (UDP): 13 (1.00 pkts/flow) Confidence Unknown : 1 (flows) Confidence DPI : 13 (flows) -Num dissector calls: 539 (38.50 diss/flow) +Num dissector calls: 495 (35.36 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/3/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/wa_voice.pcap.out b/tests/result/wa_voice.pcap.out index 309cd4b56..6fa698dce 100644 --- a/tests/result/wa_voice.pcap.out +++ b/tests/result/wa_voice.pcap.out @@ -5,7 +5,7 @@ DPI Packets (UDP): 33 (1.57 pkts/flow) DPI Packets (other): 1 (1.00 pkts/flow) Confidence Unknown : 1 (flows) Confidence DPI : 27 (flows) -Num dissector calls: 448 (16.00 diss/flow) +Num dissector calls: 402 (14.36 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/3/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/waze.pcap.out b/tests/result/waze.pcap.out index 3b17c495e..f18979a47 100644 --- a/tests/result/waze.pcap.out +++ b/tests/result/waze.pcap.out @@ -5,7 +5,7 @@ DPI Packets (UDP): 1 (1.00 pkts/flow) Confidence Unknown : 1 (flows) Confidence Match by port : 9 (flows) Confidence DPI : 23 (flows) -Num dissector calls: 389 (11.79 diss/flow) +Num dissector calls: 338 (10.24 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/3/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/webex.pcap.out b/tests/result/webex.pcap.out index 597c7f1f0..9afa58673 100644 --- a/tests/result/webex.pcap.out +++ b/tests/result/webex.pcap.out @@ -5,7 +5,7 @@ DPI Packets (UDP): 17 (8.50 pkts/flow) Confidence Unknown : 1 (flows) Confidence Match by port : 3 (flows) Confidence DPI : 53 (flows) -Num dissector calls: 326 (5.72 diss/flow) +Num dissector calls: 315 (5.53 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/3/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/websocket.pcap.out b/tests/result/websocket.pcap.out index 3c47dcf62..89852524f 100644 --- a/tests/result/websocket.pcap.out +++ b/tests/result/websocket.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (TCP): 1 (1.00 pkts/flow) Confidence DPI : 1 (flows) -Num dissector calls: 108 (108.00 diss/flow) +Num dissector calls: 95 (95.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/wechat.pcap.out b/tests/result/wechat.pcap.out index b354d12e9..cf167f77b 100644 --- a/tests/result/wechat.pcap.out +++ b/tests/result/wechat.pcap.out @@ -6,7 +6,7 @@ DPI Packets (other): 7 (1.00 pkts/flow) Confidence Unknown : 1 (flows) Confidence Match by port : 24 (flows) Confidence DPI : 78 (flows) -Num dissector calls: 322 (3.13 diss/flow) +Num dissector calls: 309 (3.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/3/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/weibo.pcap.out b/tests/result/weibo.pcap.out index b7bb2b77e..b794831f3 100644 --- a/tests/result/weibo.pcap.out +++ b/tests/result/weibo.pcap.out @@ -4,7 +4,7 @@ DPI Packets (TCP): 100 (3.33 pkts/flow) DPI Packets (UDP): 44 (3.14 pkts/flow) Confidence Match by port : 21 (flows) Confidence DPI : 23 (flows) -Num dissector calls: 602 (13.68 diss/flow) +Num dissector calls: 562 (12.77 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/6/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/whatsapp.pcap.out b/tests/result/whatsapp.pcap.out index 244bc789a..af25bd911 100644 --- a/tests/result/whatsapp.pcap.out +++ b/tests/result/whatsapp.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (TCP): 344 (4.00 pkts/flow) Confidence DPI : 86 (flows) -Num dissector calls: 13158 (153.00 diss/flow) +Num dissector calls: 11954 (139.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/whatsapp_login_call.pcap.out b/tests/result/whatsapp_login_call.pcap.out index b6852790f..9e600f4b9 100644 --- a/tests/result/whatsapp_login_call.pcap.out +++ b/tests/result/whatsapp_login_call.pcap.out @@ -5,7 +5,7 @@ DPI Packets (UDP): 35 (1.21 pkts/flow) DPI Packets (other): 1 (1.00 pkts/flow) Confidence Match by port : 20 (flows) Confidence DPI : 37 (flows) -Num dissector calls: 333 (5.84 diss/flow) +Num dissector calls: 302 (5.30 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/whatsapp_login_chat.pcap.out b/tests/result/whatsapp_login_chat.pcap.out index 8bede1f7d..5fe31d854 100644 --- a/tests/result/whatsapp_login_chat.pcap.out +++ b/tests/result/whatsapp_login_chat.pcap.out @@ -3,7 +3,7 @@ Guessed flow protos: 2 DPI Packets (TCP): 17 (5.67 pkts/flow) DPI Packets (UDP): 7 (1.17 pkts/flow) Confidence DPI : 9 (flows) -Num dissector calls: 308 (34.22 diss/flow) +Num dissector calls: 277 (30.78 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/whatsapp_voice_and_message.pcap.out b/tests/result/whatsapp_voice_and_message.pcap.out index 7851aaa59..54c5fa2c8 100644 --- a/tests/result/whatsapp_voice_and_message.pcap.out +++ b/tests/result/whatsapp_voice_and_message.pcap.out @@ -3,7 +3,7 @@ Guessed flow protos: 0 DPI Packets (TCP): 20 (4.00 pkts/flow) DPI Packets (UDP): 8 (1.00 pkts/flow) Confidence DPI : 13 (flows) -Num dissector calls: 493 (37.92 diss/flow) +Num dissector calls: 428 (32.92 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/whois.pcapng.out b/tests/result/whois.pcapng.out index 0ed0a713e..9f335454e 100644 --- a/tests/result/whois.pcapng.out +++ b/tests/result/whois.pcapng.out @@ -3,7 +3,7 @@ Guessed flow protos: 1 DPI Packets (TCP): 16 (5.33 pkts/flow) Confidence Match by port : 1 (flows) Confidence DPI : 2 (flows) -Num dissector calls: 192 (64.00 diss/flow) +Num dissector calls: 177 (59.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/windowsupdate_over_http.pcap.out b/tests/result/windowsupdate_over_http.pcap.out index 63bc5f09c..ec86b99a4 100644 --- a/tests/result/windowsupdate_over_http.pcap.out +++ b/tests/result/windowsupdate_over_http.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (TCP): 6 (6.00 pkts/flow) Confidence DPI : 1 (flows) -Num dissector calls: 15 (15.00 diss/flow) +Num dissector calls: 12 (12.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/wireguard.pcap.out b/tests/result/wireguard.pcap.out index ae76bf57c..7808d6392 100644 --- a/tests/result/wireguard.pcap.out +++ b/tests/result/wireguard.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (UDP): 4 (4.00 pkts/flow) Confidence DPI : 1 (flows) -Num dissector calls: 149 (149.00 diss/flow) +Num dissector calls: 144 (144.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/wow.pcap.out b/tests/result/wow.pcap.out index 8f7997696..cec353537 100644 --- a/tests/result/wow.pcap.out +++ b/tests/result/wow.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (TCP): 36 (7.20 pkts/flow) Confidence DPI : 5 (flows) -Num dissector calls: 133 (26.60 diss/flow) +Num dissector calls: 109 (21.80 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/xiaomi.pcap.out b/tests/result/xiaomi.pcap.out index e5b5cc2ea..2c9be006b 100644 --- a/tests/result/xiaomi.pcap.out +++ b/tests/result/xiaomi.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 1 DPI Packets (TCP): 19 (2.71 pkts/flow) Confidence DPI : 7 (flows) -Num dissector calls: 717 (102.43 diss/flow) +Num dissector calls: 636 (90.86 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/xss.pcap.out b/tests/result/xss.pcap.out index 7660bab82..88049ff18 100644 --- a/tests/result/xss.pcap.out +++ b/tests/result/xss.pcap.out @@ -3,7 +3,7 @@ Guessed flow protos: 1 DPI Packets (TCP): 9 (4.50 pkts/flow) Confidence Match by port : 1 (flows) Confidence DPI : 1 (flows) -Num dissector calls: 15 (7.50 diss/flow) +Num dissector calls: 12 (6.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/z3950.pcapng.out b/tests/result/z3950.pcapng.out index 47804ab8e..b1b67fd69 100644 --- a/tests/result/z3950.pcapng.out +++ b/tests/result/z3950.pcapng.out @@ -3,7 +3,7 @@ Guessed flow protos: 1 DPI Packets (TCP): 26 (13.00 pkts/flow) Confidence Match by port : 1 (flows) Confidence DPI : 1 (flows) -Num dissector calls: 490 (245.00 diss/flow) +Num dissector calls: 453 (226.50 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/zattoo.pcap.out b/tests/result/zattoo.pcap.out index 2386e4647..8c81f3b2a 100644 --- a/tests/result/zattoo.pcap.out +++ b/tests/result/zattoo.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (TCP): 10 (5.00 pkts/flow) Confidence DPI : 2 (flows) -Num dissector calls: 15 (7.50 diss/flow) +Num dissector calls: 12 (6.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/zcash.pcap.out b/tests/result/zcash.pcap.out index 8cae41690..8d57f23a8 100644 --- a/tests/result/zcash.pcap.out +++ b/tests/result/zcash.pcap.out @@ -2,7 +2,7 @@ Guessed flow protos: 0 DPI Packets (TCP): 4 (4.00 pkts/flow) Confidence DPI : 1 (flows) -Num dissector calls: 32 (32.00 diss/flow) +Num dissector calls: 26 (26.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/tests/result/zoom.pcap.out b/tests/result/zoom.pcap.out index e79a61f25..cfed69c91 100644 --- a/tests/result/zoom.pcap.out +++ b/tests/result/zoom.pcap.out @@ -5,7 +5,7 @@ DPI Packets (UDP): 23 (1.35 pkts/flow) DPI Packets (other): 2 (1.00 pkts/flow) Confidence Match by port : 2 (flows) Confidence DPI : 31 (flows) -Num dissector calls: 705 (21.36 diss/flow) +Num dissector calls: 653 (19.79 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 7/0/0 (insert/search/found) diff --git a/tests/result/zoom2.pcap.out b/tests/result/zoom2.pcap.out index b4026f934..dffc43cc5 100644 --- a/tests/result/zoom2.pcap.out +++ b/tests/result/zoom2.pcap.out @@ -4,7 +4,7 @@ DPI Packets (TCP): 8 (8.00 pkts/flow) DPI Packets (UDP): 15 (5.00 pkts/flow) DPI Packets (other): 1 (1.00 pkts/flow) Confidence DPI : 5 (flows) -Num dissector calls: 491 (98.20 diss/flow) +Num dissector calls: 476 (95.20 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 1/0/0 (insert/search/found) diff --git a/tests/result/zoom_p2p.pcapng.out b/tests/result/zoom_p2p.pcapng.out index 44b87e0fa..e3fe5bf4e 100644 --- a/tests/result/zoom_p2p.pcapng.out +++ b/tests/result/zoom_p2p.pcapng.out @@ -4,7 +4,7 @@ DPI Packets (UDP): 88 (8.80 pkts/flow) DPI Packets (other): 2 (1.00 pkts/flow) Confidence DPI (partial cache): 4 (flows) Confidence DPI : 8 (flows) -Num dissector calls: 1099 (91.58 diss/flow) +Num dissector calls: 1079 (89.92 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/12/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) diff --git a/windows/nDPI.vcxproj b/windows/nDPI.vcxproj index 1ae3e8cbe..1cb0ce836 100644 --- a/windows/nDPI.vcxproj +++ b/windows/nDPI.vcxproj @@ -202,10 +202,7 @@ - - - @@ -217,17 +214,12 @@ - - - - - @@ -265,7 +257,6 @@ - @@ -283,18 +274,15 @@ - - - @@ -305,7 +293,6 @@ - diff --git a/windows/nDPI.vcxproj.filters b/windows/nDPI.vcxproj.filters index 4c1a0ab8f..b3e28e89a 100644 --- a/windows/nDPI.vcxproj.filters +++ b/windows/nDPI.vcxproj.filters @@ -3,10 +3,7 @@ - - - @@ -18,17 +15,12 @@ - - - - - @@ -65,7 +57,6 @@ - @@ -83,18 +74,15 @@ - - - @@ -105,7 +93,6 @@ -