Add CAN over Ethernet dissector.

Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
This commit is contained in:
Toni Uhlig
2023-10-23 13:45:56 +02:00
committed by Ivan Nardi
parent 25c54dd6d7
commit a443bba0dd
155 changed files with 286 additions and 150 deletions
+1
View File
@@ -380,6 +380,7 @@ typedef enum {
NDPI_PROTOCOL_HTTP2 = 349,
NDPI_PROTOCOL_HAPROXY = 350,
NDPI_PROTOCOL_RMCP = 351,
NDPI_PROTOCOL_CAN = 352,
#ifdef CUSTOM_NDPI_PROTOCOLS
#include "../../../nDPI-custom/custom_ndpi_protocol_ids.h"
+1
View File
@@ -247,6 +247,7 @@ void init_slp_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int3
void init_http2_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id);
void init_haproxy_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id);
void init_rmcp_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id);
void init_can_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);
+7
View File
@@ -2163,6 +2163,10 @@ static void ndpi_init_protocol_defaults(struct ndpi_detection_module_struct *ndp
"RMCP", NDPI_PROTOCOL_CATEGORY_SYSTEM_OS,
ndpi_build_default_ports(ports_a, 0, 0, 0, 0, 0) /* TCP */,
ndpi_build_default_ports(ports_b, 623, 0, 0, 0, 0) /* UDP */);
ndpi_set_proto_defaults(ndpi_str, 1 /* cleartext */, 0 /* nw proto */, NDPI_PROTOCOL_SAFE, NDPI_PROTOCOL_CAN,
"Controller_Area_Network", NDPI_PROTOCOL_CATEGORY_SYSTEM_OS,
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"
@@ -5243,6 +5247,9 @@ static int ndpi_callback_init(struct ndpi_detection_module_struct *ndpi_str) {
/* RMCP */
init_rmcp_dissector(ndpi_str, &a);
/* Controller Area Network */
init_can_dissector(ndpi_str, &a);
#ifdef CUSTOM_NDPI_PROTOCOLS
#include "../../../nDPI-custom/custom_ndpi_main_init.c"
#endif
+84
View File
@@ -0,0 +1,84 @@
/*
* can.c
*
* Copyright (C) 2023 - 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_CAN
#include "ndpi_api.h"
PACK_ON
struct can_hdr {
uint64_t signature;
uint8_t version;
uint8_t frames;
} PACK_OFF;
static void ndpi_int_can_add_connection(struct ndpi_detection_module_struct *ndpi_struct,
struct ndpi_flow_struct *flow)
{
NDPI_LOG_INFO(ndpi_struct, "found Controller Area Network\n");
ndpi_set_detected_protocol(ndpi_struct, flow,
NDPI_PROTOCOL_CAN, NDPI_PROTOCOL_UNKNOWN,
NDPI_CONFIDENCE_DPI);
}
static void ndpi_search_can(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 Controller Area Network\n");
u_int64_t const signature = 0x49534f3131383938; // "ISO11898"
if (packet->payload_packet_len < sizeof(struct can_hdr)) {
NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
return;
}
struct can_hdr const * const can_header = (struct can_hdr *)packet->payload;
if (ndpi_ntohll(can_header->signature) != signature) {
NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
return;
}
ndpi_int_can_add_connection(ndpi_struct, flow);
if (can_header->version != 0x01) {
ndpi_set_risk(ndpi_struct, flow, NDPI_MALFORMED_PACKET, "Invalid CAN Header");
}
}
void init_can_dissector(struct ndpi_detection_module_struct *ndpi_struct,
u_int32_t *id)
{
ndpi_set_bitmask_protocol_detection("Controller_Area_Network", ndpi_struct, *id,
NDPI_PROTOCOL_CAN,
ndpi_search_can,
NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_OR_UDP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION,
SAVE_DETECTION_BITMASK_AS_UNKNOWN,
ADD_TO_DETECTION_BITMASK);
*id += 1;
}
+2 -1
View File
@@ -27,6 +27,7 @@
#include "ndpi_api.h"
PACK_ON
struct rmcp_header {
uint8_t version;
uint8_t reserved;
@@ -40,7 +41,7 @@ struct rmcp_header {
#else
#error "Missing endian macro definitions."
#endif
};
} PACK_OFF;
static void ndpi_int_rmcp_add_connection(struct ndpi_detection_module_struct *ndpi_struct,
struct ndpi_flow_struct *flow)