From: Alan T. DeKok <aland@freeradius.org>
Date: Wed, 21 Jun 2017 13:52:00 +0000 (-0400)
Subject: extend cleanup_delay when receiving a duplicate packet
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=16f4cfba05ebbe7b2e7d5c909de3cc7935d948b8;p=thirdparty%2Ffreeradius-server.git

extend cleanup_delay when receiving a duplicate packet
---

diff --git a/src/modules/proto_radius/proto_radius_udp.c b/src/modules/proto_radius/proto_radius_udp.c
index b4ab3040523..88a94de765d 100644
--- a/src/modules/proto_radius/proto_radius_udp.c
+++ b/src/modules/proto_radius/proto_radius_udp.c
@@ -89,6 +89,16 @@ static const CONF_PARSER udp_listen_config[] = {
 	CONF_PARSER_TERMINATOR
 };
 
+
+static void mod_cleanup_delay(UNUSED fr_event_list_t *el, UNUSED struct timeval *now, void *uctx)
+{
+	fr_tracking_entry_t *track = uctx;
+	// proto_radius_udp_t const *inst = talloc_parent(track->ft);
+
+	(void) fr_radius_tracking_entry_delete(track->ft, track);
+}
+
+
 static ssize_t mod_read(void const *instance, void **packet_ctx, uint8_t *buffer, size_t buffer_len)
 {
 	proto_radius_udp_t const	*inst = talloc_get_type_abort(instance, proto_radius_udp_t);
@@ -137,7 +147,21 @@ static ssize_t mod_read(void const *instance, void **packet_ctx, uint8_t *buffer
 	case FR_TRACKING_UNUSED:
 		return -1;
 
+		/*
+		 *	If the entry already has a cleanup delay, we
+		 *	extend the cleanup delay.  i.e. the cleanup
+		 *	delay is from the last reply we sent, not from
+		 *	the first one.
+		 */
 	case FR_TRACKING_SAME:
+		if (track->ev) {
+			struct timeval tv;
+
+			gettimeofday(&tv, NULL);
+			tv.tv_sec += inst->cleanup_delay;
+
+			(void) fr_event_timer_insert(inst->el, mod_cleanup_delay, track, &tv, &track->ev);
+		}
 		return 0;
 
 		/*
@@ -156,15 +180,6 @@ static ssize_t mod_read(void const *instance, void **packet_ctx, uint8_t *buffer
 	return packet_len;
 }
 
-static void mod_cleanup_delay(UNUSED fr_event_list_t *el, UNUSED struct timeval *now, void *uctx)
-{
-	fr_tracking_entry_t *track = uctx;
-	// proto_radius_udp_t const *inst = talloc_parent(track->ft);
-
-	(void) fr_radius_tracking_entry_delete(track->ft, track);
-}
-
-
 static ssize_t mod_write(void const *instance, fr_time_t request_time, void *packet_ctx, uint8_t *buffer, size_t buffer_len)
 {
 	proto_radius_udp_t const	*inst = talloc_get_type_abort(instance, proto_radius_udp_t);