diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/include/ndpi_protocol_ids.h | 1 | ||||
| -rw-r--r-- | src/include/ndpi_protocols.h | 1 | ||||
| -rw-r--r-- | src/lib/ndpi_main.c | 7 | ||||
| -rw-r--r-- | src/lib/protocols/capnproto.c | 77 |
4 files changed, 86 insertions, 0 deletions
diff --git a/src/include/ndpi_protocol_ids.h b/src/include/ndpi_protocol_ids.h index 278a6714d..264244578 100644 --- a/src/include/ndpi_protocol_ids.h +++ b/src/include/ndpi_protocol_ids.h @@ -383,6 +383,7 @@ typedef enum { NDPI_PROTOCOL_CAN = 352, NDPI_PROTOCOL_PROTOBUF = 353, NDPI_PROTOCOL_ETHEREUM = 354, + NDPI_PROTOCOL_CAPNPROTO = 355, #ifdef CUSTOM_NDPI_PROTOCOLS #include "../../../nDPI-custom/custom_ndpi_protocol_ids.h" diff --git a/src/include/ndpi_protocols.h b/src/include/ndpi_protocols.h index da286f925..7a41fb021 100644 --- a/src/include/ndpi_protocols.h +++ b/src/include/ndpi_protocols.h @@ -250,6 +250,7 @@ void init_rmcp_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int void init_can_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id); void init_protobuf_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id); void init_ethereum_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id); +void init_capnproto_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id); /* ndpi_main.c */ extern u_int32_t ndpi_ip_port_hash_funct(u_int32_t ip, u_int16_t port); diff --git a/src/lib/ndpi_main.c b/src/lib/ndpi_main.c index 8f7cf7435..c227dcff4 100644 --- a/src/lib/ndpi_main.c +++ b/src/lib/ndpi_main.c @@ -2175,6 +2175,10 @@ static void ndpi_init_protocol_defaults(struct ndpi_detection_module_struct *ndp "ETHEREUM", NDPI_PROTOCOL_CATEGORY_CRYPTO_CURRENCY, ndpi_build_default_ports(ports_a, 30303, 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_CAPNPROTO, + "CapnProto", 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 */); #ifdef CUSTOM_NDPI_PROTOCOLS #include "../../../nDPI-custom/custom_ndpi_main.c" @@ -5434,6 +5438,9 @@ static int ndpi_callback_init(struct ndpi_detection_module_struct *ndpi_str) { /* ETHEREUM */ init_ethereum_dissector(ndpi_str, &a); + /* Cap'n Proto */ + init_capnproto_dissector(ndpi_str, &a); + #ifdef CUSTOM_NDPI_PROTOCOLS #include "../../../nDPI-custom/custom_ndpi_main_init.c" #endif diff --git a/src/lib/protocols/capnproto.c b/src/lib/protocols/capnproto.c new file mode 100644 index 000000000..e32483fa6 --- /dev/null +++ b/src/lib/protocols/capnproto.c @@ -0,0 +1,77 @@ +/* + * capnproto.c + * + * Copyright (C) 2023 by ntop.org + * + * 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_CAPNPROTO + +#include "ndpi_api.h" + +static void ndpi_int_capnproto_add_connection(struct ndpi_detection_module_struct *ndpi_struct, + struct ndpi_flow_struct *flow) +{ + NDPI_LOG_INFO(ndpi_struct, "found CapnProto\n"); + ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_CAPNPROTO, NDPI_PROTOCOL_UNKNOWN, NDPI_CONFIDENCE_DPI); +} + +static void ndpi_search_capnproto(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 CapnProto\n"); + +fprintf(stderr, "!!!!!!!!!!!!!!!!\n"); + if (packet->payload_packet_len < 4) { + NDPI_EXCLUDE_PROTO(ndpi_struct, flow); + return; + } + + const uint32_t segments = le32toh(get_u_int32_t(packet->payload, 0)); + const uint32_t segment_table_size = 4 * (segments + segments % 2); + + if (packet->payload_packet_len < segment_table_size) { + NDPI_EXCLUDE_PROTO(ndpi_struct, flow); + return; + } + + for (uint32_t i = 0; i <= segments; ++i) + { + fprintf(stderr, "___%u/%u___\n", i, segments); + } + + NDPI_EXCLUDE_PROTO(ndpi_struct, flow); +} + + +void init_capnproto_dissector(struct ndpi_detection_module_struct *ndpi_struct, + u_int32_t *id) +{ + ndpi_set_bitmask_protocol_detection("CapnProto", ndpi_struct, *id, + NDPI_PROTOCOL_CAPNPROTO, + ndpi_search_capnproto, + NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_OR_UDP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION, + SAVE_DETECTION_BITMASK_AS_UNKNOWN, + ADD_TO_DETECTION_BITMASK); + *id += 1; +} |