From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Wed, 31 Jan 2018 23:11:56 +0000 (-0700)
Subject: Mark up duplicate requests as warnings
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=35ca0b2c2e67115928268dac3d1b2ca9dbfa5d75;p=thirdparty%2Ffreeradius-server.git

Mark up duplicate requests as warnings
---

diff --git a/src/lib/io/worker.c b/src/lib/io/worker.c
index 932d95730fa..2692099d84c 100644
--- a/src/lib/io/worker.c
+++ b/src/lib/io/worker.c
@@ -901,6 +901,8 @@ nak:
 		 *	depth, and not sequence / ack.
 		 */
 		if (old->async->recv_time == request->async->recv_time) {
+			RWDEBUG("Discarding duplicate of request (%"PRIu64")", old->number);
+
 			fr_channel_null_reply(request->async->channel);
 			talloc_free(request);
 
@@ -915,8 +917,6 @@ nak:
 			 *	running, but is yielded.  It MAY clean
 			 *	itself up, or do something...
 			 */
-			request = old;
-			RDEBUG("received duplicate request.");
 			(void) old->async->process(old, FR_IO_ACTION_DUP);
 			return NULL;
 		}
@@ -925,14 +925,7 @@ nak:
 		 *	Stop the old request, and decrement the number
 		 *	of active requests.
 		 */
-		{
-			REQUEST *tmp = request;
-
-			request = old;
-			RDEBUG("received new request %" PRIu64 " which which over-rides this one - telling old one to stop.",
-			       tmp->number);
-			request = tmp;
-		}
+		RWDEBUG("Got duplicate of request (%" PRIu64 "), telling old request to stop", old->number);
 
 		worker_stop_request(worker, old, now);
 		rad_assert(worker->num_active > 0);