Harvested some unused protocols

2 files changed, 20 insertions, 50 deletions

diff --git a/src/include/ndpi_protocol_ids.h b/src/include/ndpi_protocol_ids.h
index 58253e9ce..13c2a007e 100644
--- a/src/include/ndpi_protocol_ids.h
+++ b/src/include/ndpi_protocol_ids.h
@@ -198,10 +198,10 @@
 #define NDPI_PROTOCOL_TELEGRAM				        185 /* Gianluca Costa <g.costa@xplico.org> */
 #define NDPI_PROTOCOL_QUIC				        188 /* Andrea Buscarinu <andrea.buscarinu@gmail.com> - Michele Campus <michelecampus5@gmail.com> */
 #define NDPI_PROTOCOL_WHATSAPP_VOICE			        189
-#define NDPI_PROTOCOL_STARCRAFT 			        213 /* Matteo Bracci <matteobracci1@gmail.com> */
-#define NDPI_PROTOCOL_TEREDO 			                214
-#define NDPI_PROTOCOL_HEP 			                216 /* Sipcapture.org QXIP BV */
-#define NDPI_PROTOCOL_UBNTAC2					217 /* Ubiquity UBNT AirControl 2 - Thomas Fjellstrom <thomas+ndpi@fjellstrom.ca> */
+#define NDPI_PROTOCOL_STARCRAFT 			        211 /* Matteo Bracci <matteobracci1@gmail.com> */
+#define NDPI_PROTOCOL_TEREDO 			                212
+#define NDPI_PROTOCOL_HEP 			                213 /* Sipcapture.org QXIP BV */
+#define NDPI_PROTOCOL_UBNTAC2					214 /* Ubiquity UBNT AirControl 2 - Thomas Fjellstrom <thomas+ndpi@fjellstrom.ca> */
 #define NDPI_PROTOCOL_MS_LYNC 			                173
 
 
@@ -242,41 +242,29 @@
 #define NDPI_SERVICE_YAHOO				NDPI_PROTOCOL_YAHOO   /* Tomasz Bujlow <tomasz@skatnet.dk> */
 #define NDPI_SERVICE_PANDORA     			187
 #define NDPI_PROTOCOL_EAQ        			190
-#define NDPI_SERVICE_TIMMEU        			191
-#define NDPI_SERVICE_TORCEDOR        			192
+#define NDPI_PROTOCOL_GIT                               191
+#define NDPI_PROTOCOL_DRDA                              192
 #define NDPI_SERVICE_KAKAOTALK        			193 /* KakaoTalk Chat (no voice call) */
 #define NDPI_SERVICE_KAKAOTALK_VOICE  			194 /* KakaoTalk Voice */
 #define NDPI_SERVICE_TWITCH                             195 /* Edoardo Dominici <edoaramis@gmail.com>  */
 #define NDPI_SERVICE_QUICKPLAY                          196 /* Streaming service used by various services such as hooq.tv  */
-#define NDPI_SERVICE_TIM                                197 /* Traffic for tim.com.br and tim.it */
+#define NDPI_SERVICE_OPENDNS                            197
 #define NDPI_PROTOCOL_MPEGTS        			198
 #define NDPI_SERVICE_SNAPCHAT                           199
