add initial detection for WeChat

3 files changed, 33 insertions, 40 deletions

diff --git a/src/include/ndpi_protocol_ids.h b/src/include/ndpi_protocol_ids.h
index dfb39af8d..2c318b341 100644
--- a/src/include/ndpi_protocol_ids.h
+++ b/src/include/ndpi_protocol_ids.h
@@ -224,46 +224,46 @@
 #define NDPI_PROTOCOL_TELEGRAM 	 185 /* Gianluca Costa <g.costa@xplico.org> */
 #define NDPI_PROTOCOL_VEVO 	 186
 #define NDPI_PROTOCOL_PANDORA 	 187
-#define NDPI_PROTOCOL_QUIC 	 188 /* Andrea Buscarinu <andrea.buscarinu@gmail.com> - Michele Campus <michelecampus5@gmail.com> */
+#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_EAQ 	 190
-#define NDPI_PROTOCOL_OOKLA      191
-#define NDPI_PROTOCOL_AMQP       192
+#define NDPI_PROTOCOL_EAQ 	         190
+#define NDPI_PROTOCOL_OOKLA              191
+#define NDPI_PROTOCOL_AMQP               192
 #define NDPI_PROTOCOL_KAKAOTALK 	 193 /* KakaoTalk Chat (no voice call) */
 #define NDPI_PROTOCOL_KAKAOTALK_VOICE 	 194 /* KakaoTalk Voice */
-#define NDPI_PROTOCOL_TWITCH 	 195 /* Edoardo Dominici <edoaramis@gmail.com> */
+#define NDPI_PROTOCOL_TWITCH 	         195 /* Edoardo Dominici <edoaramis@gmail.com> */
 #define NDPI_PROTOCOL_QUICKPLAY 	 196 /* Streaming service used by various services such as hooq.tv */
 
 /* 197 is free */
-#define NDPI_PROTOCOL_FREE_197   197
+#define NDPI_PROTOCOL_WECHAT             197
 
-#define NDPI_PROTOCOL_MPEGTS 	 198
-#define NDPI_PROTOCOL_SNAPCHAT 	 199
-#define NDPI_PROTOCOL_SINA 	 200
-#define NDPI_PROTOCOL_HANGOUT 	 201
-#define NDPI_PROTOCOL_IFLIX 	 202 /* www.vizuamatix.com R&D team & M.Mallawaarachchie <manoj_ws@yahoo.com> */
-#define NDPI_PROTOCOL_GITHUB 	 203
-#define NDPI_PROTOCOL_BJNP 	 204
-#define NDPI_PROTOCOL_1KXUN 	 205
-#define NDPI_PROTOCOL_IQIYI 	 206
-#define NDPI_PROTOCOL_SMPP 	 207 /* Damir Franusic <df@release14.org> */
+#define NDPI_PROTOCOL_MPEGTS 	         198
+#define NDPI_PROTOCOL_SNAPCHAT 	         199
+#define NDPI_PROTOCOL_SINA 	         200
+#define NDPI_PROTOCOL_HANGOUT 	         201
+#define NDPI_PROTOCOL_IFLIX 	         202 /* www.vizuamatix.com R&D team & M.Mallawaarachchie <manoj_ws@yahoo.com> */
+#define NDPI_PROTOCOL_GITHUB 	         203
+#define NDPI_PROTOCOL_BJNP 	         204
+#define NDPI_PROTOCOL_1KXUN 	         205
+#define NDPI_PROTOCOL_IQIYI 	         206
+#define NDPI_PROTOCOL_SMPP 	         207 /* Damir Franusic <df@release14.org> */
 
 /* 208 - 209 free */
-#define NDPI_PROTOCOL_FREE_208   208
-#define NDPI_PROTOCOL_FREE_209   209
+#define NDPI_PROTOCOL_FREE_208           208
+#define NDPI_PROTOCOL_FREE_209           209
 
-#define NDPI_PROTOCOL_DEEZER 	 210
+#define NDPI_PROTOCOL_DEEZER 	         210
 #define NDPI_PROTOCOL_INSTAGRAM 	 211 /* Andrea Buscarinu <andrea.buscarinu@gmail.com> */
 #define NDPI_PROTOCOL_MICROSOFT 	 212
 #define NDPI_PROTOCOL_STARCRAFT 	 213 /* Matteo Bracci <matteobracci1@gmail.com> */
