diff options
| author | Vladimir Gavrilov <105977161+0xA50C1A1@users.noreply.github.com> | 2023-12-16 15:30:21 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-16 13:30:21 +0100 |
| commit | 0f3e6d832b3df7f6eb5ded0296142f6f93537022 (patch) | |
| tree | 788dcb3e67ee27faef5c5f409229e9637b55c6b6 /src/lib | |
| parent | 8ea16ffd77d486cce4c4bb0d58d80b32d68a4f4f (diff) | |
Add PROFINET/IO protocol dissector (#2213)
* Add PROFINET/IO protocol dissector
* Add LE (Little Endian) to the file name
* Rework dissector
* Remove redundant check
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/ndpi_main.c | 17 | ||||
| -rw-r--r-- | src/lib/ndpi_private.h | 1 | ||||
| -rw-r--r-- | src/lib/protocols/dcerpc.c | 8 | ||||
| -rw-r--r-- | src/lib/protocols/profinet_io.c | 89 |
4 files changed, 110 insertions, 5 deletions
diff --git a/src/lib/ndpi_main.c b/src/lib/ndpi_main.c index 9c327aa09..1620f6a57 100644 --- a/src/lib/ndpi_main.c +++ b/src/lib/ndpi_main.c @@ -1510,7 +1510,7 @@ static void ndpi_init_protocol_defaults(struct ndpi_detection_module_struct *ndp 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_RPC, "RPC", NDPI_PROTOCOL_CATEGORY_RPC, - ndpi_build_default_ports(ports_a, 135, 0, 0, 0, 0) /* TCP */, + 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_NETFLOW, "NetFlow", NDPI_PROTOCOL_CATEGORY_NETWORK, @@ -2178,6 +2178,18 @@ static void ndpi_init_protocol_defaults(struct ndpi_detection_module_struct *ndp "Monero", NDPI_PROTOCOL_CATEGORY_CRYPTO_CURRENCY, 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_DCERPC, + "DCERPC", NDPI_PROTOCOL_CATEGORY_RPC, + ndpi_build_default_ports(ports_a, 135, 0, 0, 0, 0) /* TCP */, + ndpi_build_default_ports(ports_b, 135, 0, 0, 0, 0) /* UDP */); + ndpi_set_proto_subprotocols(ndpi_str, NDPI_PROTOCOL_DCERPC, + NDPI_PROTOCOL_PROFINET_IO, + NDPI_PROTOCOL_MATCHED_BY_CONTENT, + NDPI_PROTOCOL_NO_MORE_SUBPROTOCOLS); + ndpi_set_proto_defaults(ndpi_str, 1 /* cleartext */, 0 /* nw proto */, NDPI_PROTOCOL_ACCEPTABLE, NDPI_PROTOCOL_PROFINET_IO, + "PROFINET_IO", NDPI_PROTOCOL_CATEGORY_IOT_SCADA, + 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" @@ -5666,6 +5678,9 @@ static int ndpi_callback_init(struct ndpi_detection_module_struct *ndpi_str) { /* Monero Protocol */ init_monero_dissector(ndpi_str, &a); + /* PROFINET/IO */ + init_profinet_io_dissector(ndpi_str, &a); + #ifdef CUSTOM_NDPI_PROTOCOLS #include "../../../nDPI-custom/custom_ndpi_main_init.c" #endif diff --git a/src/lib/ndpi_private.h b/src/lib/ndpi_private.h index a14cfcd2d..7a4a0e705 100644 --- a/src/lib/ndpi_private.h +++ b/src/lib/ndpi_private.h @@ -634,6 +634,7 @@ void init_beckhoff_ads_dissector(struct ndpi_detection_module_struct *ndpi_struc void init_iso9506_1_mms_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id); void init_ieee_c37118_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id); void init_ethersbus_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id); +void init_profinet_io_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id); #endif diff --git a/src/lib/protocols/dcerpc.c b/src/lib/protocols/dcerpc.c index 14736f033..edf8125f6 100644 --- a/src/lib/protocols/dcerpc.c +++ b/src/lib/protocols/dcerpc.c @@ -23,7 +23,7 @@ #include "ndpi_protocol_ids.h" -#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_RPC +#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_DCERPC #include "ndpi_api.h" #include "ndpi_private.h" @@ -32,7 +32,7 @@ static void ndpi_int_dcerpc_add_connection(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow) { - ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_RPC, NDPI_PROTOCOL_UNKNOWN, NDPI_CONFIDENCE_DPI); + ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_DCERPC, NDPI_PROTOCOL_UNKNOWN, NDPI_CONFIDENCE_DPI); } static bool is_connection_oriented_dcerpc(struct ndpi_packet_struct *packet, struct ndpi_flow_struct *flow) @@ -96,8 +96,8 @@ static void ndpi_search_dcerpc(struct ndpi_detection_module_struct *ndpi_struct, void init_dcerpc_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id) { - ndpi_set_bitmask_protocol_detection("RPC", ndpi_struct, *id, - NDPI_PROTOCOL_RPC, + ndpi_set_bitmask_protocol_detection("DCERPC", ndpi_struct, *id, + NDPI_PROTOCOL_DCERPC, ndpi_search_dcerpc, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_OR_UDP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION, SAVE_DETECTION_BITMASK_AS_UNKNOWN, diff --git a/src/lib/protocols/profinet_io.c b/src/lib/protocols/profinet_io.c new file mode 100644 index 000000000..425a9374b --- /dev/null +++ b/src/lib/protocols/profinet_io.c @@ -0,0 +1,89 @@ +/* + * profinet_io.c + * + * Copyright (C) 2023 - ntop.org + * Copyright (C) 2023 - 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_PROFINET_IO + +#include "ndpi_api.h" +#include "ndpi_private.h" + +static void ndpi_int_profinet_io_add_connection(struct ndpi_detection_module_struct *ndpi_struct, + struct ndpi_flow_struct *flow) +{ + NDPI_LOG_INFO(ndpi_struct, "found PROFINET/IO\n"); + ndpi_set_detected_protocol(ndpi_struct, flow, + NDPI_PROTOCOL_PROFINET_IO, NDPI_PROTOCOL_DCERPC, + NDPI_CONFIDENCE_DPI); +} + +static void ndpi_search_profinet_io(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 PROFINET/IO\n"); + + /* PROFINET/IO is based on connectionless DCE/RPC */ + if ((flow->detected_protocol_stack[0] == NDPI_PROTOCOL_DCERPC) && + (packet->payload_packet_len > 43)) + { + u_int8_t byte_order = (packet->payload[4] >> 4) & 0xF; + u_int32_t time_low = 0; + u_int16_t time_mid = 0; + u_int16_t time_hi_and_version = 0; + + if (byte_order == 0) { /* Big Endian */ + time_low = ntohl(get_u_int32_t(packet->payload, 8)); + time_mid = ntohs(get_u_int16_t(packet->payload, 12)); + time_hi_and_version = ntohs(get_u_int16_t(packet->payload, 14)); + } else { /* Little Endian */ + time_low = le32toh(get_u_int32_t(packet->payload, 8)); + time_mid = le16toh(get_u_int16_t(packet->payload, 12)); + time_hi_and_version = le16toh(get_u_int16_t(packet->payload, 14)); + } + + if ((time_low == 0xDEA00000) && (time_mid == 0x6C97) && + (time_hi_and_version == 0x11D1)) + { + ndpi_int_profinet_io_add_connection(ndpi_struct, flow); + return; + } + } + + NDPI_EXCLUDE_PROTO(ndpi_struct, flow); +} + +void init_profinet_io_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id) +{ + ndpi_set_bitmask_protocol_detection("PROFINET_IO", ndpi_struct, *id, + NDPI_PROTOCOL_PROFINET_IO, + ndpi_search_profinet_io, + NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_UDP_WITH_PAYLOAD, + SAVE_DETECTION_BITMASK_AS_UNKNOWN, + ADD_TO_DETECTION_BITMASK + ); + + *id += 1; +} |