ims-volte-vowifi
/
strongswan
9
0
Fork 0
Code Pull Requests Releases Activity

libfast uses enumerator instead of deprecated iterator

This commit is contained in:
Martin Willi 2009-09-07 18:28:55 +02:00
parent d73f453c29
commit 48a606b5ff
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/libfast/dispatcher.c
View File

@ -128,7 +128,7 @@ typedef struct {
*/ */
static session_t* load_session(private_dispatcher_t *this) static session_t* load_session(private_dispatcher_t *this)
{ {
iterator_t *iterator; enumerator_t *enumerator;
controller_entry_t *centry; controller_entry_t *centry;
filter_entry_t *fentry; filter_entry_t *fentry;
session_t *session; session_t *session;
@ -142,21 +142,21 @@ static session_t* load_session(private_dispatcher_t *this)
} }
session = session_create(context); session = session_create(context);
iterator = this->controllers->create_iterator(this->controllers, TRUE); enumerator = this->controllers->create_enumerator(this->controllers);
while (iterator->iterate(iterator, (void**)&centry)) while (enumerator->enumerate(enumerator, &centry))
{ {
controller = centry->constructor(context, centry->param); controller = centry->constructor(context, centry->param);
session->add_controller(session, controller); session->add_controller(session, controller);
} }
iterator->destroy(iterator); enumerator->destroy(enumerator);
iterator = this->filters->create_iterator(this->filters, TRUE); enumerator = this->filters->create_enumerator(this->filters);
while (iterator->iterate(iterator, (void**)&fentry)) while (enumerator->enumerate(enumerator, &fentry))
{ {
filter = fentry->constructor(context, fentry->param); filter = fentry->constructor(context, fentry->param);
session->add_filter(session, filter); session->add_filter(session, filter);
} }
iterator->destroy(iterator); enumerator->destroy(enumerator);
return session; return session;
} }
@ -224,7 +224,7 @@ static void dispatch(private_dispatcher_t *this)
{ {
request_t *request; request_t *request;
session_entry_t *current, *found = NULL; session_entry_t *current, *found = NULL;
iterator_t *iterator; enumerator_t *enumerator;
time_t now; time_t now;
char *sid; char *sid;
@ -241,15 +241,15 @@ static void dispatch(private_dispatcher_t *this)
/* find session */ /* find session */
pthread_mutex_lock(&this->mutex); pthread_mutex_lock(&this->mutex);
iterator = this->sessions->create_iterator(this->sessions, TRUE); enumerator = this->sessions->create_enumerator(this->sessions);
while (iterator->iterate(iterator, (void**)&current)) while (enumerator->enumerate(enumerator, &current))
{ {
/* check all sessions for timeout or close flag /* check all sessions for timeout or close flag
* TODO: use a seperate cleanup thread */ * TODO: use a seperate cleanup thread */
if (!current->in_use && if (!current->in_use &&
(current->used < now - this->timeout || current->closed)) (current->used < now - this->timeout || current->closed))
{ {
iterator->remove(iterator); this->sessions->remove_at(this->sessions, enumerator);
session_entry_destroy(current); session_entry_destroy(current);
continue; continue;
} }
@ -261,7 +261,7 @@ static void dispatch(private_dispatcher_t *this)
found = current; found = current;
} }
} }
iterator->destroy(iterator); enumerator->destroy(enumerator);
if (found) if (found)
{ {