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

[strongswan.git] / src / libcharon / plugins / uci / uci_control.c

diff --git a/src/libcharon/plugins/uci/uci_control.c b/src/libcharon/plugins/uci/uci_control.c
index caf8acf..bb08de2 100644 (file)
--- 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;
                }