From 6cd8f8cc6dded6e872f8befaf63c18266d5bcabc Mon Sep 17 00:00:00 2001 From: Toni Date: Sat, 18 Jun 2022 15:11:59 +0200 Subject: [PATCH] Improved GenshinImpact protocol dissector. (#1604) Signed-off-by: lns --- src/lib/protocols/genshin_impact.c | 26 ++++++++++++++++++++------ tests/pcap/genshin-impact.pcap | Bin 11576 -> 19869 bytes tests/result/genshin-impact.pcap.out | 10 +++++++--- 3 files changed, 27 insertions(+), 9 deletions(-) diff --git a/src/lib/protocols/genshin_impact.c b/src/lib/protocols/genshin_impact.c index 4333345a8..0485b935c 100644 --- a/src/lib/protocols/genshin_impact.c +++ b/src/lib/protocols/genshin_impact.c @@ -39,14 +39,28 @@ static void ndpi_search_genshin_impact(struct ndpi_detection_module_struct *ndpi NDPI_LOG_DBG(ndpi_struct, "search genshin-impact\n"); - if (packet->udp != NULL) + if (packet->tcp != NULL && packet->payload_packet_len >= 18) + { + u_int32_t pdu_len = ntohl(get_u_int32_t(packet->payload, 1)); + + if (packet->payload[0] == 0x01 && pdu_len == packet->payload_packet_len && + (packet->payload[5] == 0x01 || packet->payload[5] == 0x07) && + ntohs(get_u_int16_t(packet->payload, 16)) == 0x4da6) + { + NDPI_LOG_INFO(ndpi_struct, "found genshin-impact (TCP)\n"); + ndpi_int_genshin_impact_add_connection(ndpi_struct, flow); + return; + } + } + else if (packet->udp != NULL) { if (flow->packet_counter == 1 && packet->payload_packet_len >= 20 && - ntohl(*(u_int32_t*)&packet->payload[0]) == 0x000000FF && - ntohl(*(u_int32_t*)&packet->payload[4]) == 0x00000000 && - ntohl(*(u_int32_t*)&packet->payload[12]) == 0x499602D2 && - ntohl(*(u_int32_t*)&packet->payload[16]) == 0xFFFFFFFF) + ntohl(get_u_int32_t(packet->payload, 0)) == 0x000000FF && + ntohl(get_u_int32_t(packet->payload, 4)) == 0x00000000 && + ntohl(get_u_int32_t(packet->payload, 12)) == 0x499602D2 && + ntohl(get_u_int32_t(packet->payload, 16)) == 0xFFFFFFFF) { + NDPI_LOG_INFO(ndpi_struct, "found genshin-impact (UDP)\n"); ndpi_int_genshin_impact_add_connection(ndpi_struct, flow); return; } @@ -65,7 +79,7 @@ void init_genshin_impact_dissector(struct ndpi_detection_module_struct *ndpi_str ndpi_struct, detection_bitmask, *id, NDPI_PROTOCOL_GENSHIN_IMPACT, ndpi_search_genshin_impact, - NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_UDP_WITH_PAYLOAD, + NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_OR_UDP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION, SAVE_DETECTION_BITMASK_AS_UNKNOWN, ADD_TO_DETECTION_BITMASK); diff --git a/tests/pcap/genshin-impact.pcap b/tests/pcap/genshin-impact.pcap index 927189ea4fdc5386b15113bd90353fd9fd6384e0..8a9053eacf6787f2cd7cb023e35c5e4a99d2e8a9 100644 GIT binary patch delta 7761 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 delta 8 PcmbO`n{h|f1`AyP5a0u0 diff --git a/tests/result/genshin-impact.pcap.out b/tests/result/genshin-impact.pcap.out index 63cc5b6b8..1af638ef1 100644 --- a/tests/result/genshin-impact.pcap.out +++ b/tests/result/genshin-impact.pcap.out @@ -1,10 +1,14 @@ Guessed flow protos: 0 +DPI Packets (TCP): 12 (4.00 pkts/flow) DPI Packets (UDP): 3 (1.00 pkts/flow) -Confidence DPI : 3 (flows) +Confidence DPI : 6 (flows) -GenshinImpact 45 10832 3 +GenshinImpact 90 18405 6 1 UDP 192.168.2.100:58766 <-> 47.245.143.85:22101 [proto: 257/GenshinImpact][ClearText][Confidence: DPI][cat: Game/8][7 pkts/1369 bytes <-> 8 pkts/3568 bytes][Goodput ratio: 78/91][1.63 sec][bytes ratio: -0.445 (Download)][IAT c2s/s2c min/avg/max/stddev: 9/0 312/266 818/750 343/309][Pkt Len c2s/s2c min/avg/max/stddev: 62/62 196/446 648/1223 192/449][Risk: ** Known Proto on Non Std Port **][Risk Score: 50][Plen Bins: 20,13,0,6,13,20,0,0,0,6,0,0,0,0,0,0,0,0,6,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,13,0,0,0,0,0,0,0,0,0,0,0] 2 UDP 192.168.2.100:52575 <-> 8.209.69.191:22101 [proto: 257/GenshinImpact][ClearText][Confidence: DPI][cat: Game/8][7 pkts/1975 bytes <-> 8 pkts/1300 bytes][Goodput ratio: 85/74][2.27 sec][bytes ratio: 0.206 (Upload)][IAT c2s/s2c min/avg/max/stddev: 0/10 409/181 1044/710 455/239][Pkt Len c2s/s2c min/avg/max/stddev: 62/62 282/162 648/396 240/102][Risk: ** Known Proto on Non Std Port **][Risk Score: 50][Plen Bins: 20,26,0,6,0,20,6,0,0,0,0,6,0,0,0,0,0,0,13,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 UDP 192.168.2.100:59145 <-> 47.254.169.109:22102 [proto: 257/GenshinImpact][ClearText][Confidence: DPI][cat: Game/8][8 pkts/1383 bytes <-> 7 pkts/1237 bytes][Goodput ratio: 76/76][1.75 sec][bytes ratio: 0.056 (Mixed)][IAT c2s/s2c min/avg/max/stddev: 10/30 285/342 829/800 363/311][Pkt Len c2s/s2c min/avg/max/stddev: 62/62 173/177 650/340 185/88][Plen Bins: 34,13,0,13,13,13,0,0,0,6,0,0,0,0,0,0,0,0,0,6,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 192.168.2.100:39686 <-> 49.51.181.168:80 [proto: 257/GenshinImpact][ClearText][Confidence: DPI][cat: Game/8][9 pkts/2327 bytes <-> 6 pkts/535 bytes][Goodput ratio: 78/35][0.71 sec][bytes ratio: 0.626 (Upload)][IAT c2s/s2c min/avg/max/stddev: 0/0 76/88 176/176 86/87][Pkt Len c2s/s2c min/avg/max/stddev: 54/60 259/89 1468/138 434/29][PLAIN TEXT (194946781)][Plen Bins: 0,50,25,0,0,0,0,12,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,12,0,0,0] + 4 TCP 192.168.2.100:39822 <-> 49.51.190.178:80 [proto: 257/GenshinImpact][ClearText][Confidence: DPI][cat: Game/8][9 pkts/2294 bytes <-> 6 pkts/535 bytes][Goodput ratio: 78/35][0.69 sec][bytes ratio: 0.622 (Upload)][IAT c2s/s2c min/avg/max/stddev: 0/0 74/85 171/170 84/84][Pkt Len c2s/s2c min/avg/max/stddev: 54/60 255/89 1468/138 435/29][PLAIN TEXT (194946781)][Plen Bins: 12,51,12,0,0,0,0,12,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,12,0,0,0] + 5 UDP 192.168.2.100:59145 <-> 47.254.169.109:22102 [proto: 257/GenshinImpact][ClearText][Confidence: DPI][cat: Game/8][8 pkts/1383 bytes <-> 7 pkts/1237 bytes][Goodput ratio: 76/76][1.75 sec][bytes ratio: 0.056 (Mixed)][IAT c2s/s2c min/avg/max/stddev: 10/30 285/342 829/800 363/311][Pkt Len c2s/s2c min/avg/max/stddev: 62/62 173/177 650/340 185/88][Plen Bins: 34,13,0,13,13,13,0,0,0,6,0,0,0,0,0,0,0,0,0,6,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] + 6 TCP 192.168.2.100:45246 <-> 49.51.181.168:10012 [proto: 257/GenshinImpact][ClearText][Confidence: DPI][cat: Game/8][8 pkts/1287 bytes <-> 7 pkts/595 bytes][Goodput ratio: 65/31][0.92 sec][bytes ratio: 0.368 (Upload)][IAT c2s/s2c min/avg/max/stddev: 0/0 96/106 221/176 96/85][Pkt Len c2s/s2c min/avg/max/stddev: 54/60 161/85 546/138 165/29][PLAIN TEXT (194946781)][Plen Bins: 0,57,14,0,0,0,0,14,0,0,0,0,0,0,0,14,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]