X-Git-Url: https://git.strongswan.org/?p=strongswan.git;a=blobdiff_plain;f=src%2Fcharon%2Fplugins%2Fdbus%2Fdbus.c;h=97bd3b32f7b53029de732ac1261de393bb7d60b2;hp=ac29db773ff6a91901c0cdc5f9dbe5ce5085ddfa;hb=2d87903db9cb9cfef4c17bae89cdc3e8076c4ab6;hpb=552cc11b1f017ce4962fca741f567d098f768574

diff --git a/src/charon/plugins/dbus/dbus.c b/src/charon/plugins/dbus/dbus.c
index ac29db7..97bd3b3 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;
 }