diff options
Diffstat (limited to 'src/charon/control')
| -rw-r--r-- | src/charon/control/controller.c | 6 | ||||
| -rw-r--r-- | src/charon/control/controller.h | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/charon/control/controller.c b/src/charon/control/controller.c index 353b35780..6a03bab15 100644 --- a/src/charon/control/controller.c +++ b/src/charon/control/controller.c @@ -116,9 +116,9 @@ static void nop(job_t *job) /** * Implementation of controller_t.create_ike_sa_iterator. */ -static iterator_t* create_ike_sa_iterator(controller_t *this) +static enumerator_t* create_ike_sa_enumerator(controller_t *this) { - return charon->ike_sa_manager->create_iterator(charon->ike_sa_manager); + return charon->ike_sa_manager->create_enumerator(charon->ike_sa_manager); } /** @@ -561,7 +561,7 @@ controller_t *controller_create(void) { private_controller_t *this = malloc_thing(private_controller_t); - this->public.create_ike_sa_iterator = (iterator_t*(*)(controller_t*))create_ike_sa_iterator; + this->public.create_ike_sa_enumerator = (enumerator_t*(*)(controller_t*))create_ike_sa_enumerator; this->public.initiate = (status_t(*)(controller_t*,peer_cfg_t*,child_cfg_t*,bool(*)(void*,signal_t,level_t,ike_sa_t*,char*,va_list),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; diff --git a/src/charon/control/controller.h b/src/charon/control/controller.h index 460c04e0d..46382e738 100644 --- a/src/charon/control/controller.h +++ b/src/charon/control/controller.h @@ -64,14 +64,14 @@ typedef struct controller_t controller_t; struct controller_t { /** - * Create an iterator for all IKE_SAs. + * Create an enumerator for all IKE_SAs. * - * The iterator blocks the IKE_SA manager until it gets destroyed. Do + * The enumerator blocks the IKE_SA manager until it gets destroyed. Do * not call another interface/manager method while the iterator is alive. * - * @return iterator, locks IKE_SA manager until destroyed + * @return enumerator, locks IKE_SA manager until destroyed */ - iterator_t* (*create_ike_sa_iterator)(controller_t *this); + enumerator_t* (*create_ike_sa_enumerator)(controller_t *this); /** * Initiate a CHILD_SA, and if required, an IKE_SA. |