-#define NDPI_SERVICE_SIMET                              200
-#define NDPI_SERVICE_OPENSIGNAL                         201
-#define NDPI_SERVICE_99TAXI                             202
-#define NDPI_SERVICE_EASYTAXI                           203
-#define NDPI_SERVICE_GLOBOTV                            204
-#define NDPI_SERVICE_TIMSOMDECHAMADA                    205
-#define NDPI_SERVICE_TIMMENU                            206
-#define NDPI_SERVICE_TIMPORTASABERTAS                   207
-#define NDPI_SERVICE_TIMRECARGA                         208
-#define NDPI_SERVICE_TIMBETA                            209
-#define NDPI_SERVICE_DEEZER                             210
-#define NDPI_SERVICE_INSTAGRAM                          211 /* Andrea Buscarinu <andrea.buscarinu@gmail.com> */
-#define NDPI_SERVICE_MICROSOFT                          212
-#define NDPI_SERVICE_HOTSPOT_SHIELD                     215
-#define NDPI_SERVICE_OCS                                218
-#define NDPI_SERVICE_OFFICE_365                         219
-#define NDPI_SERVICE_CLOUDFLARE                         220
-#define NDPI_SERVICE_MS_ONE_DRIVE                       221
-#define NDPI_PROTOCOL_MQTT				222
-#define NDPI_PROTOCOL_RX 			        223
-#define NDPI_SERVICE_WEIBO                              224
-#define NDPI_SERVICE_OPENDNS                            225
-#define NDPI_PROTOCOL_GIT                               226
-#define NDPI_PROTOCOL_DRDA                              227
+#define NDPI_SERVICE_DEEZER                             200
+#define NDPI_SERVICE_INSTAGRAM                          201 /* Andrea Buscarinu <andrea.buscarinu@gmail.com> */
+#define NDPI_SERVICE_MICROSOFT                          202
+#define NDPI_SERVICE_HOTSPOT_SHIELD                     203
+#define NDPI_SERVICE_OCS                                204
+#define NDPI_SERVICE_OFFICE_365                         205
+#define NDPI_SERVICE_CLOUDFLARE                         206
+#define NDPI_SERVICE_MS_ONE_DRIVE                       207
+#define NDPI_PROTOCOL_MQTT				208
+#define NDPI_PROTOCOL_RX 			        209
+#define NDPI_SERVICE_WEIBO                              210
+
 /* UPDATE UPDATE UPDATE UPDATE UPDATE UPDATE UPDATE UPDATE UPDATE */
-#define NDPI_LAST_IMPLEMENTED_PROTOCOL			NDPI_PROTOCOL_DRDA
+#define NDPI_LAST_IMPLEMENTED_PROTOCOL			NDPI_PROTOCOL_UBNTAC2
 
 #define NDPI_MAX_SUPPORTED_PROTOCOLS                    (NDPI_LAST_IMPLEMENTED_PROTOCOL + 1)
 #define NDPI_MAX_NUM_CUSTOM_PROTOCOLS                   (NDPI_NUM_BITS-NDPI_LAST_IMPLEMENTED_PROTOCOL)
