From 1e1cfb89d23c7759f0f84dede7eef9f070f0231d Mon Sep 17 00:00:00 2001 From: Luca Deri Date: Wed, 12 Jan 2022 21:48:39 +0100 Subject: [PATCH] Added EthernetIP dissector --- src/include/ndpi_protocol_ids.h | 1 + src/lib/ndpi_main.c | 4 ++ src/lib/protocols/ethernet_ip.c | 71 +++++++++++++++++++++++++++++++ tests/pcap/ethernetIP.pcap | Bin 0 -> 19008 bytes tests/result/ethernetIP.pcap.out | 11 +++++ 5 files changed, 87 insertions(+) create mode 100644 src/lib/protocols/ethernet_ip.c create mode 100644 tests/pcap/ethernetIP.pcap create mode 100644 tests/result/ethernetIP.pcap.out diff --git a/src/include/ndpi_protocol_ids.h b/src/include/ndpi_protocol_ids.h index e5c4e06f5..d825ade52 100644 --- a/src/include/ndpi_protocol_ids.h +++ b/src/include/ndpi_protocol_ids.h @@ -306,6 +306,7 @@ typedef enum { NDPI_PROTOCOL_CRASHLYSTICS = 275, NDPI_PROTOCOL_MICROSOFT_AZURE = 276, NDPI_PROTOCOL_ICLOUD_PRIVATE_RELAY = 277, + NDPI_PROTOCOL_ETHERNET_IP = 278, #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 b6e346d14..cbd875eef 100644 --- a/src/lib/ndpi_main.c +++ b/src/lib/ndpi_main.c @@ -1449,6 +1449,10 @@ static void ndpi_init_protocol_defaults(struct ndpi_detection_module_struct *ndp "WSD", NDPI_PROTOCOL_CATEGORY_NETWORK, ndpi_build_default_ports(ports_a, 0, 0, 0, 0, 0) /* TCP */, ndpi_build_default_ports(ports_b, 3702, 0, 0, 0, 0) /* UDP */); + ndpi_set_proto_defaults(ndpi_str, 1 /* cleartext */, NDPI_PROTOCOL_ACCEPTABLE, NDPI_PROTOCOL_ETHERNET_IP, + "EthernetIP", NDPI_PROTOCOL_CATEGORY_NETWORK, + ndpi_build_default_ports(ports_a, 44818, 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 */, NDPI_PROTOCOL_ACCEPTABLE, NDPI_PROTOCOL_TELEGRAM, "Telegram", NDPI_PROTOCOL_CATEGORY_CHAT, ndpi_build_default_ports(ports_a, 0, 0, 0, 0, 0) /* TCP */, diff --git a/src/lib/protocols/ethernet_ip.c b/src/lib/protocols/ethernet_ip.c new file mode 100644 index 000000000..b11a05d95 --- /dev/null +++ b/src/lib/protocols/ethernet_ip.c @@ -0,0 +1,71 @@ +/* + * zmq.c + * + * Copyright (C) 2016-22 - ntop.org + * + * nDPI is free software: you can zmqtribute 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 . + * + */ + +#include "ndpi_protocol_ids.h" + +#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_ETHERNET_IP + +#include "ndpi_api.h" + +static void ndpi_int_ethernet_ip_add_connection(struct ndpi_detection_module_struct + *ndpi_struct, struct ndpi_flow_struct *flow) { + ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_ETHERNET_IP, + NDPI_PROTOCOL_UNKNOWN, NDPI_CONFIDENCE_DPI); +} + + +void ndpi_search_ethernet_ip(struct ndpi_detection_module_struct *ndpi_struct, + struct ndpi_flow_struct *flow) { + struct ndpi_packet_struct *packet = &ndpi_struct->packet; + + NDPI_LOG_DBG(ndpi_struct, "search for ETHERNET_IP\n"); + + if(packet->tcp != NULL) { + NDPI_LOG_DBG2(ndpi_struct, "calculating ETHERNET_IP over tcp\n"); + + if(packet->payload_packet_len >= 24) { + u_int16_t eth_ip_port = ntohs(44818); + + if((packet->tcp->source == eth_ip_port) || (packet->tcp->dest == eth_ip_port)) { + u_int16_t len = *((u_int16_t*)&packet->payload[2]); /* Little endian */ + + if((len+24) == packet->payload_packet_len) { + NDPI_LOG_INFO(ndpi_struct, "found ethernet_ip\n"); + ndpi_int_ethernet_ip_add_connection(ndpi_struct, flow); + return; + } + } + } + } + + NDPI_EXCLUDE_PROTO(ndpi_struct, flow); /* No luck this time */ +} + + +void init_ethernet_ip_dissector(struct ndpi_detection_module_struct *ndpi_struct, + u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) { + ndpi_set_bitmask_protocol_detection("EthernetIP", ndpi_struct, detection_bitmask, *id, + NDPI_PROTOCOL_ETHERNET_IP, + ndpi_search_ethernet_ip, + NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION, + SAVE_DETECTION_BITMASK_AS_UNKNOWN, + ADD_TO_DETECTION_BITMASK); + *id += 1; +} diff --git a/tests/pcap/ethernetIP.pcap b/tests/pcap/ethernetIP.pcap new file mode 100644 index 0000000000000000000000000000000000000000..6eb10fd9c47066612c80d977eeba29c524bca55e GIT binary patch literal 19008 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 gY9fPSdmvumOEBKu>?f#@9*p7mx|#2PLtYIsgCw literal 0 HcmV?d00001 diff --git a/tests/result/ethernetIP.pcap.out b/tests/result/ethernetIP.pcap.out new file mode 100644 index 000000000..50f7bd1b8 --- /dev/null +++ b/tests/result/ethernetIP.pcap.out @@ -0,0 +1,11 @@ +Guessed flow protos: 4 + +DPI Packets (TCP): 100 (25.00 pkts/flow) +Confidence Match by port : 4 (flows) + +EthernetIP 100 17384 4 + + 1 TCP 141.81.0.10:50275 <-> 141.81.0.83:44818 [proto: 278/EthernetIP][ClearText][Confidence: Match by port][cat: Network/14][12 pkts/2716 bytes <-> 16 pkts/2580 bytes][Goodput ratio: 76/66][0.70 sec][bytes ratio: 0.026 (Mixed)][IAT c2s/s2c min/avg/max/stddev: 0/0 72/38 231/232 96/75][Pkt Len c2s/s2c min/avg/max/stddev: 54/60 226/161 1258/406 330/99][PLAIN TEXT (99999999359)][Plen Bins: 0,20,45,0,10,0,0,5,0,5,0,5,5,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,5,0,0,0,0,0,0,0,0,0,0] + 2 TCP 141.81.0.63:44818 <-> 141.81.0.10:52593 [proto: 278/EthernetIP][ClearText][Confidence: Match by port][cat: Network/14][16 pkts/2150 bytes <-> 13 pkts/2566 bytes][Goodput ratio: 58/73][0.78 sec][bytes ratio: -0.088 (Mixed)][IAT c2s/s2c min/avg/max/stddev: 0/1 30/60 190/197 55/74][Pkt Len c2s/s2c min/avg/max/stddev: 60/54 134/197 406/528 92/158][PLAIN TEXT (99999999356)][Plen Bins: 0,15,43,0,5,0,10,5,0,0,5,5,5,0,5,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0] + 3 TCP 141.81.0.10:52594 <-> 141.81.0.43:44818 [proto: 278/EthernetIP][ClearText][Confidence: Match by port][cat: Network/14][9 pkts/1978 bytes <-> 12 pkts/1784 bytes][Goodput ratio: 75/62][0.66 sec][bytes ratio: 0.052 (Mixed)][IAT c2s/s2c min/avg/max/stddev: 1/0 61/33 196/185 73/56][Pkt Len c2s/s2c min/avg/max/stddev: 54/60 220/149 528/406 163/113][PLAIN TEXT (rWKIm.)][Plen Bins: 0,14,35,0,7,0,14,0,0,7,0,7,7,0,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0] + 4 TCP 141.81.0.10:62717 <-> 141.81.0.23:44818 [proto: 278/EthernetIP][ClearText][Confidence: Match by port][cat: Network/14][11 pkts/2132 bytes <-> 11 pkts/1478 bytes][Goodput ratio: 72/58][0.65 sec][bytes ratio: 0.181 (Mixed)][IAT c2s/s2c min/avg/max/stddev: 0/0 52/48 202/242 68/82][Pkt Len c2s/s2c min/avg/max/stddev: 54/60 194/134 528/406 156/96][PLAIN TEXT (DISABLE)][Plen Bins: 0,20,41,0,6,0,13,0,0,0,0,6,6,0,6,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0]