aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorToni <matzeton@googlemail.com>2021-04-25 10:02:07 +0200
committerGitHub <noreply@github.com>2021-04-25 10:02:07 +0200
commitb4a8c8c63fe4c7b2cbb0a7e79810a150324c7fc3 (patch)
tree22f81cd650288f56cb01eabb8484800370cdc0bf
parentd95cd9912c158ba7bee75d88e99a0a5619882bec (diff)
Add Genshin Impact protocol. (#1173)
Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
-rw-r--r--src/include/ndpi_protocol_ids.h1
-rw-r--r--src/include/ndpi_protocols.h1
-rw-r--r--src/lib/ndpi_main.c7
-rw-r--r--src/lib/protocols/genshin_impact.c74
-rw-r--r--src/lib/protocols/hpvirtgrp.c1
-rw-r--r--tests/pcap/genshin-impact.pcapbin0 -> 11576 bytes
-rw-r--r--tests/result/genshin-impact.pcap.out5
7 files changed, 89 insertions, 0 deletions
diff --git a/src/include/ndpi_protocol_ids.h b/src/include/ndpi_protocol_ids.h
index b289362f5..1863d1e3e 100644
--- a/src/include/ndpi_protocol_ids.h
+++ b/src/include/ndpi_protocol_ids.h
@@ -285,6 +285,7 @@ typedef enum {
NDPI_PROTOCOL_APPLE_SIRI = 254, /* Zied Aouini <aouinizied@gmail.com> */
NDPI_PROTOCOL_SNAPCHAT_CALL = 255,
NDPI_PROTOCOL_HPVIRTGRP = 256, /* Toni Uhlig <matzeton@googlemail.com> */
+ NDPI_PROTOCOL_GENSHIN_IMPACT = 257, /* Toni Uhlig <matzeton@googlemail.com> */
#ifdef CUSTOM_NDPI_PROTOCOLS
diff --git a/src/include/ndpi_protocols.h b/src/include/ndpi_protocols.h
index b753def52..959a6d643 100644
--- a/src/include/ndpi_protocols.h
+++ b/src/include/ndpi_protocols.h
@@ -213,5 +213,6 @@ void init_dnscrypt_dissector(struct ndpi_detection_module_struct *ndpi_struct, u
void init_mongodb_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
void init_among_us_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
void init_hpvirtgrp_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
+void init_genshin_impact_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
#endif /* __NDPI_PROTOCOLS_H__ */
diff --git a/src/lib/ndpi_main.c b/src/lib/ndpi_main.c
index 42d867fd0..698317133 100644
--- a/src/lib/ndpi_main.c
+++ b/src/lib/ndpi_main.c
@@ -1624,6 +1624,10 @@ static void ndpi_init_protocol_defaults(struct ndpi_detection_module_struct *ndp
"HP Virtual Machine Group Management", NDPI_PROTOCOL_CATEGORY_NETWORK,
ndpi_build_default_ports(ports_a, 0, 0, 0, 0, 0) /* TCP */,
ndpi_build_default_ports(ports_b, 0, 0, 0, 0, 0) /* UDP */);
+ ndpi_set_proto_defaults(ndpi_str, NDPI_PROTOCOL_ACCEPTABLE, NDPI_PROTOCOL_GENSHIN_IMPACT,
+ "Genshin Impact", NDPI_PROTOCOL_CATEGORY_GAME,
+ ndpi_build_default_ports(ports_a, 0, 0, 0, 0, 0) /* TCP */,
+ ndpi_build_default_ports(ports_b, 22102, 0, 0, 0, 0) /* UDP */);
#ifdef CUSTOM_NDPI_PROTOCOLS
#include "../../../nDPI-custom/custom_ndpi_main.c"
@@ -3775,6 +3779,9 @@ void ndpi_set_protocol_detection_bitmask2(struct ndpi_detection_module_struct *n
/* HP Virtual Machine Group Management */
init_hpvirtgrp_dissector(ndpi_str, &a, detection_bitmask);
+ /* Genshin Impact */
+ init_genshin_impact_dissector(ndpi_str, &a, detection_bitmask);
+
#ifdef CUSTOM_NDPI_PROTOCOLS
#include "../../../nDPI-custom/custom_ndpi_main_init.c"
#endif
diff --git a/src/lib/protocols/genshin_impact.c b/src/lib/protocols/genshin_impact.c
new file mode 100644
index 000000000..9c4b59e55
--- /dev/null
+++ b/src/lib/protocols/genshin_impact.c
@@ -0,0 +1,74 @@
+/*
+ * genshin_impact.c
+ *
+ * Copyright (C) 2012-21 - ntop.org
+ *
+ * This module is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This module is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License.
+ * If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "ndpi_protocol_ids.h"
+
+#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_GENSHIN_IMPACT
+
+#include <stdlib.h>
+#include "ndpi_api.h"
+
+
+static void ndpi_int_genshin_impact_add_connection(
+ struct ndpi_detection_module_struct *ndpi_struct,
+ struct ndpi_flow_struct *flow)
+{
+ ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_GENSHIN_IMPACT, NDPI_PROTOCOL_UNKNOWN);
+}
+
+static void ndpi_search_genshin_impact(struct ndpi_detection_module_struct *ndpi_struct,
+ struct ndpi_flow_struct *flow)
+{
+ struct ndpi_packet_struct * packet = &flow->packet;
+
+ NDPI_LOG_DBG(ndpi_struct, "search genshin-impact\n");
+
+ 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)
+ {
+ ndpi_int_genshin_impact_add_connection(ndpi_struct, flow);
+ return;
+ }
+ }
+
+ NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
+}
+
+
+/* ***************************************************************** */
+
+void init_genshin_impact_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id,
+ NDPI_PROTOCOL_BITMASK *detection_bitmask)
+{
+ ndpi_set_bitmask_protocol_detection("Genshin Impact",
+ ndpi_struct, detection_bitmask, *id,
+ NDPI_PROTOCOL_GENSHIN_IMPACT,
+ ndpi_search_genshin_impact,
+ NDPI_SELECTION_BITMASK_PROTOCOL_UDP_WITH_PAYLOAD,
+ SAVE_DETECTION_BITMASK_AS_UNKNOWN,
+ ADD_TO_DETECTION_BITMASK);
+
+ *id += 1;
+}
diff --git a/src/lib/protocols/hpvirtgrp.c b/src/lib/protocols/hpvirtgrp.c
index b1ce092e7..a4c5dee0a 100644
--- a/src/lib/protocols/hpvirtgrp.c
+++ b/src/lib/protocols/hpvirtgrp.c
@@ -47,6 +47,7 @@ static void ndpi_search_hpvirtgrp(struct ndpi_detection_module_struct *ndpi_stru
packet->payload[0] == 0x16 && packet->payload[3] == 0x00)
{
ndpi_int_hpvirtgrp_add_connection(ndpi_struct, flow);
+ return;
}
}
diff --git a/tests/pcap/genshin-impact.pcap b/tests/pcap/genshin-impact.pcap
new file mode 100644
index 000000000..927189ea4
--- /dev/null
+++ b/tests/pcap/genshin-impact.pcap
Binary files differ
diff --git a/tests/result/genshin-impact.pcap.out b/tests/result/genshin-impact.pcap.out
new file mode 100644
index 000000000..682236e8a
--- /dev/null
+++ b/tests/result/genshin-impact.pcap.out
@@ -0,0 +1,5 @@
+Genshin Impact 45 10832 3
+
+ 1 UDP 192.168.2.100:58766 <-> 47.245.143.85:22101 [proto: 257/Genshin Impact][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][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/Genshin Impact][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][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/Genshin Impact][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]