diff options
| author | Martin Willi <martin@strongswan.org> | 2008-04-14 11:37:46 +0000 |
|---|---|---|
| committer | Martin Willi <martin@strongswan.org> | 2008-04-14 11:37:46 +0000 |
| commit | a593db5d35ebc7b0492b57c7aa6b8a6ad394fd8e (patch) | |
| tree | 6c19eeee650bed795eb804b2d6565748be7ac8f5 /src/charon/plugins/dbus/dbus.c | |
| parent | b010310517778085f21343d117990195752b6890 (diff) | |
| download | strongswan-a593db5d35ebc7b0492b57c7aa6b8a6ad394fd8e.tar.bz2 strongswan-a593db5d35ebc7b0492b57c7aa6b8a6ad394fd8e.tar.xz | |
ike_sa_manager enumerable, not iterable
Diffstat (limited to 'src/charon/plugins/dbus/dbus.c')
| -rw-r--r-- | src/charon/plugins/dbus/dbus.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/charon/plugins/dbus/dbus.c b/src/charon/plugins/dbus/dbus.c index ac29db773..97bd3b32f 100644 --- a/src/charon/plugins/dbus/dbus.c +++ b/src/charon/plugins/dbus/dbus.c @@ -203,7 +203,7 @@ static bool start_connection(private_dbus_t *this, DBusMessage* msg) static bool stop_connection(private_dbus_t *this, DBusMessage* msg) { u_int32_t id; - iterator_t *iterator; + enumerator_t *enumerator; ike_sa_t *ike_sa; if (this->name == NULL) @@ -215,8 +215,8 @@ static bool stop_connection(private_dbus_t *this, DBusMessage* msg) set_state(this, NM_VPN_STATE_STOPPING); - iterator = charon->controller->create_ike_sa_iterator(charon->controller); - while (iterator->iterate(iterator, (void**)&ike_sa)) + enumerator = charon->controller->create_ike_sa_enumerator(charon->controller); + while (enumerator->enumerate(enumerator, (void**)&ike_sa)) { child_sa_t *child_sa; iterator_t *children; @@ -224,7 +224,7 @@ static bool stop_connection(private_dbus_t *this, DBusMessage* msg) if (this->name && streq(this->name, ike_sa->get_name(ike_sa))) { id = ike_sa->get_unique_id(ike_sa); - iterator->destroy(iterator); + enumerator->destroy(enumerator); charon->controller->terminate_ike(charon->controller, id, NULL, NULL); set_state(this, NM_VPN_STATE_STOPPED); return TRUE;; @@ -236,7 +236,7 @@ static bool stop_connection(private_dbus_t *this, DBusMessage* msg) { id = child_sa->get_reqid(child_sa); children->destroy(children); - iterator->destroy(iterator); + enumerator->destroy(enumerator); charon->controller->terminate_child(charon->controller, id, NULL, NULL); set_state(this, NM_VPN_STATE_STOPPED); return TRUE; @@ -244,7 +244,7 @@ static bool stop_connection(private_dbus_t *this, DBusMessage* msg) } children->destroy(children); } - iterator->destroy(iterator); + enumerator->destroy(enumerator); set_state(this, NM_VPN_STATE_STOPPED); return TRUE; } |