From 8e3f14baab65317ea7a1ba6bc7543b7e5aa116f8 Mon Sep 17 00:00:00 2001 From: Martin Willi Date: Fri, 26 Aug 2011 10:42:42 +0200 Subject: bus->listen() and the controller wrappers accept a timeout to wait for callbacks --- src/conftest/actions.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/conftest/actions.c') diff --git a/src/conftest/actions.c b/src/conftest/actions.c index 1844d0c28..7532e95cf 100644 --- a/src/conftest/actions.c +++ b/src/conftest/actions.c @@ -65,7 +65,7 @@ static job_requeue_t initiate(char *config) { DBG1(DBG_CFG, "initiating IKE_SA for CHILD_SA config '%s'", config); charon->controller->initiate(charon->controller, peer_cfg, child_cfg, - NULL, NULL); + NULL, NULL, 0); } else { @@ -207,7 +207,7 @@ static job_requeue_t close_ike(char *config) if (id) { DBG1(DBG_CFG, "closing IKE_SA '%s'", config); - charon->controller->terminate_ike(charon->controller, id, NULL, NULL); + charon->controller->terminate_ike(charon->controller, id, NULL, NULL, 0); } else { @@ -246,7 +246,8 @@ static job_requeue_t close_child(char *config) if (id) { DBG1(DBG_CFG, "closing CHILD_SA '%s'", config); - charon->controller->terminate_child(charon->controller, id, NULL, NULL); + charon->controller->terminate_child(charon->controller, id, + NULL, NULL, 0); } else { -- cgit v1.2.3