From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Tue, 24 Mar 2020 16:19:50 +0000 (-0600)
Subject: trunk: We don't free we drain _then_ free.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=96325d07a58c16ce04579c846ef7e86b740da239;p=thirdparty%2Ffreeradius-server.git

trunk: We don't free we drain _then_ free.
---

diff --git a/src/lib/server/trunk.c b/src/lib/server/trunk.c
index 5c175697172..610376edf35 100644
--- a/src/lib/server/trunk.c
+++ b/src/lib/server/trunk.c
@@ -3521,8 +3521,8 @@ static void trunk_manage(fr_trunk_t *trunk, fr_time_t now, char const *caller)
 		/*
 		 *	Inactive connections get counted in the
 		 *	set of viable connections, but are likely
-		 *	to be congested or dead, so we free those
-		 *	first.
+		 *	to be congested or dead, so we drain
+		 *	(and possibly eventually free) those first.
 		 */
 		if ((tconn = fr_dlist_tail(&trunk->inactive))) {
 			trunk_connection_enter_inactive_draining(tconn);
@@ -3539,7 +3539,7 @@ static void trunk_manage(fr_trunk_t *trunk, fr_time_t now, char const *caller)
 		/*
 		 *	Finally if there are no "connecting"
 		 *	connections to close, and no "inactive"
-		 *	connections, start freeing "active"
+		 *	connections, start draining "active"
 		 *	connections.
 		 */
 		} else if ((tconn = fr_heap_peek_tail(trunk->active))) {