From: Alan T. DeKok <aland@freeradius.org>
Date: Mon, 12 Dec 2016 20:18:05 +0000 (-0500)
Subject: fix API
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a43dc1dd9be2c6a8ce017617e4a5c24a136bc228;p=thirdparty%2Ffreeradius-server.git

fix API
---

diff --git a/src/tests/util/channel_test.c b/src/tests/util/channel_test.c
index decc59be2c5..ab3744da75c 100644
--- a/src/tests/util/channel_test.c
+++ b/src/tests/util/channel_test.c
@@ -325,10 +325,10 @@ static void *channel_worker(void *arg)
 			(void) fr_channel_service_kevent(channel, aq_worker, &events[i]);
 		}
 
-		now = fr_time();
-
 		MPRINT1("\tWorker servicing control-plane aq %p\n", aq_worker);
 
+		now = fr_time();
+
 		while ((ce = fr_channel_service_aq(aq_worker, now, &new_channel)) != FR_CHANNEL_EMPTY) {
 			fr_channel_data_t *cd, *reply;
 
@@ -422,6 +422,11 @@ static void *channel_worker(void *arg)
 				rad_assert(0 == 1);
 				break;
 			} /* switch over signals */
+
+			/*
+			 *	Get a new idea of "now".
+			 */
+			now = fr_time();
 		} /* drain the control plane */
 	}
 
diff --git a/src/tests/util/control_test.c b/src/tests/util/control_test.c
index a8a98659263..d7c6aac9354 100644
--- a/src/tests/util/control_test.c
+++ b/src/tests/util/control_test.c
@@ -92,7 +92,7 @@ static void *control_master(UNUSED void *arg)
 		MPRINT1("Master draining the control plane.\n");
 
 		while (true) {
-			data_size = fr_control_message_receive(aq, &kev, &m, sizeof(m));
+			data_size = fr_control_message_pop(aq, &m, sizeof(m));
 			if (data_size == 0) goto wait_for_events;
 
 			if (data_size < 0) {