diff options
| author | Vladimir Gavrilov <105977161+0xA50C1A1@users.noreply.github.com> | 2023-12-18 13:21:07 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-18 11:21:07 +0100 |
| commit | 59c8eabc0ea00e15e06fd4884290f7e3a8095588 (patch) | |
| tree | 6bcbbcadcaa6856f98e499845d63d0cfaba69f3e /src | |
| parent | d8c7a7661150889c372dccef1388921a4bb46f97 (diff) | |
Add UFTP protocol dissector (#2215)
* Add UFTP protocol dissector
* Update docs
* Merge pcap files
Diffstat (limited to 'src')
| -rw-r--r-- | src/include/ndpi_protocol_ids.h | 1 | ||||
| -rw-r--r-- | src/lib/ndpi_main.c | 7 | ||||
| -rw-r--r-- | src/lib/ndpi_private.h | 1 | ||||
| -rw-r--r-- | src/lib/protocols/uftp.c | 70 |
4 files changed, 79 insertions, 0 deletions
diff --git a/src/include/ndpi_protocol_ids.h b/src/include/ndpi_protocol_ids.h index a5dcf04c7..12e9a88dd 100644 --- a/src/include/ndpi_protocol_ids.h +++ b/src/include/ndpi_protocol_ids.h @@ -401,6 +401,7 @@ typedef enum { NDPI_PROTOCOL_DCERPC = 370, NDPI_PROTOCOL_PROFINET_IO = 371, NDPI_PROTOCOL_HISLIP = 372, + NDPI_PROTOCOL_UFTP = 373, #ifdef CUSTOM_NDPI_PROTOCOLS #include "../../../nDPI-custom/custom_ndpi_protocol_ids.h" diff --git a/src/lib/ndpi_main.c b/src/lib/ndpi_main.c index 39c33a77a..942dfb46b 100644 --- a/src/lib/ndpi_main.c +++ b/src/lib/ndpi_main.c @@ -2194,6 +2194,10 @@ static void ndpi_init_protocol_defaults(struct ndpi_detection_module_struct *ndp "HiSLIP", NDPI_PROTOCOL_CATEGORY_IOT_SCADA, ndpi_build_default_ports(ports_a, 4880, 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_UFTP, + "UFTP", NDPI_PROTOCOL_CATEGORY_DOWNLOAD_FT, + ndpi_build_default_ports(ports_a, 0, 0, 0, 0, 0) /* TCP */, + ndpi_build_default_ports(ports_b, 1044, 0, 0, 0, 0) /* UDP */); #ifdef CUSTOM_NDPI_PROTOCOLS #include "../../../nDPI-custom/custom_ndpi_main.c" @@ -5688,6 +5692,9 @@ static int ndpi_callback_init(struct ndpi_detection_module_struct *ndpi_str) { /* HiSLIP */ init_hislip_dissector(ndpi_str, &a); + /* UFTP */ + init_uftp_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 4b457bb28..67978934d 100644 --- a/src/lib/ndpi_private.h +++ b/src/lib/ndpi_private.h @@ -636,6 +636,7 @@ void init_ieee_c37118_dissector(struct ndpi_detection_module_struct *ndpi_struct 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); void init_hislip_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id); +void init_uftp_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id); #endif diff --git a/src/lib/protocols/uftp.c b/src/lib/protocols/uftp.c new file mode 100644 index 000000000..3b4154e23 --- /dev/null +++ b/src/lib/protocols/uftp.c @@ -0,0 +1,70 @@ +/* + * uftp.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_UFTP + +#include "ndpi_api.h" +#include "ndpi_private.h" + +static void ndpi_int_uftp_add_connection(struct ndpi_detection_module_struct *ndpi_struct, + struct ndpi_flow_struct *flow) +{ + NDPI_LOG_INFO(ndpi_struct, "found UFTP\n"); + ndpi_set_detected_protocol(ndpi_struct, flow, + NDPI_PROTOCOL_UFTP, NDPI_PROTOCOL_UNKNOWN, + NDPI_CONFIDENCE_DPI); +} + +static void ndpi_search_uftp(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, "search UFTP\n"); + + if ((packet->payload_packet_len > 23) && + ((packet->payload[0] == 0x40) || (packet->payload[0] == 0x50)) && + (packet->payload[1] < 22) && (packet->payload[15] == 0) && + (packet->payload[16] == packet->payload[1])) + { + ndpi_int_uftp_add_connection(ndpi_struct, flow); + return; + } + + NDPI_EXCLUDE_PROTO(ndpi_struct, flow); +} + +void init_uftp_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id) +{ + ndpi_set_bitmask_protocol_detection("UFTP", ndpi_struct, *id, + NDPI_PROTOCOL_UFTP, + ndpi_search_uftp, + NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_UDP_WITH_PAYLOAD, + SAVE_DETECTION_BITMASK_AS_UNKNOWN, + ADD_TO_DETECTION_BITMASK); + + *id += 1; +} |