diff options
| author | Martin Willi <martin@revosec.ch> | 2011-08-26 10:42:42 +0200 |
|---|---|---|
| committer | Martin Willi <martin@revosec.ch> | 2011-08-26 10:44:25 +0200 |
| commit | 8e3f14baab65317ea7a1ba6bc7543b7e5aa116f8 (patch) | |
| tree | 517d1a298530e8682609a197197d527dfaea9999 /src/libcharon/plugins/uci/uci_control.c | |
| parent | 4a2ecc41475e6ac983fef6b415a9d768c5bafc5e (diff) | |
| download | strongswan-8e3f14baab65317ea7a1ba6bc7543b7e5aa116f8.tar.bz2 strongswan-8e3f14baab65317ea7a1ba6bc7543b7e5aa116f8.tar.xz | |
bus->listen() and the controller wrappers accept a timeout to wait for callbacks
Diffstat (limited to 'src/libcharon/plugins/uci/uci_control.c')
| -rw-r--r-- | src/libcharon/plugins/uci/uci_control.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libcharon/plugins/uci/uci_control.c b/src/libcharon/plugins/uci/uci_control.c index caf8acf88..bb08de2d7 100644 --- a/src/libcharon/plugins/uci/uci_control.c +++ b/src/libcharon/plugins/uci/uci_control.c @@ -148,8 +148,8 @@ static void initiate(private_uci_control_t *this, char *name) enumerator = peer_cfg->create_child_cfg_enumerator(peer_cfg); if (enumerator->enumerate(enumerator, &child_cfg) && charon->controller->initiate(charon->controller, peer_cfg, - child_cfg->get_ref(child_cfg), - controller_cb_empty, NULL) == SUCCESS) + child_cfg->get_ref(child_cfg), + controller_cb_empty, NULL, 0) == SUCCESS) { write_fifo(this, "connection '%s' established\n", name); } @@ -183,7 +183,7 @@ static void terminate(private_uci_control_t *this, char *name) id = ike_sa->get_unique_id(ike_sa); enumerator->destroy(enumerator); charon->controller->terminate_ike(charon->controller, id, - controller_cb_empty, NULL); + controller_cb_empty, NULL, 0); write_fifo(this, "connection '%s' terminated\n", name); return; } |