diff options
| author | Tobias Brunner <tobias@strongswan.org> | 2011-05-19 17:27:32 +0200 |
|---|---|---|
| committer | Tobias Brunner <tobias@strongswan.org> | 2011-07-06 09:43:45 +0200 |
| commit | 4bbce1ef37d08f65084e14d4d30bfa512dd49767 (patch) | |
| tree | 2ff300f2e66bf50e2dbd3bc0df842f02c76c776d /src/libcharon/control | |
| parent | 4f9c691adbb0763d59b3f58f5bbd3dbb36748a76 (diff) | |
| download | strongswan-4bbce1ef37d08f65084e14d4d30bfa512dd49767.tar.bz2 strongswan-4bbce1ef37d08f65084e14d4d30bfa512dd49767.tar.xz | |
Replaced ike_sa_t.create_child_sa_iterator with enumerator.
This required two new methods on ike_sa_t. One returns the number of
CHILD_SAs and one allows to remove a CHILD_SA.
Diffstat (limited to 'src/libcharon/control')
| -rw-r--r-- | src/libcharon/control/controller.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/libcharon/control/controller.c b/src/libcharon/control/controller.c index 09291c8c8..3893a617b 100644 --- a/src/libcharon/control/controller.c +++ b/src/libcharon/control/controller.c @@ -367,7 +367,7 @@ METHOD(controller_t, terminate_child, status_t, { ike_sa_t *ike_sa; child_sa_t *child_sa; - iterator_t *iterator; + enumerator_t *enumerator; interface_job_t job = { .listener = { .public = { @@ -397,8 +397,8 @@ METHOD(controller_t, terminate_child, status_t, } job.listener.ike_sa = ike_sa; - iterator = ike_sa->create_child_sa_iterator(ike_sa); - while (iterator->iterate(iterator, (void**)&child_sa)) + enumerator = ike_sa->create_child_sa_enumerator(ike_sa); + while (enumerator->enumerate(enumerator, (void**)&child_sa)) { if (child_sa->get_state(child_sa) != CHILD_ROUTED && child_sa->get_reqid(child_sa) == reqid) @@ -407,7 +407,7 @@ METHOD(controller_t, terminate_child, status_t, } child_sa = NULL; } - iterator->destroy(iterator); + enumerator->destroy(enumerator); if (child_sa == NULL) { |