Add NetEase Games detection support (#2335)

13 files changed, 142 insertions, 100 deletions

diff --git a/doc/protocols.rst b/doc/protocols.rst
index ccd071503..a8f486798 100644
--- a/doc/protocols.rst
+++ b/doc/protocols.rst
@@ -651,8 +651,8 @@ References: `RFC <https://datatracker.ietf.org/doc/html/rfc5880>`_
 
 .. _Proto 402:
 
-`NDPI_PROTOCOL_NARAKA`
+`NDPI_PROTOCOL_NETEASE_GAMES`
 ============================
-Naraka: Bladepoint is a free-to-play action battle royale game developed by 24 Entertainment.
+Traffic of various NetEase games.
 
-References: `Main site <https://www.narakathegame.com/>`_
+References: `Main site <https://www.neteasegames.com/>`_
diff --git a/src/include/ndpi_private.h b/src/include/ndpi_private.h
index cd955741c..43f975626 100644
--- a/src/include/ndpi_private.h
+++ b/src/include/ndpi_private.h
@@ -910,7 +910,7 @@ void init_gaijin_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_i
 void init_c1222_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id);
 void init_dlep_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id);
 void init_bfd_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id);
-void init_naraka_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id);
+void init_netease_games_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id);
 
 #endif
 
diff --git a/src/include/ndpi_protocol_ids.h b/src/include/ndpi_protocol_ids.h
index 8ea516a7e..102439351 100644
--- a/src/include/ndpi_protocol_ids.h
+++ b/src/include/ndpi_protocol_ids.h
@@ -430,7 +430,7 @@ typedef enum {
   NDPI_PROTOCOL_HUAWEI_CLOUD          = 399,
   NDPI_PROTOCOL_DLEP                  = 400,
   NDPI_PROTOCOL_BFD                   = 401,
-  NDPI_PROTOCOL_NARAKA                = 402,
+  NDPI_PROTOCOL_NETEASE_GAMES         = 402,
 
 #ifdef CUSTOM_NDPI_PROTOCOLS
 #include "../../../nDPI-custom/custom_ndpi_protocol_ids.h"
diff --git a/src/lib/ndpi_content_match.c.inc b/src/lib/ndpi_content_match.c.inc
index 69e542884..ac4628ab3 100644
--- a/src/lib/ndpi_content_match.c.inc
+++ b/src/lib/ndpi_content_match.c.inc
@@ -1618,9 +1618,11 @@ static ndpi_protocol_match host_match[] =
    { "hicloud.com",                      "HuaweiCloud", NDPI_PROTOCOL_HUAWEI_CLOUD, NDPI_PROTOCOL_CATEGORY_CLOUD, NDPI_PROTOCOL_ACCEPTABLE, NDPI_PROTOCOL_DEFAULT_LEVEL },
    { "dbankcloud.com",                   "HuaweiCloud", NDPI_PROTOCOL_HUAWEI_CLOUD, NDPI_PROTOCOL_CATEGORY_CLOUD, NDPI_PROTOCOL_ACCEPTABLE, NDPI_PROTOCOL_DEFAULT_LEVEL },
    { "dbankcloud.cn",                    "HuaweiCloud", NDPI_PROTOCOL_HUAWEI_CLOUD, NDPI_PROTOCOL_CATEGORY_CLOUD, NDPI_PROTOCOL_ACCEPTABLE, NDPI_PROTOCOL_DEFAULT_LEVEL },
-   { "dbankcdn.com",                      "HuaweiCloud", NDPI_PROTOCOL_HUAWEI_CLOUD, NDPI_PROTOCOL_CATEGORY_CLOUD, NDPI_PROTOCOL_ACCEPTABLE, NDPI_PROTOCOL_DEFAULT_LEVEL },
+   { "dbankcdn.com",                     "HuaweiCloud", NDPI_PROTOCOL_HUAWEI_CLOUD, NDPI_PROTOCOL_CATEGORY_CLOUD, NDPI_PROTOCOL_ACCEPTABLE, NDPI_PROTOCOL_DEFAULT_LEVEL },
    { "myhuaweicloud.com",                "HuaweiCloud", NDPI_PROTOCOL_HUAWEI_CLOUD, NDPI_PROTOCOL_CATEGORY_CLOUD, NDPI_PROTOCOL_ACCEPTABLE, NDPI_PROTOCOL_DEFAULT_LEVEL },
 
+   { "easebar.com",                      "NetEaseGames", NDPI_PROTOCOL_NETEASE_GAMES, NDPI_PROTOCOL_CATEGORY_GAME, NDPI_PROTOCOL_FUN, NDPI_PROTOCOL_DEFAULT_LEVEL },
+
 #ifdef CUSTOM_NDPI_PROTOCOLS
 #include "../../../nDPI-custom/custom_ndpi_content_match_host_match.c.inc"
 #endif
diff --git a/src/lib/ndpi_main.c b/src/lib/ndpi_main.c
index e0a330768..28301b414 100644
--- a/src/lib/ndpi_main.c
+++ b/src/lib/ndpi_main.c
@@ -2250,8 +2250,8 @@ static void ndpi_init_protocol_defaults(struct ndpi_detection_module_struct *ndp
 			  "BFD", NDPI_PROTOCOL_CATEGORY_NETWORK,
 			  ndpi_build_default_ports(ports_a, 0, 0, 0, 0, 0) /* TCP */,
 			  ndpi_build_default_ports(ports_b, 3784, 3785, 0, 0, 0) /* UDP */);
-  ndpi_set_proto_defaults(ndpi_str, 1 /* cleartext */, 0 /* nw proto */, NDPI_PROTOCOL_FUN, NDPI_PROTOCOL_NARAKA,
-			  "NarakaBladepoint", NDPI_PROTOCOL_CATEGORY_GAME,
+  ndpi_set_proto_defaults(ndpi_str, 1 /* cleartext */, 0 /* nw proto */, NDPI_PROTOCOL_FUN, NDPI_PROTOCOL_NETEASE_GAMES,
+			  "NetEaseGames", NDPI_PROTOCOL_CATEGORY_GAME,
 			  ndpi_build_default_ports(ports_a, 0, 0, 0, 0, 0) /* TCP */,
 			  ndpi_build_default_ports(ports_b, 0, 0, 0, 0, 0) /* UDP */);
 
@@ -6082,8 +6082,8 @@ static int ndpi_callback_init(struct ndpi_detection_module_struct *ndpi_str) {
   /* Bidirectional Forwarding Detection */
   init_bfd_dissector(ndpi_str, &a);
 
-  /* Naraka: Bladepoint */
-  init_naraka_dissector(ndpi_str, &a);
+  /* NetEase Games */
+  init_netease_games_dissector(ndpi_str, &a);
 
 #ifdef CUSTOM_NDPI_PROTOCOLS
 #include "../../../nDPI-custom/custom_ndpi_main_init.c"
diff --git a/src/lib/protocols/naraka.c b/src/lib/protocols/naraka.c
deleted file mode 100644
index 97479e6d0..000000000
--- a/src/lib/protocols/naraka.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * naraka.c
- *
- * Copyright (C) 2024 - ntop.org
- * Copyright (C) 2024 - V.G <jacendi@protonmail.com>
- *
- * This file is part of nDPI, an open source deep packet inspection
- * library based on the OpenDPI and PACE technology by ipoque GmbH
- *
- * nDPI 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.
- *
- * nDPI 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
- * along with nDPI.  If not, see <http://www.gnu.org/licenses/>.
- * 
- */
-
-#include "ndpi_protocol_ids.h"
-
-#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_NARAKA
-
-#include "ndpi_api.h"
-#include "ndpi_private.h"
-
-static void ndpi_search_naraka(struct ndpi_detection_module_struct *ndpi_struct,
-                               struct ndpi_flow_struct *flow)
-{
-  struct ndpi_packet_struct const * const packet = &ndpi_struct->packet;
-
-  if (packet->payload_packet_len > 30 &&
-      le32toh(get_u_int32_t(packet->payload, 0)) == 0x0C080807)
-  {
-    NDPI_LOG_INFO(ndpi_struct, "found Naraka Bladepoint\n");
-    ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_NARAKA,
-                             NDPI_PROTOCOL_UNKNOWN, NDPI_CONFIDENCE_DPI);
-    return;
-  }
-
-  NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
-}
-
-void init_naraka_dissector(struct ndpi_detection_module_struct *ndpi_struct,
-                           u_int32_t *id)
-{
-  ndpi_set_bitmask_protocol_detection("NarakaBladepoint", ndpi_struct, *id,
-                                      NDPI_PROTOCOL_NARAKA,
-                                      ndpi_search_naraka,
-                                      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_UDP_WITH_PAYLOAD,
-                                      SAVE_DETECTION_BITMASK_AS_UNKNOWN,
-                                      ADD_TO_DETECTION_BITMASK);
-
-  *id += 1;
-}
diff --git a/src/lib/protocols/netease_games.c b/src/lib/protocols/netease_games.c
new file mode 100644
index 000000000..4c974e62f
--- /dev/null
+++ b/src/lib/protocols/netease_games.c
@@ -0,0 +1,90 @@
+/*
+ * netease_games.c
+ *
+ * Copyright (C) 2024 - ntop.org
+ * Copyright (C) 2024 - V.G <jacendi@protonmail.com>
+ *
+ * This file is part of nDPI, an open source deep packet inspection
+ * library based on the OpenDPI and PACE technology by ipoque GmbH
+ *
+ * nDPI 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.
+ *
+ * nDPI 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
+ * along with nDPI.  If not, see <http://www.gnu.org/licenses/>.
+ * 
+ */
+
+#include "ndpi_protocol_ids.h"
+
+#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_NETEASE_GAMES
+
+#include "ndpi_api.h"
+#include "ndpi_private.h"
+
+static void ndpi_int_netease_add_connection(struct ndpi_detection_module_struct *ndpi_struct, 
+                                            struct ndpi_flow_struct *flow)
+{
+  NDPI_LOG_INFO(ndpi_struct, "found NetEase Games\n");
+  ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_NETEASE_GAMES,
+                             NDPI_PROTOCOL_UNKNOWN, NDPI_CONFIDENCE_DPI);
+}
+
+static void ndpi_search_netease(struct ndpi_detection_module_struct *ndpi_struct,
+                                struct ndpi_flow_struct *flow)
+{
+  struct ndpi_packet_struct const * const packet = &ndpi_struct->packet;
+
+  /* I've seen this pattern in traffic of few games from 
+   * NetEase (Lost Light, Badlanders, Naraka: Bladepoint) */
+
+  if (packet->payload_packet_len == 12 &&
+      current_pkt_from_client_to_server(ndpi_struct, flow) &&
+      packet->payload[0] == 0x01 &&
+      le16toh(get_u_int16_t(packet->payload, 2)) == 0x1D0 &&
+      le32toh(get_u_int32_t(packet->payload, 8)) == 0x1010100)
+  {
+    ndpi_int_netease_add_connection(ndpi_struct, flow);
+    return;
+  }
+
+  /* Lost Light */
+  if (packet->payload_packet_len >= 30 && 
+      ntohl(get_u_int32_t(packet->payload, 0)) == 0xB3AF8DE8)
+  {
+    ndpi_int_netease_add_connection(ndpi_struct, flow);
+    return;
+  }
+
+  /* Naraka: Bladepoint */
+  if (packet->payload_packet_len > 30 &&
+      le32toh(get_u_int32_t(packet->payload, 0)) == 0x0C080807)
+  {
+    ndpi_int_netease_add_connection(ndpi_struct, flow);
+    return;
+  }
+
+  /* TODO: add more NetEase Games signatures */
+
+  NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
+}
+
+void init_netease_games_dissector(struct ndpi_detection_module_struct *ndpi_struct,
+                                  u_int32_t *id)
+{
+  ndpi_set_bitmask_protocol_detection("NetEaseGames", ndpi_struct, *id,
+                                      NDPI_PROTOCOL_NETEASE_GAMES,
+                                      ndpi_search_netease,
+                                      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_UDP_WITH_PAYLOAD,
+                                      SAVE_DETECTION_BITMASK_AS_UNKNOWN,
+                                      ADD_TO_DETECTION_BITMASK);
+
+  *id += 1;
+}
diff --git a/tests/cfgs/default/pcap/naraka_bladepoint.pcapng b/tests/cfgs/default/pcap/naraka_bladepoint.pcapng
deleted file mode 100644
index 469497b30..000000000
--- a/tests/cfgs/default/pcap/naraka_bladepoint.pcapng
+++ /dev/null
diff --git a/tests/cfgs/default/pcap/netease_games.pcapng b/tests/cfgs/default/pcap/netease_games.pcapng
new file mode 100644
index 000000000..83a6685bf
--- /dev/null
+++ b/tests/cfgs/default/pcap/netease_games.pcapng
diff --git a/tests/cfgs/default/result/naraka_bladepoint.pcapng.out b/tests/cfgs/default/result/naraka_bladepoint.pcapng.out
deleted file mode 100644
index 6ef35a187..000000000
--- a/tests/cfgs/default/result/naraka_bladepoint.pcapng.out
+++ /dev/null
@@ -1,28 +0,0 @@
-DPI Packets (UDP):	1	(1.00 pkts/flow)
-Confidence DPI              : 1 (flows)
-Num dissector calls: 136 (136.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)
-LRU cache stun:       0/0/0 (insert/search/found)
-LRU cache tls_cert:   0/0/0 (insert/search/found)
-LRU cache mining:     0/0/0 (insert/search/found)
-LRU cache msteams:    0/0/0 (insert/search/found)
-LRU cache stun_zoom:  0/0/0 (insert/search/found)
-Automa host:          0/0 (search/found)
-Automa domain:        0/0 (search/found)
-Automa tls cert:      0/0 (search/found)
-Automa risk mask:     0/0 (search/found)
-Automa common alpns:  0/0 (search/found)
-Patricia risk mask:   2/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 IPv6: 0/0 (search/found)
-
-NarakaBladepoint	5	753	1
-
-Fun                              5 753           1            
-
-	1	UDP 192.168.88.231:58951 <-> 34.141.75.90:28203 [proto: 402/NarakaBladepoint][IP: 284/GoogleCloud][ClearText][Confidence: DPI][DPI packets: 1][cat: Game/8][3 pkts/339 bytes <-> 2 pkts/414 bytes][Goodput ratio: 63/80][0.07 sec][PLAIN TEXT (9251381)][Plen Bins: 0,40,20,20,0,0,0,0,0,20,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]
diff --git a/tests/cfgs/default/result/netease_games.pcapng.out b/tests/cfgs/default/result/netease_games.pcapng.out
new file mode 100644
index 000000000..76698b3d8
--- /dev/null
+++ b/tests/cfgs/default/result/netease_games.pcapng.out
@@ -0,0 +1,38 @@
+DPI Packets (TCP):	6	(6.00 pkts/flow)
+DPI Packets (UDP):	6	(1.50 pkts/flow)
+Confidence DPI              : 5 (flows)
+Num dissector calls: 410 (82.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)
+LRU cache stun:       0/0/0 (insert/search/found)
+LRU cache tls_cert:   0/0/0 (insert/search/found)
+LRU cache mining:     0/0/0 (insert/search/found)
+LRU cache msteams:    0/0/0 (insert/search/found)
+LRU cache stun_zoom:  0/0/0 (insert/search/found)
+Automa host:          4/4 (search/found)
+Automa domain:        4/0 (search/found)
+Automa tls cert:      0/0 (search/found)
+Automa risk mask:     1/0 (search/found)
+Automa common alpns:  0/0 (search/found)
+Patricia risk mask:   8/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:   6/4 (search/found)
+Patricia protocols IPv6: 0/0 (search/found)
+
+NetEaseGames	20	2662	5
+
+Fun                             20 2662          5            
+
+JA3 Host Stats: 
+		 IP Address                  	 # JA3C     
+	1	 192.168.88.231           	 1      
+
+
+	1	TCP 192.168.88.231:50402 <-> 35.73.71.94:443 [proto: 91.402/TLS.NetEaseGames][IP: 265/AmazonAWS][Encrypted][Confidence: DPI][DPI packets: 6][cat: Game/8][3 pkts/723 bytes <-> 3 pkts/302 bytes][Goodput ratio: 71/32][0.56 sec][Hostname/SNI: data-detect.nie.easebar.com][bytes ratio: 0.411 (Upload)][IAT c2s/s2c min/avg/max/stddev: 0/0 140/140 280/281 140/140][Pkt Len c2s/s2c min/avg/max/stddev: 66/66 241/101 583/162 242/43][Risk: ** TLS (probably) Not Carrying HTTPS **][Risk Score: 10][Risk Info: No ALPN][TLSv1.2][JA3C: b502ea5e20e42ca41d28d47e8df496fa][JA4: t12d600600_a54dbbc9e493_8587f467d9ea][JA3S: 704239182a9091e4453fdbfe0fd17586][Firefox][Cipher: TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256][Plen Bins: 0,0,0,50,0,0,0,0,0,0,0,0,0,0,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]
+	2	UDP 192.168.88.231:58951 <-> 34.141.75.90:28203 [proto: 402/NetEaseGames][IP: 284/GoogleCloud][ClearText][Confidence: DPI][DPI packets: 1][cat: Game/8][3 pkts/339 bytes <-> 2 pkts/414 bytes][Goodput ratio: 63/80][< 1 sec][PLAIN TEXT (9251381)][Plen Bins: 0,40,20,20,0,0,0,0,0,20,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	UDP 192.168.88.231:49377 <-> 172.17.8.75:53 [proto: 5.402/DNS.NetEaseGames][IP: 0/Unknown][ClearText][Confidence: DPI][DPI packets: 3][cat: Network/14][2 pkts/174 bytes <-> 2 pkts/398 bytes][Goodput ratio: 51/79][0.06 sec][Hostname/SNI: data-detect.nie.easebar.com][35.73.71.94][PLAIN TEXT (detect)][Plen Bins: 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,0,0,0,0,0,0,0,0,0]
+	4	UDP 192.168.88.231:56588 <-> 35.246.207.19:4513 [proto: 402/NetEaseGames][IP: 284/GoogleCloud][ClearText][Confidence: DPI][DPI packets: 1][cat: Game/8][2 pkts/108 bytes <-> 1 pkts/60 bytes][Goodput ratio: 22/20][0.04 sec][Plen Bins: 100,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,0,0,0,0]
+	5	UDP 192.168.88.231:41040 <-> 35.228.32.209:4170 [proto: 402/NetEaseGames][IP: 284/GoogleCloud][ClearText][Confidence: DPI][DPI packets: 1][cat: Game/8][1 pkts/72 bytes <-> 1 pkts/72 bytes][Goodput ratio: 41/41][0.04 sec][PLAIN TEXT (nfcqjI/TZ)][Plen Bins: 100,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,0,0,0,0]
diff --git a/windows/nDPI.vcxproj b/windows/nDPI.vcxproj
index 23fac6487..d7da547d0 100644
--- a/windows/nDPI.vcxproj
+++ b/windows/nDPI.vcxproj
@@ -368,7 +368,7 @@
     <ClCompile Include="..\src\lib\protocols\c1222.c" />
     <ClCompile Include="..\src\lib\protocols\dlep.c" />
     <ClCompile Include="..\src\lib\protocols\bfd.c" />
-    <ClCompile Include="..\src\lib\protocols\naraka.c" />
+    <ClCompile Include="..\src\lib\protocols\netease_games.c" />
     <ClCompile Include="..\src\lib\third_party\src\gcrypt_light.c" />
     <ClCompile Include="..\src\lib\third_party\src\libcache.c" />
     <ClCompile Include="..\src\lib\third_party\src\libinjection_html5.c" />
diff --git a/windows/nDPI.vcxproj.filters b/windows/nDPI.vcxproj.filters
index 25520b39e..cbef98879 100644
--- a/windows/nDPI.vcxproj.filters
+++ b/windows/nDPI.vcxproj.filters
@@ -143,7 +143,7 @@
     <ClCompile Include="..\src\lib\protocols\c1222.c" />
     <ClCompile Include="..\src\lib\protocols\dlep.c" />
     <ClCompile Include="..\src\lib\protocols\bfd.c" />
-    <ClCompile Include="..\src\lib\protocols\naraka.c" />
+    <ClCompile Include="..\src\lib\protocols\netease_games.c" />
     <ClCompile Include="src\getopt.c" />
     <ClCompile Include="src\win-gettimeofday.c" />
     <ClCompile Include="..\src\lib\ndpi_analyze.c" />