diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/include/ndpi_private.h | 1 | ||||
-rw-r--r-- | src/include/ndpi_protocol_ids.h | 1 | ||||
-rw-r--r-- | src/include/ndpi_typedefs.h | 3 | ||||
-rw-r--r-- | src/lib/ndpi_main.c | 7 | ||||
-rw-r--r-- | src/lib/protocols/radmin.c | 98 |
5 files changed, 110 insertions, 0 deletions
diff --git a/src/include/ndpi_private.h b/src/include/ndpi_private.h index b7c93d60d..e1273e696 100644 --- a/src/include/ndpi_private.h +++ b/src/include/ndpi_private.h @@ -722,6 +722,7 @@ void init_mumble_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_i void init_zoom_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id); void init_yojimbo_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id); void init_stomp_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id); +void init_radmin_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 7b77dad18..ffa9f0e16 100644 --- a/src/include/ndpi_protocol_ids.h +++ b/src/include/ndpi_protocol_ids.h @@ -419,6 +419,7 @@ typedef enum { NDPI_PROTOCOL_YOJIMBO = 388, NDPI_PROTOCOL_ELECTRONICARTS = 389, NDPI_PROTOCOL_STOMP = 390, + NDPI_PROTOCOL_RADMIN = 391, #ifdef CUSTOM_NDPI_PROTOCOLS #include "../../../nDPI-custom/custom_ndpi_protocol_ids.h" diff --git a/src/include/ndpi_typedefs.h b/src/include/ndpi_typedefs.h index 91dd4cff0..06adf1f55 100644 --- a/src/include/ndpi_typedefs.h +++ b/src/include/ndpi_typedefs.h @@ -869,6 +869,9 @@ struct ndpi_flow_tcp_struct { /* NDPI_PROTOCOL_NEST_LOG_SINK */ u_int8_t nest_log_sink_matches; + + /* NDPI_PROTOCOL_RADMIN */ + u_int32_t radmin_stage:1; }; /* ************************************************** */ diff --git a/src/lib/ndpi_main.c b/src/lib/ndpi_main.c index 5fe52dd04..0cea75ced 100644 --- a/src/lib/ndpi_main.c +++ b/src/lib/ndpi_main.c @@ -2214,6 +2214,10 @@ static void ndpi_init_protocol_defaults(struct ndpi_detection_module_struct *ndp "STOMP", NDPI_PROTOCOL_CATEGORY_RPC, ndpi_build_default_ports(ports_a, 61613, 0, 0, 0, 0) /* TCP */, ndpi_build_default_ports(ports_b, 0, 0, 0, 0, 0) /* UDP */); + ndpi_set_proto_defaults(ndpi_str, 0 /* encrypted */, 0 /* nw proto */, NDPI_PROTOCOL_ACCEPTABLE, NDPI_PROTOCOL_RADMIN, + "Radmin", NDPI_PROTOCOL_CATEGORY_REMOTE_ACCESS, + ndpi_build_default_ports(ports_a, 4899, 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" @@ -5877,6 +5881,9 @@ static int ndpi_callback_init(struct ndpi_detection_module_struct *ndpi_str) { /* STOMP */ init_stomp_dissector(ndpi_str, &a); + /* RDP */ + init_radmin_dissector(ndpi_str, &a); + #ifdef CUSTOM_NDPI_PROTOCOLS #include "../../../nDPI-custom/custom_ndpi_main_init.c" #endif diff --git a/src/lib/protocols/radmin.c b/src/lib/protocols/radmin.c new file mode 100644 index 000000000..4ecf12f1b --- /dev/null +++ b/src/lib/protocols/radmin.c @@ -0,0 +1,98 @@ +/* + * radmin.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_RADMIN + +#include "ndpi_api.h" +#include "ndpi_private.h" + +static void ndpi_int_radmin_add_connection(struct ndpi_detection_module_struct *ndpi_struct, + struct ndpi_flow_struct *flow) +{ + NDPI_LOG_INFO(ndpi_struct, "found Radmin\n"); + ndpi_set_detected_protocol(ndpi_struct, flow, + NDPI_PROTOCOL_RADMIN, NDPI_PROTOCOL_UNKNOWN, + NDPI_CONFIDENCE_DPI); + ndpi_set_risk(ndpi_struct, flow, NDPI_DESKTOP_OR_FILE_SHARING_SESSION, "Found Radmin"); +} + +static void ndpi_search_radmin(struct ndpi_detection_module_struct *ndpi_struct, + struct ndpi_flow_struct *flow) +{ + struct ndpi_packet_struct const * const packet = &ndpi_struct->packet; + + if (current_pkt_from_client_to_server(ndpi_struct, flow) && packet->payload_packet_len == 10 && + !flow->l4.tcp.radmin_stage) + { + if (ntohl(get_u_int32_t(packet->payload, 0)) == 0x1000000 && + packet->payload[4] == 1 && + ntohs(get_u_int16_t(packet->payload, 8) == 0x808)) + { + flow->l4.tcp.radmin_stage = 1; + return; + } + } + + if (current_pkt_from_server_to_client(ndpi_struct, flow) && packet->payload_packet_len == 46 && + flow->l4.tcp.radmin_stage) + { + if (ntohl(get_u_int32_t(packet->payload, 0)) == 0x1000000 && + packet->payload[4] == 0x25 && + ntohl(get_u_int32_t(packet->payload, 7)) == 0x2120802 && + packet->payload[13] == 0x0A) + { + ndpi_int_radmin_add_connection(ndpi_struct, flow); + return; + } + } + + if (packet->payload_packet_len == 14 && + ntohl(get_u_int32_t(packet->payload, 0)) == 0x1000000 && + packet->payload[4] == 5 && + ntohs(get_u_int16_t(packet->payload, 8)) == 0x2727) + { + if (!flow->l4.tcp.radmin_stage) { + flow->l4.tcp.radmin_stage = 1; + return; + } + + ndpi_int_radmin_add_connection(ndpi_struct, flow); + return; + } + + NDPI_EXCLUDE_PROTO(ndpi_struct, flow); +} + +void init_radmin_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id) +{ + ndpi_set_bitmask_protocol_detection("Radmin", ndpi_struct, *id, + NDPI_PROTOCOL_RADMIN, + ndpi_search_radmin, + NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION, + SAVE_DETECTION_BITMASK_AS_UNKNOWN, + ADD_TO_DETECTION_BITMASK); + *id += 1; +} |