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/processing | |
| 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/processing')
| -rw-r--r-- | src/libcharon/processing/jobs/inactivity_job.c | 8 | ||||
| -rw-r--r-- | src/libcharon/processing/jobs/migrate_job.c | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/libcharon/processing/jobs/inactivity_job.c b/src/libcharon/processing/jobs/inactivity_job.c index f3140c7c1..251b9ab03 100644 --- a/src/libcharon/processing/jobs/inactivity_job.c +++ b/src/libcharon/processing/jobs/inactivity_job.c @@ -61,15 +61,15 @@ METHOD(job_t, execute, void, this->reqid, TRUE); if (ike_sa) { - iterator_t *iterator; + enumerator_t *enumerator; child_sa_t *child_sa; u_int32_t delete = 0; protocol_id_t proto = 0; int children = 0; status_t status = SUCCESS; - 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_reqid(child_sa) == this->reqid) { @@ -94,7 +94,7 @@ METHOD(job_t, execute, void, } children++; } - iterator->destroy(iterator); + enumerator->destroy(enumerator); if (delete) { diff --git a/src/libcharon/processing/jobs/migrate_job.c b/src/libcharon/processing/jobs/migrate_job.c index 7190826b4..eb10e2e46 100644 --- a/src/libcharon/processing/jobs/migrate_job.c +++ b/src/libcharon/processing/jobs/migrate_job.c @@ -79,12 +79,12 @@ METHOD(job_t, execute, void, } if (ike_sa) { - iterator_t *children; + enumerator_t *children; child_sa_t *child_sa; host_t *host; - children = ike_sa->create_child_sa_iterator(ike_sa); - while (children->iterate(children, (void**)&child_sa)) + children = ike_sa->create_child_sa_enumerator(ike_sa); + while (children->enumerate(children, (void**)&child_sa)) { if (child_sa->get_reqid(child_sa) == this->reqid) { |