added Weibo service and pcap test

4 files changed, 63 insertions, 5 deletions

diff --git a/src/include/ndpi_protocol_ids.h b/src/include/ndpi_protocol_ids.h
index 23d659bd2..47a00694f 100644
--- a/src/include/ndpi_protocol_ids.h
+++ b/src/include/ndpi_protocol_ids.h
@@ -269,10 +269,11 @@
 #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  /* RX: RPC protocol used by AFS */
+#define NDPI_PROTOCOL_MQTT				222
+#define NDPI_PROTOCOL_RX 			        223
+#define NDPI_SERVICE_WEIBO                              224
 /* UPDATE UPDATE UPDATE UPDATE UPDATE UPDATE UPDATE UPDATE UPDATE */
-#define NDPI_LAST_IMPLEMENTED_PROTOCOL			NDPI_PROTOCOL_RX
+#define NDPI_LAST_IMPLEMENTED_PROTOCOL			NDPI_SERVICE_WEIBO
 
 #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 af6215842..85dd9b8fc 100644
--- a/src/lib/ndpi_content_match.c.inc
+++ b/src/lib/ndpi_content_match.c.inc
@@ -7333,6 +7333,12 @@ ndpi_protocol_match host_match[] = {
   { "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 },
+  { ".sinajs.cn",			"Weibo",       		NDPI_SERVICE_WEIBO, NDPI_PROTOCOL_FUN },
+  { ".sina.cn",				"Weibo",       		NDPI_SERVICE_WEIBO, NDPI_PROTOCOL_FUN },
+  { ".sina.com.cn",			"Weibo",       		NDPI_SERVICE_WEIBO, NDPI_PROTOCOL_FUN },
+  
 
   /* https://support.cipafilter.com/index.php?/Knowledgebase/Article/View/117/0/snapchat---how-to-block */
   { "feelinsonice.appspot.com",         "Snapchat",             NDPI_SERVICE_SNAPCHAT, NDPI_PROTOCOL_FUN },
@@ -7386,7 +7392,7 @@ ndpi_protocol_match host_match[] = {
   { "evsecure-ocsp.verisign.com",	"Office365",       	NDPI_SERVICE_OFFICE_365, NDPI_PROTOCOL_ACCEPTABLE },
   { "evsecure-aia.verisign.com", 	"Office365",       	NDPI_SERVICE_OFFICE_365, NDPI_PROTOCOL_ACCEPTABLE },
   { "evsecure-crl.verisign.com", 	"Office365",       	NDPI_SERVICE_OFFICE_365, NDPI_PROTOCOL_ACCEPTABLE },
-   { ".omniroot.com",       		"Office365",       	NDPI_SERVICE_OFFICE_365, NDPI_PROTOCOL_ACCEPTABLE },
+  { ".omniroot.com",       		"Office365",       	NDPI_SERVICE_OFFICE_365, NDPI_PROTOCOL_ACCEPTABLE },
   { ".verisign.com",       		"Office365",       	NDPI_SERVICE_OFFICE_365, NDPI_PROTOCOL_ACCEPTABLE },
   { ".symcb.com",       		"Office365",       	NDPI_SERVICE_OFFICE_365, NDPI_PROTOCOL_ACCEPTABLE },
   { ".symcd.com",       		"Office365",       	NDPI_SERVICE_OFFICE_365, NDPI_PROTOCOL_ACCEPTABLE },
@@ -7400,7 +7406,7 @@ ndpi_protocol_match host_match[] = {
   { "coby.ns.cloudflare.com",  		"Cloudflare",       	NDPI_SERVICE_CLOUDFLARE, NDPI_PROTOCOL_ACCEPTABLE },
   { "amanda.ns.cloudflare.com",		"Cloudflare",       	NDPI_SERVICE_CLOUDFLARE, NDPI_PROTOCOL_ACCEPTABLE },
 
-
+  
 
   { NULL, 0 }
 };
diff --git a/tests/pcap/weibo.pcap b/tests/pcap/weibo.pcap
new file mode 100644
index 000000000..44ab450c9
--- /dev/null
+++ b/tests/pcap/weibo.pcap
diff --git a/tests/result/weibo.pcap.out b/tests/result/weibo.pcap.out
new file mode 100644
index 000000000..f9982efd5
--- /dev/null
+++ b/tests/result/weibo.pcap.out
@@ -0,0 +1,51 @@
+DNS	11	1129	6
+HTTP	19	2275	5
+SSL	17	1366	11
+Google	10	660	5
+QUIC	23	4118	2
+Weibo	418	258007	15
+
+	1	TCP 140.205.174.1:443 <-> 192.168.1.105:48352 [proto: 91/SSL][1 pkts/74 bytes]
+	2	TCP 140.205.174.1:443 <-> 192.168.1.105:48356 [proto: 91/SSL][1 pkts/74 bytes]
+	3	TCP 192.168.1.105:59120 <-> 114.134.80.162:80 [proto: 7/HTTP][3 pkts/194 bytes]
+	4	TCP 216.58.212.65:443 <-> 192.168.1.105:34699 [proto: 91.126/SSL.Google][2 pkts/132 bytes]
+	5	TCP 222.73.28.96:80 <-> 192.168.1.105:42275 [proto: 7.224/HTTP.Weibo][4 pkts/676 bytes][Host: u1.img.mobile.sina.cn]
+	6	UDP 192.168.1.1:53 <-> 192.168.1.105:50533 [proto: 5.224/DNS.Weibo][1 pkts/74 bytes][Host: data.weibo.com]
+	7	UDP 192.168.1.1:53 <-> 192.168.1.105:53543 [proto: 5.224/DNS.Weibo][2 pkts/266 bytes][Host: img.t.sinajs.cn]
+	8	UDP 216.58.210.14:443 <-> 192.168.1.105:49361 [proto: 188/QUIC][9 pkts/1944 bytes]
+	9	TCP 216.58.214.78:443 <-> 192.168.1.105:58481 [proto: 91.126/SSL.Google][2 pkts/132 bytes]
+	10	UDP 192.168.1.1:53 <-> 192.168.1.105:7148 [proto: 5.224/DNS.Weibo][2 pkts/215 bytes][Host: www.weibo.com]
+	11	TCP 192.168.1.105:35803 <-> 93.188.134.246:80 [proto: 7.224/HTTP.Weibo][106 pkts/76903 bytes][Host: img.t.sinajs.cn]
+	12	TCP 192.168.1.105:35805 <-> 93.188.134.246:80 [proto: 7.224/HTTP.Weibo][41 pkts/23245 bytes][Host: img.t.sinajs.cn]
+	13	TCP 192.168.1.105:35807 <-> 93.188.134.246:80 [proto: 7.224/HTTP.Weibo][53 pkts/36468 bytes][Host: img.t.sinajs.cn]
+	14	TCP 192.168.1.105:35809 <-> 93.188.134.246:80 [proto: 7.224/HTTP.Weibo][35 pkts/22361 bytes][Host: img.t.sinajs.cn]
+	15	TCP 192.168.1.105:35811 <-> 93.188.134.246:80 [proto: 7.224/HTTP.Weibo][5 pkts/744 bytes][Host: js.t.sinajs.cn]
+	16	TCP 192.168.1.105:50827 <-> 47.89.65.229:443 [proto: 91/SSL][4 pkts/448 bytes][SSL client: g.alicdn.com]
+	17	TCP 192.168.1.105:50831 <-> 47.89.65.229:443 [proto: 91/SSL][3 pkts/194 bytes]
+	18	TCP 42.156.184.19:443 <-> 192.168.1.105:52272 [proto: 91/SSL][1 pkts/74 bytes]
+	19	TCP 42.156.184.19:443 <-> 192.168.1.105:52274 [proto: 91/SSL][1 pkts/74 bytes]
+	20	UDP 192.168.1.1:53 <-> 192.168.1.105:11798 [proto: 5.224/DNS.Weibo][1 pkts/77 bytes][Host: account.weibo.com]
+	21	UDP 192.168.1.1:53 <-> 192.168.1.105:16804 [proto: 5/DNS][1 pkts/70 bytes][Host: c.weibo.cn]
+	22	TCP 140.205.170.63:443 <-> 192.168.1.105:47721 [proto: 91/SSL][1 pkts/74 bytes]
+	23	TCP 140.205.170.63:443 <-> 192.168.1.105:47723 [proto: 91/SSL][1 pkts/74 bytes]
+	24	TCP 140.205.174.1:443 <-> 192.168.1.105:48353 [proto: 91/SSL][1 pkts/74 bytes]
+	25	UDP 192.168.1.1:53 <-> 192.168.1.105:33822 [proto: 5/DNS][2 pkts/242 bytes][Host: login.taobao.com]
+	26	TCP 192.168.1.105:59119 <-> 114.134.80.162:80 [proto: 7/HTTP][9 pkts/1599 bytes][Host: weibo.com]
+	27	TCP 192.168.1.105:59121 <-> 114.134.80.162:80 [proto: 7/HTTP][3 pkts/194 bytes]
+	28	TCP 192.168.1.105:35154 <-> 216.58.210.206:443 [proto: 91.126/SSL.Google][2 pkts/132 bytes]
+	29	TCP 216.58.212.69:443 <-> 192.168.1.105:37802 [proto: 91.126/SSL.Google][2 pkts/132 bytes]
+	30	UDP 192.168.1.1:53 <-> 192.168.1.105:41352 [proto: 5.224/DNS.Weibo][2 pkts/264 bytes][Host: js.t.sinajs.cn]
+	31	TCP 222.73.28.96:80 <-> 192.168.1.105:42280 [proto: 7/HTTP][1 pkts/74 bytes]
+	32	UDP 192.168.1.1:53 <-> 192.168.1.105:50640 [proto: 5/DNS][2 pkts/234 bytes][Host: acjstb.aliyun.com]
+	33	UDP 192.168.1.1:53 <-> 192.168.1.105:51440 [proto: 5/DNS][2 pkts/243 bytes][Host: g.alicdn.com]
+	34	UDP 192.168.1.1:53 <-> 192.168.1.105:53466 [proto: 5/DNS][2 pkts/186 bytes][Host: log.mmstat.com]
+	35	UDP 192.168.1.1:53 <-> 192.168.1.105:54988 [proto: 5/DNS][2 pkts/154 bytes][Host: weibo.com]
+	36	UDP 192.168.1.105:53656 <-> 216.58.210.227:443 [proto: 188/QUIC][14 pkts/2174 bytes]
+	37	TCP 216.58.214.78:443 <-> 192.168.1.105:58480 [proto: 91.126/SSL.Google][2 pkts/132 bytes]
+	38	TCP 192.168.1.105:40440 <-> 54.225.163.210:443 [proto: 91/SSL][2 pkts/132 bytes]
+	39	TCP 192.168.1.105:35804 <-> 93.188.134.246:80 [proto: 7.224/HTTP.Weibo][72 pkts/54281 bytes][Host: img.t.sinajs.cn]
+	40	TCP 192.168.1.105:35806 <-> 93.188.134.246:80 [proto: 7.224/HTTP.Weibo][13 pkts/4701 bytes][Host: img.t.sinajs.cn]
+	41	TCP 192.168.1.105:35808 <-> 93.188.134.246:80 [proto: 7/HTTP][3 pkts/214 bytes]
+	42	TCP 42.156.184.19:443 <-> 192.168.1.105:52271 [proto: 91/SSL][1 pkts/74 bytes]
+	43	UDP 192.168.1.1:53 <-> 192.168.1.105:18035 [proto: 5.224/DNS.Weibo][2 pkts/240 bytes][Host: u1.img.mobile.sina.cn]
+	44	TCP 192.168.1.105:51698 <-> 93.188.134.137:80 [proto: 7.224/HTTP.Weibo][79 pkts/37492 bytes][Host: www.weibo.com]