Reverted fix in quic.c as apparently it invalidates protocol detection

Added testing files for quickplay
This commit is contained in:
Luca
2015-06-24 07:49:02 -07:00
parent 2be84d4d64
commit 53c0b81dad
3 changed files with 29 additions and 1 deletions
+2 -1
View File
@@ -114,7 +114,7 @@ void ndpi_search_quic(struct ndpi_detection_module_struct *ndpi_struct, struct n
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_QUIC);
}
#if 0
// Settings without version. First check if PUBLIC FLAGS & SEQ bytes are 0x0. SEQ must be 1 at least.
if (((packet->payload[0] == 0x00) && (packet->payload[1] != 0x00)) || ((packet->payload[0]) & (QUIC_NO_V_RES_RSV == 0)))
{
@@ -130,6 +130,7 @@ void ndpi_search_quic(struct ndpi_detection_module_struct *ndpi_struct, struct n
NDPI_LOG(NDPI_PROTOCOL_QUIC, ndpi_struct, NDPI_LOG_DEBUG, "found quic.\n");
ndpi_int_quic_add_connection(ndpi_struct, flow);
}
#endif
// Check if version, than the CID length.
else if (packet->payload[0] & QUIC_VER_MASK)
Binary file not shown.
+27
View File
@@ -0,0 +1,27 @@
HTTP 2 1469 1
Facebook 6 1740 3
Google 2 378 1
HTTP_Proxy 12 4781 5
QuickPlay 133 96179 11
1 TCP 120.28.26.231:80 <-> 10.54.169.250:33277 [proto: 126/Google][2 pkts/378 bytes][Host: clients3.google.com]
2 TCP 120.28.35.41:80 <-> 10.54.169.250:50669 [proto: 196/QuickPlay][4 pkts/3680 bytes][Host: api-singtelhawk.quickplay.com]
3 TCP 120.28.35.40:80 <-> 10.54.169.250:52007 [proto: 196/QuickPlay][4 pkts/2735 bytes][Host: vod-singtelhawk.quickplay.com]
4 TCP 120.28.35.40:80 <-> 10.54.169.250:52009 [proto: 196/QuickPlay][65 pkts/45902 bytes][Host: vod-singtelhawk.quickplay.com]
5 TCP 120.28.35.40:80 <-> 10.54.169.250:52017 [proto: 196/QuickPlay][8 pkts/6032 bytes][Host: vod-singtelhawk.quickplay.com]
6 TCP 120.28.35.40:80 <-> 10.54.169.250:52019 [proto: 196/QuickPlay][25 pkts/19606 bytes][Host: vod-singtelhawk.quickplay.com]
7 TCP 120.28.35.40:80 <-> 10.54.169.250:52021 [proto: 196/QuickPlay][4 pkts/2754 bytes][Host: vod-singtelhawk.quickplay.com]
8 TCP 203.205.147.215:80 <-> 10.54.169.250:35670 [proto: 131/HTTP_Proxy][2 pkts/943 bytes][Host: hkminorshort.weixin.qq.com]
9 TCP 203.205.129.101:80 <-> 10.54.169.250:42762 [proto: 131/HTTP_Proxy][2 pkts/877 bytes][Host: hkextshort.weixin.qq.com]
10 TCP 173.252.74.22:80 <-> 10.54.169.250:52285 [proto: 119/Facebook][2 pkts/582 bytes][Host: www.facebook.com]
11 TCP 31.13.68.49:80 <-> 10.54.169.250:44793 [proto: 119/Facebook][2 pkts/576 bytes][Host: www.facebook.com]
12 TCP 120.28.5.18:80 <-> 10.54.169.250:33064 [proto: 196/QuickPlay][2 pkts/467 bytes][Host: api-singtelhawk.quickplay.com]
13 TCP 54.179.140.65:80 <-> 10.54.169.250:56381 [proto: 7/HTTP][2 pkts/1469 bytes][Host: api.account.xiaomi.com]
14 TCP 120.28.5.41:80 <-> 10.54.169.250:44256 [proto: 196/QuickPlay][3 pkts/2311 bytes][Host: play-singtelhawk.quickplay.com]
15 TCP 120.28.35.41:80 <-> 10.54.169.250:50668 [proto: 196/QuickPlay][4 pkts/3360 bytes][Host: api-singtelhawk.quickplay.com]
16 TCP 120.28.35.40:80 <-> 10.54.169.250:52018 [proto: 196/QuickPlay][7 pkts/5048 bytes][Host: vod-singtelhawk.quickplay.com]
17 TCP 120.28.35.40:80 <-> 10.54.169.250:52022 [proto: 196/QuickPlay][7 pkts/4284 bytes][Host: vod-singtelhawk.quickplay.com]
18 TCP 203.205.129.101:80 <-> 10.54.169.250:42761 [proto: 131/HTTP_Proxy][2 pkts/641 bytes][Host: hkextshort.weixin.qq.com]
19 TCP 173.252.74.22:80 <-> 10.54.169.250:52288 [proto: 119/Facebook][2 pkts/582 bytes][Host: www.facebook.com]
20 TCP 203.205.151.160:80 <-> 10.54.169.250:54883 [proto: 131/HTTP_Proxy][3 pkts/1337 bytes][Host: hkextshort.weixin.qq.com]
21 TCP 203.205.151.160:80 <-> 10.54.169.250:54885 [proto: 131/HTTP_Proxy][3 pkts/983 bytes][Host: hkextshort.weixin.qq.com]