denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

unit-tests: Return status from process_message()

Browse Source
This commit is contained in:
Tobias Brunner
2016-06-17 18:48:04 +02:00
parent 7c6e0c2979
commit b76c1decd4
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/tests/utils/exchange_test_helper.c
+5 -2
View File
@@ -179,17 +179,20 @@ METHOD(backend_t, create_peer_cfg_enumerator, enumerator_t*,
return enumerator_create_single(this->peer_cfg, NULL); 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) private_exchange_test_helper_t *this, ike_sa_t *ike_sa, message_t *message)
{ {
status_t status;
if (!message) if (!message)
{ {
message = this->public.sender->dequeue(this->public.sender); message = this->public.sender->dequeue(this->public.sender);
} }
charon->bus->set_sa(charon->bus, ike_sa); 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); charon->bus->set_sa(charon->bus, NULL);
message->destroy(message); message->destroy(message);
return status;
} }
METHOD(exchange_test_helper_t, establish_sa, void, METHOD(exchange_test_helper_t, establish_sa, void,
src/libcharon/tests/utils/exchange_test_helper.h
+3 -2
View File
@@ -64,9 +64,10 @@ struct exchange_test_helper_t {
* @param ike_sa the IKE_SA receiving the message * @param ike_sa the IKE_SA receiving the message
* @param message the message, or NULL to pass the next message in the * @param message the message, or NULL to pass the next message in the
* send queue (adopted) * send queue (adopted)
* @return return value from ike_sa_t::process_message()
*/ */
void (*process_message)(exchange_test_helper_t *this, ike_sa_t *sa, status_t (*process_message)(exchange_test_helper_t *this, ike_sa_t *sa,
message_t *message); message_t *message);
/** /**
* Register a listener with the bus. * Register a listener with the bus.