- Updated to new upstream.

1 files changed, 7 insertions, 13 deletions

diff --git a/src/charon/processing/jobs/roam_job.c b/src/charon/processing/jobs/roam_job.c
index 842f57405..0b323ae8b 100644
--- a/src/charon/processing/jobs/roam_job.c
+++ b/src/charon/processing/jobs/roam_job.c
@@ -1,10 +1,3 @@
-/**
- * @file roam_job.c
- * 
- * @brief Implementation of roam_job_t.
- * 
- */
-
 /*
  * Copyright (C) 2007 Martin Willi
  * Hochschule fuer Technik Rapperswil
@@ -18,9 +11,10 @@
  * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
  * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  * for more details.
+ *
+ * $Id: roam_job.c 3804 2008-04-14 11:37:46Z martin $
  */
 
-
 #include <stdlib.h>
 
 #include "roam_job.h"
@@ -62,18 +56,18 @@ static void execute(private_roam_job_t *this)
 	ike_sa_t *ike_sa;
 	linked_list_t *list;
 	ike_sa_id_t *id;
-	iterator_t *iterator;
+	enumerator_t *enumerator;
 	
-	/* iterating over all IKE_SAs gives us no way to checkin_and_destroy 
+	/* enumerator over all IKE_SAs gives us no way to checkin_and_destroy 
 	 * after a DESTROY_ME, so we check out each available IKE_SA by hand. */
 	list = linked_list_create();
-	iterator = charon->ike_sa_manager->create_iterator(charon->ike_sa_manager);
-	while (iterator->iterate(iterator, (void**)&ike_sa))
+	enumerator = charon->ike_sa_manager->create_enumerator(charon->ike_sa_manager);
+	while (enumerator->enumerate(enumerator, &ike_sa))
 	{
 		id = ike_sa->get_id(ike_sa);
 		list->insert_last(list, id->clone(id));
 	}
-	iterator->destroy(iterator);
+	enumerator->destroy(enumerator);
 	
 	while (list->remove_last(list, (void**)&id) == SUCCESS)
 	{