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...

3 files changed, 13 insertions, 46 deletions

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