denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ike_sa_manager enumerable, not iterable

Browse Source
This commit is contained in:
Martin Willi
2008-04-14 11:37:46 +00:00
parent b010310517
commit a593db5d35
10 changed files with 131 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/charon/plugins/dbus/dbus.c
+6 -6
View File
@@ -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;
}