-#define NDPI_PROTOCOL_TEREDO 	 214
+#define NDPI_PROTOCOL_TEREDO 	         214
 #define NDPI_PROTOCOL_HOTSPOT_SHIELD 	 215
-#define NDPI_PROTOCOL_HEP 	 216 /* sipcapture.org QXIP BV */
+#define NDPI_PROTOCOL_HEP 	         216 /* sipcapture.org QXIP BV */
 
 /* 217 is free */
-#define NDPI_PROTOCOL_FREE_217   217
+#define NDPI_PROTOCOL_FREE_217           217
 
-#define NDPI_PROTOCOL_OCS 	 218
+#define NDPI_PROTOCOL_OCS 	         218
 #define NDPI_PROTOCOL_OFFICE_365 	 219
 #define NDPI_PROTOCOL_CLOUDFLARE 	 220
 #define NDPI_PROTOCOL_MS_ONE_DRIVE 	 221
@@ -271,11 +271,11 @@
 #define NDPI_PROTOCOL_RX 	         223
 
 /* 224 is free */
-#define NDPI_PROTOCOL_FREE_224   224
+#define NDPI_PROTOCOL_FREE_224           224
 
-#define NDPI_PROTOCOL_OPENDNS 	 225
-#define NDPI_PROTOCOL_GIT 	 226
-#define NDPI_PROTOCOL_DRDA 	 227
+#define NDPI_PROTOCOL_OPENDNS 	         225
+#define NDPI_PROTOCOL_GIT 	         226
+#define NDPI_PROTOCOL_DRDA 	         227
 
 /* UPDATE UPDATE UPDATE UPDATE UPDATE UPDATE UPDATE UPDATE UPDATE */
 #define NDPI_LAST_IMPLEMENTED_PROTOCOL		        NDPI_PROTOCOL_DRDA
