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

bus->listen() and the controller wrappers accept a timeout to wait for callbacks

Browse Source
This commit is contained in:
Martin Willi
2011-08-26 10:44:25 +02:00
parent 4a2ecc4147
commit 8e3f14baab
14 changed files with 85 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/conftest/actions.c
+4 -3
View File
@@ -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
{