sharpetronics/strongswan
1
0
Fork 0
mirror of https://github.com/strongswan/strongswan.git synced 2025-10-08 00:02:03 -04:00
Code Issues Projects Releases Wiki Activity

mem-pool: Remove entries without online or offline leases

Browse Source 
This avoids filling up the hash table with unused/old identities.

References #841.
This commit is contained in:
Tobias Brunner 2015-03-11 11:27:38 +01:00
parent f30be6a92f
commit 7d02f8dbf4
1 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/libcharon/attributes/mem_pool.c
View File

@ -109,6 +109,17 @@ static entry_t* entry_create(identification_t *id)
return entry; return entry;
} }
/**
* Destroy an entry
*/
static void entry_destroy(entry_t *this)
{
this->id->destroy(this->id);
array_destroy(this->online);
array_destroy(this->offline);
free(this);
}
/** /**
* hashtable hash function for identities * hashtable hash function for identities
*/ */
@ -356,8 +367,16 @@ static int get_reassigned(private_mem_pool_t *this, identification_t *id,
if (array_remove(entry->offline, ARRAY_HEAD, &current)) if (array_remove(entry->offline, ARRAY_HEAD, &current))
{ {
lease.offset = current; lease.offset = current;
DBG1(DBG_CFG, "reassigning existing offline lease by '%Y'" DBG1(DBG_CFG, "reassigning existing offline lease by '%Y' "
" to '%Y'", entry->id, id); "to '%Y'", entry->id, id);
}
if (!array_count(entry->online) && !array_count(entry->offline))
{
this->leases->remove_at(this->leases, enumerator);
entry_destroy(entry);
}
if (lease.offset)
{
break; break;
} }
} }
@ -570,10 +589,7 @@ METHOD(mem_pool_t, destroy, void,
enumerator = this->leases->create_enumerator(this->leases); enumerator = this->leases->create_enumerator(this->leases);
while (enumerator->enumerate(enumerator, NULL, &entry)) while (enumerator->enumerate(enumerator, NULL, &entry))
{ {
entry->id->destroy(entry->id); entry_destroy(entry);
array_destroy(entry->online);
array_destroy(entry->offline);
free(entry);
} }
enumerator->destroy(enumerator); enumerator->destroy(enumerator);