From 6195dbad76a5a63fdcce477bbfeaa41ce73028f3 Mon Sep 17 00:00:00 2001 From: Luca Deri Date: Tue, 7 May 2024 09:05:15 +0200 Subject: Renamed radius source file to avoid name clashes on Windows --- src/lib/protocols/radius.c | 86 ---------------------------------------- src/lib/protocols/radius_proto.c | 86 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 86 insertions(+), 86 deletions(-) delete mode 100644 src/lib/protocols/radius.c create mode 100644 src/lib/protocols/radius_proto.c (limited to 'src/lib/protocols') diff --git a/src/lib/protocols/radius.c b/src/lib/protocols/radius.c deleted file mode 100644 index 97a6c14c9..000000000 --- a/src/lib/protocols/radius.c +++ /dev/null @@ -1,86 +0,0 @@ -/* - * radius.c - * - * Copyright (C) 2012-22 - ntop.org - * - * 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 . - * - */ - -#include "ndpi_protocol_ids.h" - -#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_RADIUS - -#include "ndpi_api.h" -#include "ndpi_private.h" - -#define RADIUS_PORT 1812 -#define RADIUS_PORT_ACC 1813 -#define RADIUS_PORT_ACC_ALTERNATIVE 18013 - - -struct radius_header { - u_int8_t code; - u_int8_t packet_id; - u_int16_t len; -}; - -static void ndpi_check_radius(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow) -{ - struct ndpi_packet_struct *packet = &ndpi_struct->packet; - // const u_int8_t *packet_payload = packet->payload; - u_int32_t payload_len = packet->payload_packet_len; - - if((packet->udp->dest == htons(RADIUS_PORT) || packet->udp->source == htons(RADIUS_PORT) || - packet->udp->dest == htons(RADIUS_PORT_ACC) || packet->udp->source == htons(RADIUS_PORT_ACC) || - packet->udp->dest == htons(RADIUS_PORT_ACC_ALTERNATIVE) || packet->udp->source == htons(RADIUS_PORT_ACC_ALTERNATIVE))) { - struct radius_header *h = (struct radius_header*)packet->payload; - /* RFC2865: The minimum length is 20 and maximum length is 4096. */ - if((payload_len < 20) || (payload_len > 4096)) { - NDPI_EXCLUDE_PROTO(ndpi_struct, flow); - return; - } - - if((h->code > 0) - && (h->code <= 13) - && (ntohs(h->len) == payload_len)) { - NDPI_LOG_INFO(ndpi_struct, "Found radius\n"); - ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_RADIUS, NDPI_PROTOCOL_UNKNOWN, NDPI_CONFIDENCE_DPI); - return; - } - } - if(flow->packet_counter > 3) - NDPI_EXCLUDE_PROTO(ndpi_struct, flow); - return; -} - -static void ndpi_search_radius(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow) -{ - NDPI_LOG_DBG(ndpi_struct, "search radius\n"); - - ndpi_check_radius(ndpi_struct, flow); -} - - -void init_radius_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id) -{ - ndpi_set_bitmask_protocol_detection("Radius", ndpi_struct, *id, - NDPI_PROTOCOL_RADIUS, - ndpi_search_radius, - NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_UDP_WITH_PAYLOAD, - SAVE_DETECTION_BITMASK_AS_UNKNOWN, - ADD_TO_DETECTION_BITMASK); - - *id += 1; -} diff --git a/src/lib/protocols/radius_proto.c b/src/lib/protocols/radius_proto.c new file mode 100644 index 000000000..00bbcad04 --- /dev/null +++ b/src/lib/protocols/radius_proto.c @@ -0,0 +1,86 @@ +/* + * radius_proto.c + * + * Copyright (C) 2012-24 - ntop.org + * + * 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 . + * + */ + +#include "ndpi_protocol_ids.h" + +#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_RADIUS + +#include "ndpi_api.h" +#include "ndpi_private.h" + +#define RADIUS_PORT 1812 +#define RADIUS_PORT_ACC 1813 +#define RADIUS_PORT_ACC_ALTERNATIVE 18013 + + +struct radius_header { + u_int8_t code; + u_int8_t packet_id; + u_int16_t len; +}; + +static void ndpi_check_radius(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow) +{ + struct ndpi_packet_struct *packet = &ndpi_struct->packet; + // const u_int8_t *packet_payload = packet->payload; + u_int32_t payload_len = packet->payload_packet_len; + + if((packet->udp->dest == htons(RADIUS_PORT) || packet->udp->source == htons(RADIUS_PORT) || + packet->udp->dest == htons(RADIUS_PORT_ACC) || packet->udp->source == htons(RADIUS_PORT_ACC) || + packet->udp->dest == htons(RADIUS_PORT_ACC_ALTERNATIVE) || packet->udp->source == htons(RADIUS_PORT_ACC_ALTERNATIVE))) { + struct radius_header *h = (struct radius_header*)packet->payload; + /* RFC2865: The minimum length is 20 and maximum length is 4096. */ + if((payload_len < 20) || (payload_len > 4096)) { + NDPI_EXCLUDE_PROTO(ndpi_struct, flow); + return; + } + + if((h->code > 0) + && (h->code <= 13) + && (ntohs(h->len) == payload_len)) { + NDPI_LOG_INFO(ndpi_struct, "Found radius\n"); + ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_RADIUS, NDPI_PROTOCOL_UNKNOWN, NDPI_CONFIDENCE_DPI); + return; + } + } + if(flow->packet_counter > 3) + NDPI_EXCLUDE_PROTO(ndpi_struct, flow); + return; +} + +static void ndpi_search_radius(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow) +{ + NDPI_LOG_DBG(ndpi_struct, "search radius\n"); + + ndpi_check_radius(ndpi_struct, flow); +} + + +void init_radius_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id) +{ + ndpi_set_bitmask_protocol_detection("Radius", ndpi_struct, *id, + NDPI_PROTOCOL_RADIUS, + ndpi_search_radius, + NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_UDP_WITH_PAYLOAD, + SAVE_DETECTION_BITMASK_AS_UNKNOWN, + ADD_TO_DETECTION_BITMASK); + + *id += 1; +} -- cgit v1.2.3