From 27f9ca9d045b318bb97e55a9a180ce838db9f90d Mon Sep 17 00:00:00 2001 From: Vladimir Gavrilov <105977161+0xA50C1A1@users.noreply.github.com> Date: Wed, 20 Mar 2024 14:13:32 +0300 Subject: [PATCH] Improve TencentGames detection (#2353) * Improve TencentGames detection * Add more signatures --- src/lib/protocols/tencent_games.c | 34 ++++++++++++++++-- tests/cfgs/default/pcap/tencent_games.pcap | Bin 1002 -> 2776 bytes .../default/result/tencent_games.pcap.out | 16 +++++---- 3 files changed, 40 insertions(+), 10 deletions(-) diff --git a/src/lib/protocols/tencent_games.c b/src/lib/protocols/tencent_games.c index df40f5f8d..e10106d57 100644 --- a/src/lib/protocols/tencent_games.c +++ b/src/lib/protocols/tencent_games.c @@ -29,6 +29,14 @@ #include "ndpi_api.h" #include "ndpi_private.h" +static void ndpi_int_tencent_games_add_connection(struct ndpi_detection_module_struct *ndpi_struct, + struct ndpi_flow_struct *flow) +{ + NDPI_LOG_INFO(ndpi_struct, "found Tencent Games\n"); + ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_TENCENTGAMES, + NDPI_PROTOCOL_UNKNOWN, NDPI_CONFIDENCE_DPI); +} + static void ndpi_search_tencent_games(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow) { @@ -40,9 +48,29 @@ static void ndpi_search_tencent_games(struct ndpi_detection_module_struct *ndpi_ if (ntohl(get_u_int32_t(packet->payload, 0)) == 0x3366000B && ntohs(get_u_int16_t(packet->payload, 4)) == 0xB) { - NDPI_LOG_INFO(ndpi_struct, "found Tencent Games\n"); - ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_TENCENTGAMES, - NDPI_PROTOCOL_UNKNOWN, NDPI_CONFIDENCE_DPI); + ndpi_int_tencent_games_add_connection(ndpi_struct, flow); + return; + } + + if (ntohl(get_u_int32_t(packet->payload, 0)) == 0x4366AA00 && + ntohl(get_u_int32_t(packet->payload, 12)) == 0x10E68601) + { + ndpi_int_tencent_games_add_connection(ndpi_struct, flow); + return; + } + + if (ntohl(get_u_int32_t(packet->payload, 0)) == 0xAA000000 && + ntohl(get_u_int32_t(packet->payload, 10)) == 0x10E68601) + { + ndpi_int_tencent_games_add_connection(ndpi_struct, flow); + return; + } + + if (get_u_int16_t(packet->payload, 0) == 0 && + ntohs(get_u_int16_t(packet->payload, 2)) == (u_int16_t)(packet->payload_packet_len-4) && + ntohs(get_u_int16_t(packet->payload, 4)) == 0x7801) + { + ndpi_int_tencent_games_add_connection(ndpi_struct, flow); return; } } diff --git a/tests/cfgs/default/pcap/tencent_games.pcap b/tests/cfgs/default/pcap/tencent_games.pcap index 9db3bd1c071156c99e32571d25d49ba1bc6c6869..1a14c48fd3c3cf25abadb2fdd57819135f912a09 100644 GIT binary patch delta 1816 zcmZux2~-nT6#bK=5n_ZOi&(HEvRc+4h+;z#ii%xMfGS`O8X?33A%;y5goH)Z3W^#8 z1q7o&aigM$EX8uz3Rn>eVUY+_Wsy}xEm)!d2V0AWIp@uv`G4;HZ|=P_&zE$ltF~4Z zUc>T#9%QpH9jhhp^$WVaS&y zSWXdwK(l!=hzE$EE0_$7AQ%-SFe>eqH?!`eX0jm32$KRtZMi^>lbs@i3Wz}kaTTR9 zgsaM06sHM9O{M@i`UT+OL@ z9o+MmfgH$*3hn?0q(k)CMRA%!3aFC+fK*_iPPG10A(qOllMNLR+1Ps}sQPeyZH`8R<|hdDj<8~f1XzX!Fb{6Rm?DKeplILArHtzatJ$p&cqz5L ztoYtzBL@a_^OsF1`3qSxYpf62-nwJSf($Ya!N!UFJ@fX3)aMD9Z!2QVTj4(P43_=% zA%m3M%g4|>${^x0^;1|RgZ_gOyO4Us$9$V7KpBL5!ZsK}ki-6vK}0YM3I3l!MwGmn z;E$SV`!|D%T>v0lxeEzIKyOhw0W5+Mjc@_fMR72Lykw!g@9)AfYnMj9DhtZrsf@DC z<6HO}#2L7phv}8SNo~_Q&Ke&VQzpk#MhQdNt48;6H!FKg6pt~qJ+RTiVqN`sjpVVl z{lOTE>@8~&fNc$-E_<^@8xk~9Ib1c11e+3(R&9>5o3D0LUQ^b|Cr`Zx-yJb=Hdt5L z^Ri8NDc0hN*jZis^M|{(`X7}#xJnMw3u7fXo2GH4+9cV}HBKQ~)#{vxy8g->cikwO zS*{&tmDbkR16|(+lia)6oz@2p`U2uIJj|2U8tDa>v*T5_T??vE33%gMkk6|gFK~+@ z^;td*%G9V56-@64;)tImdeROrPjsKSUmIpF?3{V7*RGm-k5cgJf>nm&AIfPjJ~7;# z7hSDi64=P%(!`byDQEp->BA>q1&7#F?2)p1x+i=yJ*u)0-ex7RM5pv z1~kc@$oqAni*!S|`_RSq^KuifhhrSqMt(O{?cECLgQG|27G)+^ZWQK=x3g%xqj9zC z%yQk5B-3xasGm7qnfP<2J9z9ZUN|~d{8}T^Gp@Eq!;PJ&CFZ9)a$B;CH8n64=mh{pLvGp9CYNp*{j+O4YvfiAm;Wua39 q9hyv0!E-F{5G!2mbW#h+sa|x>&$Cf4&voVSM6X`y96r*v)9fG22ebkJ delta 28 ccmca1`ifon%Hd55nHX3Y;GltFqwsZR0DD3Q00000 diff --git a/tests/cfgs/default/result/tencent_games.pcap.out b/tests/cfgs/default/result/tencent_games.pcap.out index 3803ecfa7..67eeeb314 100644 --- a/tests/cfgs/default/result/tencent_games.pcap.out +++ b/tests/cfgs/default/result/tencent_games.pcap.out @@ -1,6 +1,6 @@ -DPI Packets (TCP): 4 (4.00 pkts/flow) -Confidence DPI : 1 (flows) -Num dissector calls: 144 (144.00 diss/flow) +DPI Packets (TCP): 12 (4.00 pkts/flow) +Confidence DPI : 3 (flows) +Num dissector calls: 432 (144.00 diss/flow) LRU cache ookla: 0/0/0 (insert/search/found) LRU cache bittorrent: 0/0/0 (insert/search/found) LRU cache zoom: 0/0/0 (insert/search/found) @@ -18,11 +18,13 @@ Patricia risk mask: 0/0 (search/found) Patricia risk mask IPv6: 0/0 (search/found) Patricia risk: 0/0 (search/found) Patricia risk IPv6: 0/0 (search/found) -Patricia protocols: 1/1 (search/found) +Patricia protocols: 3/3 (search/found) Patricia protocols IPv6: 0/0 (search/found) -TencentGames 10 818 1 +TencentGames 22 2400 3 -Fun 10 818 1 +Fun 22 2400 3 - 1 TCP 10.215.173.1:43300 <-> 43.130.19.227:65010 [proto: 395/TencentGames][IP: 285/Tencent][ClearText][Confidence: DPI][DPI packets: 4][cat: Game/8][5 pkts/413 bytes <-> 5 pkts/405 bytes][Goodput ratio: 47/49][0.61 sec][bytes ratio: 0.010 (Mixed)][IAT c2s/s2c min/avg/max/stddev: 4/4 103/104 200/200 95/96][Pkt Len c2s/s2c min/avg/max/stddev: 40/40 83/81 157/173 46/52][PLAIN TEXT (9089499565149320430)][Plen Bins: 0,0,50,25,25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0] + 1 TCP 10.215.173.1:42864 <-> 162.62.116.201:20731 [proto: 395/TencentGames][IP: 285/Tencent][ClearText][Confidence: DPI][DPI packets: 4][cat: Game/8][4 pkts/951 bytes <-> 2 pkts/88 bytes][Goodput ratio: 81/0][0.23 sec][bytes ratio: 0.831 (Upload)][IAT c2s/s2c min/avg/max/stddev: 32/124 75/124 124/124 38/0][Pkt Len c2s/s2c min/avg/max/stddev: 40/40 238/44 473/48 191/4][Plen Bins: 0,0,0,0,0,0,0,0,0,0,50,0,0,50,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0] + 2 TCP 10.215.173.1:43300 <-> 43.130.19.227:65010 [proto: 395/TencentGames][IP: 285/Tencent][ClearText][Confidence: DPI][DPI packets: 4][cat: Game/8][5 pkts/413 bytes <-> 5 pkts/405 bytes][Goodput ratio: 47/49][0.61 sec][bytes ratio: 0.010 (Mixed)][IAT c2s/s2c min/avg/max/stddev: 4/4 103/104 200/200 95/96][Pkt Len c2s/s2c min/avg/max/stddev: 40/40 83/81 157/173 46/52][PLAIN TEXT (9089499565149320430)][Plen Bins: 0,0,50,25,25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0] + 3 TCP 10.215.173.1:46658 <-> 162.62.97.166:8085 [proto: 395/TencentGames][IP: 285/Tencent][ClearText][Confidence: DPI][DPI packets: 4][cat: Game/8][3 pkts/290 bytes <-> 3 pkts/253 bytes][Goodput ratio: 52/49][0.17 sec][bytes ratio: 0.068 (Mixed)][IAT c2s/s2c min/avg/max/stddev: 7/8 51/40 95/71 44/32][Pkt Len c2s/s2c min/avg/max/stddev: 40/40 97/84 190/165 66/57][PLAIN TEXT (gcloud)][Plen Bins: 0,0,0,50,50,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0]