diff options
author | Toni <matzeton@googlemail.com> | 2022-07-03 20:43:30 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-07-03 20:43:30 +0200 |
commit | a74fc089c4df8161feddf8c1bf5aabfb0e271b7d (patch) | |
tree | e7adc3e89f668c5405137189a42fd7751b14b125 /src | |
parent | faaff58620feabe3221c75ef9b503e1c459b795a (diff) |
Added i3D and RiotGames protocol dissectors. (#1609)
Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/include/ndpi_protocol_ids.h | 2 | ||||
-rw-r--r-- | src/include/ndpi_protocols.h | 2 | ||||
-rw-r--r-- | src/lib/ndpi_main.c | 14 | ||||
-rw-r--r-- | src/lib/protocols/i3d.c | 89 | ||||
-rw-r--r-- | src/lib/protocols/riotgames.c | 80 |
5 files changed, 187 insertions, 0 deletions
diff --git a/src/include/ndpi_protocol_ids.h b/src/include/ndpi_protocol_ids.h index 18faa4034..858901110 100644 --- a/src/include/ndpi_protocol_ids.h +++ b/src/include/ndpi_protocol_ids.h @@ -329,6 +329,8 @@ typedef enum { NDPI_PROTOCOL_COLLECTD = 298, NDPI_PROTOCOL_TUNNELBEAR = 299, NDPI_PROTOCOL_CLOUDFLARE_WARP = 300, + NDPI_PROTOCOL_I3D = 301, /* i3d.net: Game Hosting service */ + NDPI_PROTOCOL_RIOTGAMES = 302, #ifdef CUSTOM_NDPI_PROTOCOLS #include "../../../nDPI-custom/custom_ndpi_protocol_ids.h" diff --git a/src/include/ndpi_protocols.h b/src/include/ndpi_protocols.h index f7b33064a..f80a03395 100644 --- a/src/include/ndpi_protocols.h +++ b/src/include/ndpi_protocols.h @@ -228,6 +228,8 @@ void init_mpegdash_dissector(struct ndpi_detection_module_struct *ndpi_struct, u void init_rsh_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask); void init_ipsec_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask); void init_collectd_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask); +void init_i3d_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask); +void init_riotgames_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask); /* ndpi_main.c */ extern u_int32_t ndpi_ip_port_hash_funct(u_int32_t ip, u_int16_t port); diff --git a/src/lib/ndpi_main.c b/src/lib/ndpi_main.c index 25b558b0a..3a1afa695 100644 --- a/src/lib/ndpi_main.c +++ b/src/lib/ndpi_main.c @@ -1928,6 +1928,14 @@ static void ndpi_init_protocol_defaults(struct ndpi_detection_module_struct *ndp "collectd", NDPI_PROTOCOL_CATEGORY_SYSTEM_OS, ndpi_build_default_ports(ports_a, 0, 0, 0, 0, 0) /* TCP */, ndpi_build_default_ports(ports_b, 25826, 0, 0, 0, 0) /* UDP */); + ndpi_set_proto_defaults(ndpi_str, 1 /* cleartext */, 0 /* nw proto */, NDPI_PROTOCOL_ACCEPTABLE, NDPI_PROTOCOL_I3D, + "i3D", 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 */); + ndpi_set_proto_defaults(ndpi_str, 1 /* cleartext */, 0 /* nw proto */, NDPI_PROTOCOL_ACCEPTABLE, NDPI_PROTOCOL_RIOTGAMES, + "RiotGames", 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 */); #ifdef CUSTOM_NDPI_PROTOCOLS #include "../../../nDPI-custom/custom_ndpi_main.c" @@ -4433,6 +4441,12 @@ static int ndpi_callback_init(struct ndpi_detection_module_struct *ndpi_str) { /* collectd */ init_collectd_dissector(ndpi_str, &a, detection_bitmask); + /* i3D */ + init_i3d_dissector(ndpi_str, &a, detection_bitmask); + + /* RiotGames */ + init_riotgames_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/i3d.c b/src/lib/protocols/i3d.c new file mode 100644 index 000000000..8b6fdf093 --- /dev/null +++ b/src/lib/protocols/i3d.c @@ -0,0 +1,89 @@ +/* + * i3d.c + * + * Copyright (C) 2022 - ntop.org + * + * 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_I3D + +#include "ndpi_api.h" + +static void ndpi_int_i3d_add_connection(struct ndpi_detection_module_struct * const ndpi_struct, + struct ndpi_flow_struct * const flow) +{ + NDPI_LOG_INFO(ndpi_struct, "found i3D\n"); + ndpi_set_detected_protocol(ndpi_struct, flow, + NDPI_PROTOCOL_UNKNOWN, + NDPI_PROTOCOL_I3D, + NDPI_CONFIDENCE_DPI); +} + +void ndpi_search_i3d(struct ndpi_detection_module_struct *ndpi_struct, + struct ndpi_flow_struct *flow) +{ + struct ndpi_packet_struct const * const packet = &ndpi_struct->packet; + + NDPI_LOG_DBG(ndpi_struct, "searching i3D\n"); + + /* + * i3D offers a lot of services. + * The patterns below are mostly used by dedicated game servers. + */ + + if (packet->payload_packet_len < 74) + { + NDPI_EXCLUDE_PROTO(ndpi_struct, flow); + return; + } + + if ((ntohl(get_u_int32_t(packet->payload, 0)) == 0x00010046 || + ntohl(get_u_int32_t(packet->payload, 0)) == 0x00020046) && + ntohl(get_u_int32_t(packet->payload, 4)) == 0x0003cfa8) + { + ndpi_int_i3d_add_connection(ndpi_struct, flow); + return; + } + + if ((ntohs(get_u_int16_t(packet->payload, 0)) == 0x9078 || + ntohs(get_u_int16_t(packet->payload, 0)) == 0x9067) && + ntohl(get_u_int32_t(packet->payload, 8)) == 0x0003cfa9 && + ntohl(get_u_int32_t(packet->payload, 12)) == 0xbede0003) + { + ndpi_int_i3d_add_connection(ndpi_struct, flow); + return; + } + + NDPI_EXCLUDE_PROTO(ndpi_struct, flow); + return; +} + +void init_i3d_dissector(struct ndpi_detection_module_struct *ndpi_struct, + u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) +{ + ndpi_set_bitmask_protocol_detection("i3D", ndpi_struct, detection_bitmask, *id, + NDPI_PROTOCOL_I3D, + ndpi_search_i3d, + 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/riotgames.c b/src/lib/protocols/riotgames.c new file mode 100644 index 000000000..31c9889f5 --- /dev/null +++ b/src/lib/protocols/riotgames.c @@ -0,0 +1,80 @@ +/* + * riotgames.c + * + * Copyright (C) 2022 - ntop.org + * + * 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_RIOTGAMES + +#include "ndpi_api.h" + +static void ndpi_int_riotgames_add_connection(struct ndpi_detection_module_struct * const ndpi_struct, + struct ndpi_flow_struct * const flow) +{ + NDPI_LOG_INFO(ndpi_struct, "found RiotGames\n"); + ndpi_set_detected_protocol(ndpi_struct, flow, + NDPI_PROTOCOL_UNKNOWN, + NDPI_PROTOCOL_RIOTGAMES, + NDPI_CONFIDENCE_DPI); +} + +void ndpi_search_riotgames(struct ndpi_detection_module_struct *ndpi_struct, + struct ndpi_flow_struct *flow) +{ + struct ndpi_packet_struct const * const packet = &ndpi_struct->packet; + + NDPI_LOG_DBG(ndpi_struct, "searching RiotGames\n"); + + if (packet->payload_packet_len == 8 && + ntohl(get_u_int32_t(packet->payload, 0)) == 0x1337cafe) + { + ndpi_int_riotgames_add_connection(ndpi_struct, flow); + return; + } + + if (packet->payload_packet_len > 8 && + ntohl(get_u_int32_t(packet->payload, packet->payload_packet_len - 8)) == 0xaaaaaaaa && + ntohl(get_u_int32_t(packet->payload, packet->payload_packet_len - 4)) == 0xbbbbbbbb) + { + ndpi_int_riotgames_add_connection(ndpi_struct, flow); + return; + } + + /* + * Please add new patterns for games made by RiotGames here + */ + + NDPI_EXCLUDE_PROTO(ndpi_struct, flow); + return; +} + +void init_riotgames_dissector(struct ndpi_detection_module_struct *ndpi_struct, + u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) +{ + ndpi_set_bitmask_protocol_detection("RiotGames", ndpi_struct, detection_bitmask, *id, + NDPI_PROTOCOL_RIOTGAMES, + ndpi_search_riotgames, + NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_UDP_WITH_PAYLOAD, + SAVE_DETECTION_BITMASK_AS_UNKNOWN, + ADD_TO_DETECTION_BITMASK + ); + + *id += 1; +} |