From b76c1decd4fcb18a897d7f584fbe34a5e440a792 Mon Sep 17 00:00:00 2001
From: Tobias Brunner <tobias@strongswan.org>
Date: Fri, 27 May 2016 10:07:03 +0200
Subject: [PATCH] unit-tests: Return status from process_message()

---
 src/libcharon/tests/utils/exchange_test_helper.c | 7 +++++--
 src/libcharon/tests/utils/exchange_test_helper.h | 5 +++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/libcharon/tests/utils/exchange_test_helper.c b/src/libcharon/tests/utils/exchange_test_helper.c
index d2187b985..c535dfb38 100644
--- a/src/libcharon/tests/utils/exchange_test_helper.c
+++ b/src/libcharon/tests/utils/exchange_test_helper.c
@@ -179,17 +179,20 @@ METHOD(backend_t, create_peer_cfg_enumerator, enumerator_t*,
 	return enumerator_create_single(this->peer_cfg, NULL);
 }
 
-METHOD(exchange_test_helper_t, process_message, void,
+METHOD(exchange_test_helper_t, process_message, status_t,
 	private_exchange_test_helper_t *this, ike_sa_t *ike_sa, message_t *message)
 {
+	status_t status;
+
 	if (!message)
 	{
 		message = this->public.sender->dequeue(this->public.sender);
 	}
 	charon->bus->set_sa(charon->bus, ike_sa);
-	ike_sa->process_message(ike_sa, message);
+	status = ike_sa->process_message(ike_sa, message);
 	charon->bus->set_sa(charon->bus, NULL);
 	message->destroy(message);
+	return status;
 }
 
 METHOD(exchange_test_helper_t, establish_sa, void,
diff --git a/src/libcharon/tests/utils/exchange_test_helper.h b/src/libcharon/tests/utils/exchange_test_helper.h
index 6b19ec4a8..e1fdb012a 100644
--- a/src/libcharon/tests/utils/exchange_test_helper.h
+++ b/src/libcharon/tests/utils/exchange_test_helper.h
@@ -64,9 +64,10 @@ struct exchange_test_helper_t {
 	 * @param ike_sa		the IKE_SA receiving the message
 	 * @param message		the message, or NULL to pass the next message in the
 	 *						send queue (adopted)
+	 * @return				return value from ike_sa_t::process_message()
 	 */
-	void (*process_message)(exchange_test_helper_t *this, ike_sa_t *sa,
-							message_t *message);
+	status_t (*process_message)(exchange_test_helper_t *this, ike_sa_t *sa,
+								message_t *message);
 
 	/**
 	 * Register a listener with the bus.