diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/include/ndpi_private.h | 2 | ||||
| -rw-r--r-- | src/include/ndpi_protocol_ids.h | 1 | ||||
| -rw-r--r-- | src/lib/ndpi_main.c | 7 | ||||
| -rw-r--r-- | src/lib/protocols/msdo.c | 77 |
4 files changed, 86 insertions, 1 deletions
diff --git a/src/include/ndpi_private.h b/src/include/ndpi_private.h index 815d193ce..0ec33498b 100644 --- a/src/include/ndpi_private.h +++ b/src/include/ndpi_private.h @@ -1022,7 +1022,7 @@ void init_paltalk_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_ void init_dicom_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id); void init_lagofast_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id); void init_gearup_booster_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id); - +void init_msdo_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id); #ifdef CUSTOM_NDPI_PROTOCOLS #include "../../../nDPI-custom/custom_ndpi_private.h" diff --git a/src/include/ndpi_protocol_ids.h b/src/include/ndpi_protocol_ids.h index 51acbeb44..6af533514 100644 --- a/src/include/ndpi_protocol_ids.h +++ b/src/include/ndpi_protocol_ids.h @@ -476,6 +476,7 @@ typedef enum { NDPI_PROTOCOL_GEARUP_BOOSTER = 445, NDPI_PROTOCOL_LLM = 446, /* Large Language Models */ NDPI_PROTOCOL_UBIQUITY = 447, + NDPI_PROTOCOL_MSDO = 448, #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 cc5849df5..b4b25c54e 100644 --- a/src/lib/ndpi_main.c +++ b/src/lib/ndpi_main.c @@ -2480,6 +2480,10 @@ static void ndpi_init_protocol_defaults(struct ndpi_detection_module_struct *ndp "GearUP_Booster", NDPI_PROTOCOL_CATEGORY_VPN, NDPI_PROTOCOL_QOE_CATEGORY_ONLINE_GAMING, 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_SAFE, NDPI_PROTOCOL_MSDO, + "MSDO", NDPI_PROTOCOL_CATEGORY_SW_UPDATE, NDPI_PROTOCOL_QOE_CATEGORY_UNSPECIFIED, + ndpi_build_default_ports(ports_a, 7680, 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" @@ -6531,6 +6535,9 @@ static int ndpi_callback_init(struct ndpi_detection_module_struct *ndpi_str) { /* GearUP Booster */ init_gearup_booster_dissector(ndpi_str, &a); + /* Microsoft Delivery Optimization */ + init_msdo_dissector(ndpi_str, &a); + #ifdef CUSTOM_NDPI_PROTOCOLS #include "../../../nDPI-custom/custom_ndpi_main_init.c" #endif diff --git a/src/lib/protocols/msdo.c b/src/lib/protocols/msdo.c new file mode 100644 index 000000000..18aa370a1 --- /dev/null +++ b/src/lib/protocols/msdo.c @@ -0,0 +1,77 @@ +/* + * msdo.c + * + * Microsoft Delivery Optimization + * + * Copyright (C) 2025 - ntop.org + * Copyright (C) 2025 - V.G <v.gavrilov@securitycode.ru> + * + * 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_MSDO + +#include "ndpi_api.h" +#include "ndpi_private.h" + +static void ndpi_int_msdo_add_connection(struct ndpi_detection_module_struct * const ndpi_struct, + struct ndpi_flow_struct * const flow) +{ + NDPI_LOG_INFO(ndpi_struct, "found Microsoft Delivery Optimization protocol\n"); + ndpi_set_detected_protocol(ndpi_struct, flow, + NDPI_PROTOCOL_MSDO, + NDPI_PROTOCOL_UNKNOWN, + NDPI_CONFIDENCE_DPI); +} + +static void ndpi_search_msdo(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 Microsoft Delivery Optimization protocol\n"); + + /* + * Usually the handshake starts with 0x0E and the string "Swarm protocol" at the start of the payload, + * but this may vary. + */ + if (packet->payload_packet_len > 16 && packet->payload[0] == 0x0E) + { + if (memcmp(&packet->payload[1], "Swarm protocol", NDPI_STATICSTRING_LEN("Swarm protocol")) == 0) + { + ndpi_int_msdo_add_connection(ndpi_struct, flow); + return; + } + } + + NDPI_EXCLUDE_PROTO(ndpi_struct, flow); +} + + +void init_msdo_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id) +{ + ndpi_set_bitmask_protocol_detection("MSDO", ndpi_struct, *id, + NDPI_PROTOCOL_MSDO, + ndpi_search_msdo, + NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION, + SAVE_DETECTION_BITMASK_AS_UNKNOWN, + ADD_TO_DETECTION_BITMASK); + + *id += 1; +} |