diff --git a/src/lib/ndpi_content_match.c.inc b/src/lib/ndpi_content_match.c.inc
index 2b7164932..df3426129 100644
--- a/src/lib/ndpi_content_match.c.inc
+++ b/src/lib/ndpi_content_match.c.inc
@@ -8083,16 +8083,6 @@ ndpi_protocol_match host_match[] = {
   { "evsecure-crl.verisign.com", 	"Office365",       	NDPI_PROTOCOL_OFFICE_365, NDPI_PROTOCOL_CATEGORY_COLLABORATIVE, NDPI_PROTOCOL_ACCEPTABLE },
   { ".omniroot.com",       		"Office365",       	NDPI_PROTOCOL_OFFICE_365, NDPI_PROTOCOL_CATEGORY_COLLABORATIVE, NDPI_PROTOCOL_ACCEPTABLE },
 
-#if 0
-  /* The lines below are not just for Office 365 so they cannot be used for this purpose */
-  { ".verisign.com",       		"Office365",       	NDPI_PROTOCOL_OFFICE_365, NDPI_PROTOCOL_CATEGORY_COLLABORATIVE, NDPI_PROTOCOL_ACCEPTABLE },
-  { ".symcb.com",       		"Office365",       	NDPI_PROTOCOL_OFFICE_365, NDPI_PROTOCOL_CATEGORY_COLLABORATIVE, NDPI_PROTOCOL_ACCEPTABLE },
-  { ".symcd.com",       		"Office365",       	NDPI_PROTOCOL_OFFICE_365, NDPI_PROTOCOL_CATEGORY_COLLABORATIVE, NDPI_PROTOCOL_ACCEPTABLE },
-  { ".verisign.net",       		"Office365",       	NDPI_PROTOCOL_OFFICE_365, NDPI_PROTOCOL_CATEGORY_COLLABORATIVE, NDPI_PROTOCOL_ACCEPTABLE },
-  { ".geotrust.com",       		"Office365",       	NDPI_PROTOCOL_OFFICE_365, NDPI_PROTOCOL_CATEGORY_COLLABORATIVE, NDPI_PROTOCOL_ACCEPTABLE },
-  { ".entrust.net",       		"Office365",       	NDPI_PROTOCOL_OFFICE_365, NDPI_PROTOCOL_CATEGORY_COLLABORATIVE, NDPI_PROTOCOL_ACCEPTABLE },
-  { ".public-trust.com",       		"Office365",       	NDPI_PROTOCOL_OFFICE_365, NDPI_PROTOCOL_CATEGORY_COLLABORATIVE, NDPI_PROTOCOL_ACCEPTABLE },
-#endif
   /* http://www.urlquery.net/report.php?id=1453233646161 */
   { "lifedom.top",       		"Cloudflare",       	NDPI_PROTOCOL_CLOUDFLARE, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_ACCEPTABLE },
   { "coby.ns.cloudflare.com",  		"Cloudflare",       	NDPI_PROTOCOL_CLOUDFLARE, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_ACCEPTABLE },
@@ -8123,16 +8113,20 @@ ndpi_protocol_match host_match[] = {
   { ".qiyi.com",			"iQIYI",     		NDPI_PROTOCOL_IQIYI, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
   { ".71.am",			     	"iQIYI",     		NDPI_PROTOCOL_IQIYI, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
   { ".qiyipic.com",			"iQIYI",	     	NDPI_PROTOCOL_IQIYI, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
+
   { ".ppstream.com",			"PPStream",     	NDPI_PROTOCOL_PPSTREAM, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
   { ".pps.tv",				"PPStream",     	NDPI_PROTOCOL_PPSTREAM, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
+
   { ".1kxun.",				"1kxun",		NDPI_PROTOCOL_1KXUN, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
   { "tcad.wedolook.com",		"1kxun",		NDPI_PROTOCOL_1KXUN, NDPI_PROTOCOL_CATEGORY_MEDIA, NDPI_PROTOCOL_FUN },
 
   { ".steampowered.com",		"Steam",		NDPI_PROTOCOL_STEAM, NDPI_PROTOCOL_CATEGORY_GAME, NDPI_PROTOCOL_FUN },
   { "steamcommunity.com",		"Steam",		NDPI_PROTOCOL_STEAM, NDPI_PROTOCOL_CATEGORY_GAME, NDPI_PROTOCOL_FUN },
   { ".steamcontent.com",		"Steam",		NDPI_PROTOCOL_STEAM, NDPI_PROTOCOL_CATEGORY_GAME, NDPI_PROTOCOL_FUN },
-  { ".steamstatic.com",		"Steam",		NDPI_PROTOCOL_STEAM, NDPI_PROTOCOL_CATEGORY_GAME, NDPI_PROTOCOL_FUN },
-  { "steamcommunity-a.akamaihd.net",		"Steam",		NDPI_PROTOCOL_STEAM, NDPI_PROTOCOL_CATEGORY_GAME, NDPI_PROTOCOL_FUN },
+  { ".steamstatic.com", 		"Steam",		NDPI_PROTOCOL_STEAM, NDPI_PROTOCOL_CATEGORY_GAME, NDPI_PROTOCOL_FUN },
+  { "steamcommunity-a.akamaihd.net",	"Steam",		NDPI_PROTOCOL_STEAM, NDPI_PROTOCOL_CATEGORY_GAME, NDPI_PROTOCOL_FUN },
+
+  { ".wechat.com",         		"WeChat",          	NDPI_PROTOCOL_WECHAT, NDPI_PROTOCOL_CATEGORY_CHAT, NDPI_PROTOCOL_FUN },  
 
   { NULL, 0 }
 };
diff --git a/src/lib/ndpi_main.c b/src/lib/ndpi_main.c
index e2685908a..b07557b5a 100644
--- a/src/lib/ndpi_main.c
+++ b/src/lib/ndpi_main.c
@@ -1618,7 +1618,6 @@ static void ndpi_init_protocol_defaults(struct ndpi_detection_module_struct *ndp
 			    ndpi_build_default_ports(ports_b, 0, 0, 0, 0, 0));  /* UDP */
 
     /* To be removed as soon as we define new protocols */
-    ndpi_init_placeholder_proto(ndpi_mod, ports_a, ports_b, no_master, NDPI_PROTOCOL_FREE_197);
     ndpi_init_placeholder_proto(ndpi_mod, ports_a, ports_b, no_master, NDPI_PROTOCOL_FREE_208);
     ndpi_init_placeholder_proto(ndpi_mod, ports_a, ports_b, no_master, NDPI_PROTOCOL_FREE_209);
     ndpi_init_placeholder_proto(ndpi_mod, ports_a, ports_b, no_master, NDPI_PROTOCOL_FREE_217);