From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Wed, 4 Mar 2020 01:16:02 +0000 (-0600)
Subject: rlm_radius_udp: Simplify radius_retry_next call
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fcce5dcd6e9cf3e917edc786619a7deccf5c71f4;p=thirdparty%2Ffreeradius-server.git

rlm_radius_udp: Simplify radius_retry_next call
---

diff --git a/src/modules/rlm_radius/rlm_radius_udp.c b/src/modules/rlm_radius/rlm_radius_udp.c
index a1261a36ac5..05188d46be7 100644
--- a/src/modules/rlm_radius/rlm_radius_udp.c
+++ b/src/modules/rlm_radius/rlm_radius_udp.c
@@ -1285,7 +1285,6 @@ static void request_timeout(fr_event_list_t *el, fr_time_t now, void *uctx)
 	udp_request_t		*u = talloc_get_type_abort(treq->preq, udp_request_t);
 	udp_result_t		*r = talloc_get_type_abort(treq->rctx, udp_result_t);
 	REQUEST			*request = treq->request;
-	fr_retry_state_t	state;
 
 	rad_assert(treq->tconn);
 
@@ -1301,8 +1300,7 @@ static void request_timeout(fr_event_list_t *el, fr_time_t now, void *uctx)
 	 */
 	if (!u->rr) return;
 
-	state = fr_retry_next(&u->retry, now);
-
+	switch (fr_retry_next(&u->retry, now)) {
 	/*
 	 *	Queue the request for retransmission.
 	 *
@@ -1311,15 +1309,17 @@ static void request_timeout(fr_event_list_t *el, fr_time_t now, void *uctx)
 	 *	packets sitting in the queue for extended periods of
 	 *	time, and still run the timers.
 	 */
-	if (state == FR_RETRY_CONTINUE) {
+	case FR_RETRY_CONTINUE:
 		fr_trunk_request_requeue(treq);
 		return;
-	}
 
-	if (state == FR_RETRY_MRD) {
+	case FR_RETRY_MRD:
 		RDEBUG("Reached maximum_retransmit_duration, failing request");
-	} else if (state == FR_RETRY_MRC) {
+		break;
+
+	case FR_RETRY_MRC:
 		RDEBUG("Reached maximum_retransmit_count, failing request");
+		break;
 	}
 
 	udp_request_clear(h, u, now);