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/conftest/actions.c | |
| 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/conftest/actions.c')
| -rw-r--r-- | src/conftest/actions.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/conftest/actions.c b/src/conftest/actions.c index d07e5634c..1844d0c28 100644 --- a/src/conftest/actions.c +++ b/src/conftest/actions.c @@ -114,8 +114,7 @@ static job_requeue_t rekey_ike(char *config) */ static job_requeue_t rekey_child(char *config) { - enumerator_t *enumerator; - iterator_t *children; + enumerator_t *enumerator, *children; ike_sa_t *ike_sa; child_sa_t *child_sa; u_int32_t reqid = 0, spi = 0; @@ -125,8 +124,8 @@ static job_requeue_t rekey_child(char *config) charon->controller, TRUE); while (enumerator->enumerate(enumerator, &ike_sa)) { - 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 (streq(config, child_sa->get_name(child_sa))) { @@ -222,8 +221,7 @@ static job_requeue_t close_ike(char *config) */ static job_requeue_t close_child(char *config) { - enumerator_t *enumerator; - iterator_t *children; + enumerator_t *enumerator, *children; ike_sa_t *ike_sa; child_sa_t *child_sa; int id = 0; @@ -233,8 +231,8 @@ static job_requeue_t close_child(char *config) while (enumerator->enumerate(enumerator, &ike_sa)) { - 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 (streq(config, child_sa->get_name(child_sa))) { |