diff --git a/src/lib/ndpi_content_match.c.inc b/src/lib/ndpi_content_match.c.inc
index aa806751b..d4ceb4448 100644
--- a/src/lib/ndpi_content_match.c.inc
+++ b/src/lib/ndpi_content_match.c.inc
@@ -7231,9 +7231,6 @@ static ndpi_network host_protocol_list[] = {
   { 0xC709F98C, 32, NDPI_SERVICE_TWITCH },
   { 0xC709F9C5, 32, NDPI_SERVICE_TWITCH },
 
-  /* Simet - 200.160.4.0/24 */
-  { 0xC8A00400, 24, NDPI_SERVICE_SIMET },
-
   /*
     AnchorFree (Hotspot Shield)
     AnchorFree Inc. AFNETWORK-1 (NET-74-115-0-0-1) 74.115.0.0 - 74.115.7.255
@@ -7331,15 +7328,11 @@ ndpi_protocol_match host_match[] = {
   { ".spotify.",			"Spotify",		NDPI_PROTOCOL_SPOTIFY, NDPI_PROTOCOL_FUN },
   { ".pandora.com",			"Pandora",		NDPI_SERVICE_PANDORA,  NDPI_PROTOCOL_FUN },
   { ".torproject.org",                  "Tor",                  NDPI_PROTOCOL_TOR, NDPI_PROTOCOL_POTENTIALLY_DANGEROUS },
-  { "appmeutim.tim.com.br",             "TIM_Meu",              NDPI_SERVICE_TIMMEU, NDPI_PROTOCOL_ACCEPTABLE },
-  { ".timtorcedor.com.br",              "Torcedor",             NDPI_SERVICE_TORCEDOR, NDPI_PROTOCOL_ACCEPTABLE },
   { ".kakao.com",                       "KakaoTalk",            NDPI_SERVICE_KAKAOTALK, NDPI_PROTOCOL_FUN },
   { "ttvnw.net",                        "Twitch",               NDPI_SERVICE_TWITCH, NDPI_PROTOCOL_FUN },
   { "static-cdn.jtvnw.net",             "Twitch",               NDPI_SERVICE_TWITCH, NDPI_PROTOCOL_FUN },
   { "www-cdn.jtvnw.net",                "Twitch",               NDPI_SERVICE_TWITCH, NDPI_PROTOCOL_FUN },
   { "quickplay.com",                    "QuickPlay",            NDPI_SERVICE_QUICKPLAY, NDPI_PROTOCOL_FUN },
-  { "tim.com.br",                       "TIM",                  NDPI_SERVICE_TIM, NDPI_PROTOCOL_ACCEPTABLE },
-  { "tim.it",                           "TIM",                  NDPI_SERVICE_TIM, NDPI_PROTOCOL_ACCEPTABLE },
   { ".qq.com",                          "QQ",                   NDPI_PROTOCOL_QQ, NDPI_PROTOCOL_FUN },
   { ".weibo.com",			"Weibo",        	NDPI_SERVICE_WEIBO, NDPI_PROTOCOL_FUN },
   { ".sinaimg.cn",			"Weibo",       		NDPI_SERVICE_WEIBO, NDPI_PROTOCOL_FUN },
@@ -7362,17 +7355,6 @@ ndpi_protocol_match host_match[] = {
   { "instagramstatic-",                 "Instagram",            NDPI_SERVICE_INSTAGRAM, NDPI_PROTOCOL_FUN },
 
   { ".waze.com",                        "Waze",                 NDPI_SERVICE_WAZE, NDPI_PROTOCOL_ACCEPTABLE },
-  { "simet-",                           "Simet",                NDPI_SERVICE_SIMET, NDPI_PROTOCOL_ACCEPTABLE },
-  { "opensignal.com",                   "OpenSignal",           NDPI_SERVICE_OPENSIGNAL, NDPI_PROTOCOL_ACCEPTABLE },
-  { "99taxis.com",                      "99Taxi",               NDPI_SERVICE_99TAXI, NDPI_PROTOCOL_ACCEPTABLE },
-  { "easytaxis.com",                    "EasyTaxi",             NDPI_SERVICE_EASYTAXI, NDPI_PROTOCOL_ACCEPTABLE },
-  { ".globo.com",                       "GloboTV",              NDPI_SERVICE_GLOBOTV, NDPI_PROTOCOL_ACCEPTABLE },
-  { ".glbimg.com",                      "GloboTV",              NDPI_SERVICE_GLOBOTV, NDPI_PROTOCOL_ACCEPTABLE },
-  { "timsomdechamada.com.br",           "SomDeChamada",         NDPI_SERVICE_TIMSOMDECHAMADA, NDPI_PROTOCOL_ACCEPTABLE },
-  { ".tim.acotelbr.com.br",             "TIM_Menu",             NDPI_SERVICE_TIMMENU, NDPI_PROTOCOL_ACCEPTABLE },
-  { ".timbeta.com.br",                  "TIM_Beta",             NDPI_SERVICE_TIMBETA, NDPI_PROTOCOL_ACCEPTABLE },
-  { "tim-geoportal.geoportal3d.com.br", "TIM_PortasAbertas",    NDPI_SERVICE_TIMPORTASABERTAS, NDPI_PROTOCOL_ACCEPTABLE },
-  { ".m4u.com.br",                      "TIM_Recarga",          NDPI_SERVICE_TIMRECARGA, NDPI_PROTOCOL_ACCEPTABLE },
   { ".deezer.com",                      "Deezer",               NDPI_SERVICE_DEEZER, NDPI_PROTOCOL_ACCEPTABLE },
 
   { ".microsoft.com",                   "Microsoft",            NDPI_SERVICE_MICROSOFT, NDPI_PROTOCOL_ACCEPTABLE },