diff options
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/ndpi_content_match.c.inc | 1 | ||||
| -rw-r--r-- | src/lib/ndpi_main.c | 7 | ||||
| -rw-r--r-- | src/lib/protocols/mumble.c | 73 |
3 files changed, 81 insertions, 0 deletions
diff --git a/src/lib/ndpi_content_match.c.inc b/src/lib/ndpi_content_match.c.inc index f9be668f9..a63df9bf0 100644 --- a/src/lib/ndpi_content_match.c.inc +++ b/src/lib/ndpi_content_match.c.inc @@ -1598,6 +1598,7 @@ static ndpi_protocol_match host_match[] = { "privateinternetaccess.com", "PrivateInternetAccess", NDPI_PROTOCOL_PIA, NDPI_PROTOCOL_CATEGORY_VPN, NDPI_PROTOCOL_ACCEPTABLE, NDPI_PROTOCOL_DEFAULT_LEVEL }, { "dota2.com", "Dota2", NDPI_PROTOCOL_DOTA2, NDPI_PROTOCOL_CATEGORY_GAME, NDPI_PROTOCOL_FUN, NDPI_PROTOCOL_DEFAULT_LEVEL }, + { "publist.mumble.info", "Mumble", NDPI_PROTOCOL_MUMBLE, NDPI_PROTOCOL_CATEGORY_VOIP, NDPI_PROTOCOL_FUN, NDPI_PROTOCOL_DEFAULT_LEVEL }, #ifdef CUSTOM_NDPI_PROTOCOLS #include "../../../nDPI-custom/custom_ndpi_content_match_host_match.c.inc" diff --git a/src/lib/ndpi_main.c b/src/lib/ndpi_main.c index 61c01ee5c..2d3eaf261 100644 --- a/src/lib/ndpi_main.c +++ b/src/lib/ndpi_main.c @@ -2210,6 +2210,10 @@ static void ndpi_init_protocol_defaults(struct ndpi_detection_module_struct *ndp "KCP", NDPI_PROTOCOL_CATEGORY_NETWORK, 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, 0 /* encrypted */, 0 /* nw proto */, NDPI_PROTOCOL_FUN, NDPI_PROTOCOL_MUMBLE, + "Mumble", NDPI_PROTOCOL_CATEGORY_VOIP, + 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" @@ -5865,6 +5869,9 @@ static int ndpi_callback_init(struct ndpi_detection_module_struct *ndpi_str) { /* KCP */ init_kcp_dissector(ndpi_str, &a); + /* Mumble */ + init_mumble_dissector(ndpi_str, &a); + #ifdef CUSTOM_NDPI_PROTOCOLS #include "../../../nDPI-custom/custom_ndpi_main_init.c" #endif diff --git a/src/lib/protocols/mumble.c b/src/lib/protocols/mumble.c new file mode 100644 index 000000000..ed9dbd8a4 --- /dev/null +++ b/src/lib/protocols/mumble.c @@ -0,0 +1,73 @@ +/* + * mumble.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_MUMBLE + +#include "ndpi_api.h" +#include "ndpi_private.h" + +static void ndpi_search_mumble(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 == 12) + { + if (get_u_int32_t(packet->payload, 0) == 0) { + flow->l4.udp.mumble_stage = 1; + flow->l4.udp.mumble_ident = ndpi_ntohll(get_u_int64_t(packet->payload, 4)); + return; + } + goto not_mumble; + } + + if (flow->l4.udp.mumble_stage == 1 && packet->payload_packet_len == 24) { + if (ndpi_ntohll(get_u_int64_t(packet->payload, 4)) == flow->l4.udp.mumble_ident) { + NDPI_LOG_INFO(ndpi_struct, "found Mumble\n"); + ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_MUMBLE, + NDPI_PROTOCOL_UNKNOWN, NDPI_CONFIDENCE_DPI); + return; + } + goto not_mumble; + } + +not_mumble: + NDPI_EXCLUDE_PROTO(ndpi_struct, flow); +} + +void init_mumble_dissector(struct ndpi_detection_module_struct *ndpi_struct, + u_int32_t *id) +{ + ndpi_set_bitmask_protocol_detection("Mumble", ndpi_struct, *id, + NDPI_PROTOCOL_MUMBLE, + ndpi_search_mumble, + NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_UDP_WITH_PAYLOAD, + SAVE_DETECTION_BITMASK_AS_UNKNOWN, + ADD_TO_DETECTION_BITMASK); + + *id += 1; +} |