diff options
| author | Martin Willi <martin@revosec.ch> | 2011-05-02 15:28:33 +0200 |
|---|---|---|
| committer | Martin Willi <martin@revosec.ch> | 2011-05-16 15:24:13 +0200 |
| commit | 69c3eca0e9681905c4e89695475d82a22bd6bafa (patch) | |
| tree | d8417f6676a2b3bce87539ca160f2686883e3b21 /src/libcharon/control/controller.c | |
| parent | 3f064037054a278065f8dd75429457d63da2eb07 (diff) | |
| download | strongswan-69c3eca0e9681905c4e89695475d82a22bd6bafa.tar.bz2 strongswan-69c3eca0e9681905c4e89695475d82a22bd6bafa.tar.xz | |
Added a non-blocking, skipping variant of IKE_SA enumerator
Diffstat (limited to 'src/libcharon/control/controller.c')
| -rw-r--r-- | src/libcharon/control/controller.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/libcharon/control/controller.c b/src/libcharon/control/controller.c index 5bc19d11b..99b4de7d6 100644 --- a/src/libcharon/control/controller.c +++ b/src/libcharon/control/controller.c @@ -206,9 +206,10 @@ static void recheckin(interface_job_t *job) /** * Implementation of controller_t.create_ike_sa_iterator. */ -static enumerator_t* create_ike_sa_enumerator(controller_t *this) +static enumerator_t* create_ike_sa_enumerator(controller_t *this, bool wait) { - return charon->ike_sa_manager->create_enumerator(charon->ike_sa_manager); + return charon->ike_sa_manager->create_enumerator(charon->ike_sa_manager, + wait); } /** @@ -448,7 +449,7 @@ controller_t *controller_create(void) { private_controller_t *this = malloc_thing(private_controller_t); - this->public.create_ike_sa_enumerator = (enumerator_t*(*)(controller_t*))create_ike_sa_enumerator; + this->public.create_ike_sa_enumerator = (enumerator_t*(*)(controller_t*, bool))create_ike_sa_enumerator; this->public.initiate = (status_t(*)(controller_t*,peer_cfg_t*,child_cfg_t*,controller_cb_t,void*))initiate; this->public.terminate_ike = (status_t(*)(controller_t*,u_int32_t,controller_cb_t, void*))terminate_ike; this->public.terminate_child = (status_t(*)(controller_t*,u_int32_t,controller_cb_t, void *param))terminate_child; |