diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/include/ndpi_protocol_ids.h | 2 | ||||
| -rw-r--r-- | src/lib/ndpi_main.c | 6 | ||||
| -rw-r--r-- | src/lib/protocols/cpha.c | 64 | ||||
| -rw-r--r-- | src/lib/protocols/dhcp.c | 2 |
4 files changed, 69 insertions, 5 deletions
diff --git a/src/include/ndpi_protocol_ids.h b/src/include/ndpi_protocol_ids.h index 60de4dcab..d2d9feb22 100644 --- a/src/include/ndpi_protocol_ids.h +++ b/src/include/ndpi_protocol_ids.h @@ -82,7 +82,7 @@ typedef enum { NDPI_PROTOCOL_RTSP = 50, NDPI_PROTOCOL_MAIL_IMAPS = 51, NDPI_PROTOCOL_ICECAST = 52, - NDPI_PROTOCOL_FREE_53 = 53, + NDPI_PROTOCOL_CPHA = 53, NDPI_PROTOCOL_PPSTREAM = 54, NDPI_PROTOCOL_ZATTOO = 55, NDPI_PROTOCOL_SHOUTCAST = 56, diff --git a/src/lib/ndpi_main.c b/src/lib/ndpi_main.c index 8e5e2631f..8dce01814 100644 --- a/src/lib/ndpi_main.c +++ b/src/lib/ndpi_main.c @@ -899,10 +899,10 @@ static void ndpi_init_protocol_defaults(struct ndpi_detection_module_struct *ndp no_master, no_master, "IceCast", NDPI_PROTOCOL_CATEGORY_MEDIA, 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, NDPI_PROTOCOL_FUN, NDPI_PROTOCOL_FREE_53, 0 /* can_have_a_subprotocol */, - no_master, no_master, "FREE53", NDPI_PROTOCOL_CATEGORY_MEDIA, + ndpi_set_proto_defaults(ndpi_str, NDPI_PROTOCOL_FUN, NDPI_PROTOCOL_CPHA, 0 /* can_have_a_subprotocol */, + no_master, no_master, "CPHA", 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_build_default_ports(ports_b, 8116, 0, 0, 0, 0) /* UDP */); ndpi_set_proto_defaults(ndpi_str, NDPI_PROTOCOL_FUN, NDPI_PROTOCOL_PPSTREAM, 0 /* can_have_a_subprotocol */, no_master, no_master, "PPStream", NDPI_PROTOCOL_CATEGORY_MEDIA, ndpi_build_default_ports(ports_a, 0, 0, 0, 0, 0) /* TCP */, diff --git a/src/lib/protocols/cpha.c b/src/lib/protocols/cpha.c new file mode 100644 index 000000000..e8d8c4e6e --- /dev/null +++ b/src/lib/protocols/cpha.c @@ -0,0 +1,64 @@ +/* + * qq.c + * + * Copyright (C) 2011-20 - 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" + +/* CPHA - CheckPoint High Availability Protocol */ + +#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_CPHA + +#include "ndpi_api.h" + + +void ndpi_search_cpha(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow) { + struct ndpi_packet_struct *packet = &flow->packet; + const u_int16_t cpha_port = htons(8116); + + NDPI_LOG_DBG(ndpi_struct, "search CPHA\n"); + + if((packet->payload_packet_len > 20) + && (packet->payload[0] == 0x1a) + && (packet->payload[1] == 0x90) + && packet->udp + && packet->iph + && (packet->udp->source == cpha_port) + && (packet->udp->dest == cpha_port) + && packet->iph->saddr == 0 /* 0.0.0.0 */ + ) { + ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_CPHA, NDPI_PROTOCOL_UNKNOWN); + } else + NDPI_EXCLUDE_PROTO(ndpi_struct, flow); +} + + +void init_cpha_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, + NDPI_PROTOCOL_BITMASK *detection_bitmask) { + ndpi_set_bitmask_protocol_detection("CPHA", ndpi_struct, detection_bitmask, *id, + NDPI_PROTOCOL_CPHA, + ndpi_search_cpha, + NDPI_SELECTION_BITMASK_PROTOCOL_UDP_WITH_PAYLOAD, + SAVE_DETECTION_BITMASK_AS_UNKNOWN, + ADD_TO_DETECTION_BITMASK); + + *id += 1; +} diff --git a/src/lib/protocols/dhcp.c b/src/lib/protocols/dhcp.c index 5bf2a122c..1d7f4c36e 100644 --- a/src/lib/protocols/dhcp.c +++ b/src/lib/protocols/dhcp.c @@ -66,7 +66,7 @@ void ndpi_search_dhcp_udp(struct ndpi_detection_module_struct *ndpi_struct, stru /* this detection also works for asymmetric dhcp traffic */ - /*check standard DHCP 0.0.0.0:68 -> 255.255.255.255:67 */ + /* check standard DHCP 0.0.0.0:68 -> 255.255.255.255:67 */ if(packet->udp) { dhcp_packet_t *dhcp = (dhcp_packet_t*)packet->payload; |