pass identity to release_address(), allows providers to do a lookup by id

This commit is contained in:
Martin Willi
2008-12-05 09:40:50 +00:00
parent c333bb4678
commit 876d5c63a3
7 changed files with 13 additions and 11 deletions
+2 -2
View File
@@ -210,7 +210,7 @@ static host_t* acquire_address(private_sql_attribute_t *this,
* Implementation of attribute_provider_t.release_address
*/
static bool release_address(private_sql_attribute_t *this,
char *name, host_t *address)
char *name, host_t *address, identification_t *id)
{
enumerator_t *enumerator;
bool found = FALSE;
@@ -264,7 +264,7 @@ sql_attribute_t *sql_attribute_create(database_t *db)
time_t now = time(NULL);
this->public.provider.acquire_address = (host_t*(*)(attribute_provider_t *this, char*, identification_t *,auth_info_t *, host_t *))acquire_address;
this->public.provider.release_address = (bool(*)(attribute_provider_t *this, char*,host_t *))release_address;
this->public.provider.release_address = (bool(*)(attribute_provider_t *this, char*,host_t *, identification_t*))release_address;
this->public.destroy = (void(*)(sql_attribute_t*))destroy;
this->db = db;
+2 -2
View File
@@ -203,7 +203,7 @@ static host_t* acquire_address(private_stroke_attribute_t *this,
* Implementation of attribute_provider_t.release_address
*/
static bool release_address(private_stroke_attribute_t *this,
char *name, host_t *address)
char *name, host_t *address, identification_t *id)
{
pool_t *pool;
bool found = FALSE;
@@ -327,7 +327,7 @@ stroke_attribute_t *stroke_attribute_create()
private_stroke_attribute_t *this = malloc_thing(private_stroke_attribute_t);
this->public.provider.acquire_address = (host_t*(*)(attribute_provider_t *this, char*, identification_t *,auth_info_t *, host_t *))acquire_address;
this->public.provider.release_address = (bool(*)(attribute_provider_t *this, char*,host_t *))release_address;
this->public.provider.release_address = (bool(*)(attribute_provider_t *this, char*,host_t *, identification_t*))release_address;
this->public.add_pool = (void(*)(stroke_attribute_t*, stroke_msg_t *msg))add_pool;
this->public.del_pool = (void(*)(stroke_attribute_t*, stroke_msg_t *msg))del_pool;
this->public.destroy = (void(*)(stroke_attribute_t*))destroy;
@@ -60,7 +60,7 @@ static void* testing(void *thread)
/* release addresses */
for (i = 0; i < ALLOCS; i++)
{
charon->attributes->release_address(charon->attributes, "test", addr[i]);
charon->attributes->release_address(charon->attributes, "test", addr[i], id[i]);
}
/* cleanup */