From 385fce1cde1fe76c1f5b77d8f94ae29114fc2b20 Mon Sep 17 00:00:00 2001
From: Augustin Cavalier <waddlesplash@gmail.com>
Date: Wed, 9 Mar 2022 17:10:35 -0500
Subject: [PATCH] freebsd_network: Properly implement callout_drain().

Also cleanup code a bit.

May help with #17634.
---
 src/libs/compat/freebsd_network/callout.cpp | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/libs/compat/freebsd_network/callout.cpp b/src/libs/compat/freebsd_network/callout.cpp
index 53d613e35d..009366b5ba 100644
--- a/src/libs/compat/freebsd_network/callout.cpp
+++ b/src/libs/compat/freebsd_network/callout.cpp
@@ -212,17 +212,24 @@ callout_schedule(struct callout *callout, int _ticks)
 int
 _callout_stop_safe(struct callout *c, int safe)
 {
-	MutexLocker locker(sLock);
-
-	if (c == NULL) {
-		printf("_callout_stop_safe called with NULL callout\n");
-		return 0;
-	}
+	if (c == NULL)
+		return -1;
 
 	TRACE("_callout_stop_safe %p, func %p, arg %p\n", c, c->c_func, c->c_arg);
 
+	MutexLocker locker(sLock);
+
 	if (c->due <= 0)
+		return -1;
+
+	if (callout_active(c)) {
+		if (safe) {
+			locker.Unlock();
+			while (callout_active(c))
+				snooze(100);
+		}
 		return 0;
+	}
 
 	// this timer is scheduled, cancel it
 	list_remove_item(&sTimers, c);