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

removed deprecated iterator methods (has_next & current)

Browse Source 
added iterator hook to manipulate iterator the clean way
This commit is contained in:
Martin Willi
2006-10-24 14:20:45 +00:00
parent 55bbff11ec
commit 191a26a6a7
31 changed files with 366 additions and 529 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libstrongswan/crypto/crl.c
+6 -7
View File
@@ -385,16 +385,15 @@ static bool verify(const private_crl_t *this, const rsa_public_key_t *signer)
static void get_status(const private_crl_t *this, certinfo_t *certinfo)
{
chunk_t serialNumber = certinfo->get_serialNumber(certinfo);
iterator_t *iterator = this->revokedCertificates->create_iterator(this->revokedCertificates, TRUE);
iterator_t *iterator;
revokedCert_t *revokedCert;
certinfo->set_nextUpdate(certinfo, this->nextUpdate);
certinfo->set_status(certinfo, CERT_GOOD);
while (iterator->has_next(iterator))
iterator = this->revokedCertificates->create_iterator(this->revokedCertificates, TRUE);
while (iterator->iterate(iterator, (void**)&revokedCert))
{
revokedCert_t *revokedCert;
iterator->current(iterator, (void**)&revokedCert);
if (chunk_equals(serialNumber, revokedCert->userCertificate))
{
certinfo->set_status(certinfo, CERT_REVOKED);
src/libstrongswan/crypto/x509.c
+5 -6
View File
@@ -930,13 +930,12 @@ static bool is_self_signed(const private_x509_t *this)
static bool equals_subjectAltName(const private_x509_t *this, identification_t *id)
{
bool found = FALSE;
iterator_t *iterator = this->subjectAltNames->create_iterator(this->subjectAltNames, TRUE);
while (iterator->has_next(iterator))
identification_t *subjectAltName;
iterator_t *iterator;
iterator = this->subjectAltNames->create_iterator(this->subjectAltNames, TRUE);
while (iterator->iterate(iterator, (void**)&subjectAltName))
{
identification_t *subjectAltName;
iterator->current(iterator, (void**)&subjectAltName);
if (id->equals(id, subjectAltName))
{
found = TRUE;
src/libstrongswan/utils/iterator.h
+10 -20
View File
@@ -64,30 +64,20 @@ struct iterator_t {
* - FALSE otherwise
*/
bool (*iterate) (iterator_t *this, void** value);
/**
* @brief Moves to the next element, if available.
*
* A newly created iterator_t object doesn't point to any item.
* Call iterator_t.has_next first to point it to the first item.
* @brief Hook a function into the iterator.
*
* Sometimes it is useful to hook in an iterator. The hook function is
* called before any successful return of iterate(). It takes the
* iterator value, may manipulate it (or the references object), and returns
* the value that the iterate() function returns.
* A value of NULL deactivates the iterator hook.
*
* @param this calling object
* @return
* - TRUE, if more elements are available,
* - FALSE otherwise
* @param hook iterator hook which manipulates the iterated value
*/
bool (*has_next) (iterator_t *this);
/**
* @brief Returns the current value at the iterator position.
*
* @param this calling object
* @param[out] value value is set to the current value at iterator position
* @return
* - SUCCESS
* - FAILED if iterator on an invalid position
*/
status_t (*current) (iterator_t *this, void **value);
void (*set_iterator_hook) (iterator_t *this, void*(*hook)(void*));
/**
* @brief Inserts a new item before the given iterator position.
src/libstrongswan/utils/linked_list.c
+56 -69
View File
@@ -128,6 +128,11 @@ struct private_iterator_t {
* Mutex to use to synchronize access
*/
pthread_mutex_t *mutex;
/**
* iteration hook
*/
void* (*hook)(void*);
};
/**
@@ -138,6 +143,29 @@ static int get_list_count(private_iterator_t *this)
return this->list->count;
}
/**
* default iterator hook which does nothing
*/
static void *iterator_hook(void *value)
{
return value;
}
/**
* Implementation of iterator_t.set_iterator_hook.
*/
static void set_iterator_hook(private_iterator_t *this, void*(*hook)(void*))
{
if (hook == NULL)
{
this->hook = iterator_hook;
}
else
{
this->hook = hook;
}
}
/**
* Implementation of iterator_t.iterate.
*/
@@ -150,7 +178,7 @@ static bool iterate(private_iterator_t *this, void** value)
if (this->current == NULL)
{
this->current = (this->forward) ? this->list->first : this->list->last;
*value = this->current->value;
*value = this->hook(this->current->value);
return TRUE;
}
if (this->forward)
@@ -160,7 +188,7 @@ static bool iterate(private_iterator_t *this, void** value)
return FALSE;
}
this->current = this->current->next;
*value = this->current->value;
*value = this->hook(this->current->value);
return TRUE;
}
/* backward */
@@ -169,55 +197,10 @@ static bool iterate(private_iterator_t *this, void** value)
return FALSE;
}
this->current = this->current->previous;
*value = this->current->value;
*value = this->hook(this->current->value);
return TRUE;
}
/**
* Implementation of iterator_t.has_next.
*/
static bool iterator_has_next(private_iterator_t *this)
{
if (this->list->count == 0)
{
return FALSE;
}
if (this->current == NULL)
{
this->current = (this->forward) ? this->list->first : this->list->last;
return TRUE;
}
if (this->forward)
{
if (this->current->next == NULL)
{
return FALSE;
}
this->current = this->current->next;
return TRUE;
}
/* backward */
if (this->current->previous == NULL)
{
return FALSE;
}
this->current = this->current->previous;
return TRUE;
}
/**
* Implementation of iterator_t.current.
*/
static status_t iterator_current(private_iterator_t *this, void **value)
{
if (this->current == NULL)
{
return NOT_FOUND;
}
*value = this->current->value;
return SUCCESS;
}
/**
* Implementation of iterator_t.reset.
*/
@@ -314,7 +297,7 @@ static void insert_before(private_iterator_t * iterator, void *item)
/**
* Implementation of iterator_t.replace.
*/
static status_t replace (private_iterator_t *this, void **old_item, void *new_item)
static status_t replace(private_iterator_t *this, void **old_item, void *new_item)
{
if (this->current == NULL)
{
@@ -322,7 +305,7 @@ static status_t replace (private_iterator_t *this, void **old_item, void *new_it
}
if (old_item != NULL)
{
*old_item = this->current->value;
*old_item = this->hook(this->current->value);
}
this->current->value = new_item;
@@ -332,7 +315,7 @@ static status_t replace (private_iterator_t *this, void **old_item, void *new_it
/**
* Implementation of iterator_t.insert_after.
*/
static void insert_after(private_iterator_t * iterator, void *item)
static void insert_after(private_iterator_t *iterator, void *item)
{
if (iterator->current == NULL)
{
@@ -546,53 +529,57 @@ static status_t insert_at_position (private_linked_list_t *this,size_t position,
/**
* Implementation of linked_list_t.remove_at_position.
*/
static status_t remove_at_position (private_linked_list_t *this,size_t position, void **item)
static status_t remove_at_position(private_linked_list_t *this,size_t position, void **item)
{
iterator_t *iterator;
int i;
if (this->count <= position)
{
return INVALID_ARG;
}
iterator = this->public.create_iterator(&(this->public),TRUE);
iterator->has_next(iterator);
for (i = 0; i < position;i++)
iterator->iterate(iterator, item);
for (i = 0; i < position; i++)
{
iterator->has_next(iterator);
if (!iterator->iterate(iterator, item))
{
iterator->destroy(iterator);
return INVALID_ARG;
}
}
iterator->current(iterator,item);
iterator->remove(iterator);
iterator->destroy(iterator);
return SUCCESS;
}
/**
* Implementation of linked_list_t.get_at_position.
*/
static status_t get_at_position (private_linked_list_t *this,size_t position, void **item)
static status_t get_at_position(private_linked_list_t *this,size_t position, void **item)
{
int i;
iterator_t *iterator;
status_t status;
if (this->count <= position)
{
return INVALID_ARG;
}
iterator = this->public.create_iterator(&(this->public),TRUE);
iterator->has_next(iterator);
for (i = 0; i < position;i++)
iterator->iterate(iterator, item);
for (i = 0; i < position; i++)
{
iterator->has_next(iterator);
if (!iterator->iterate(iterator, item))
{
iterator->destroy(iterator);
return INVALID_ARG;
}
}
status = iterator->current(iterator,item);
iterator->destroy(iterator);
return status;
return SUCCESS;
}
/**
@@ -684,8 +671,7 @@ static iterator_t *create_iterator(private_linked_list_t *linked_list, bool forw
this->public.get_count = (bool (*) (iterator_t *this)) get_list_count;
this->public.iterate = (bool (*) (iterator_t *this, void **value)) iterate;
this->public.has_next = (bool (*) (iterator_t *this)) iterator_has_next;
this->public.current = (status_t (*) (iterator_t *this, void **value)) iterator_current;
this->public.set_iterator_hook = (void(*)(iterator_t *this, void*(*)(void*)))set_iterator_hook;
this->public.insert_before = (void (*) (iterator_t *this, void *item)) insert_before;
this->public.insert_after = (void (*) (iterator_t *this, void *item)) insert_after;
this->public.replace = (status_t (*) (iterator_t *, void **, void *)) replace;
@@ -697,6 +683,7 @@ static iterator_t *create_iterator(private_linked_list_t *linked_list, bool forw
this->current = NULL;
this->list = linked_list;
this->mutex = NULL;
this->hook = iterator_hook;
return &this->public;
}