X-Git-Url: http://git.silcnet.org/gitweb/?p=silc.git;a=blobdiff_plain;f=lib%2Fsilcapputil%2Fsilcidcache.c;h=f549b770b4a3a007efb24e3a02a1af4c090eb6e5;hp=0c733276ddc4cd9d743d17920c3e0fe46627db05;hb=805fddcf6431e784f9f77114782a90c9d12f9cbe;hpb=71d1fefe6029e201edca6a93f39a0646a40c294b diff --git a/lib/silcapputil/silcidcache.c b/lib/silcapputil/silcidcache.c index 0c733276..f549b770 100644 --- a/lib/silcapputil/silcidcache.c +++ b/lib/silcapputil/silcidcache.c @@ -4,7 +4,7 @@ Author: Pekka Riikonen - Copyright (C) 2000 - 2006 Pekka Riikonen + Copyright (C) 2000 - 2008 Pekka Riikonen This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -78,15 +78,15 @@ SilcIDCache silc_idcache_alloc(SilcUInt32 count, SilcIdType id_type, if (!cache) return NULL; - cache->id_table = silc_hash_table_alloc(count, silc_hash_id, + cache->id_table = silc_hash_table_alloc(NULL, count, silc_hash_id, SILC_32_TO_PTR(id_type), silc_hash_id_compare, SILC_32_TO_PTR(id_type), NULL, NULL, TRUE); - cache->name_table = silc_hash_table_alloc(count, silc_hash_utf8_string, NULL, - silc_hash_utf8_compare, NULL, + cache->name_table = silc_hash_table_alloc(NULL, count, silc_hash_utf8_string, + NULL, silc_hash_utf8_compare, NULL, NULL, NULL, TRUE); - cache->context_table = silc_hash_table_alloc(count, silc_hash_ptr, NULL, + cache->context_table = silc_hash_table_alloc(NULL, count, silc_hash_ptr, NULL, NULL, NULL, NULL, NULL, TRUE); cache->destructor = destructor; cache->context = destructor_context; @@ -123,7 +123,9 @@ silc_idcache_add(SilcIDCache cache, char *name, void *id, void *context) { SilcIDCacheEntry c; - if (!id) + if (!cache) + return NULL; + if (!name && !id && !context) return NULL; /* Allocate new cache entry */ @@ -137,16 +139,19 @@ silc_idcache_add(SilcIDCache cache, char *name, void *id, void *context) SILC_LOG_DEBUG(("Adding cache entry %p", c)); - /* Add the new entry to the hash tables */ - if (id) { + /* See if this entry is added already to cache */ if (silc_idcache_find_by_id_one(cache, id, NULL)) { - SILC_LOG_ERROR(("Attempted to add same ID twice to ID Cache")); + SILC_LOG_DEBUG(("Attempted to add same ID twice to ID Cache, id %s", + silc_id_render(id, cache->id_type))); goto err; } + } + + /* Add the new entry to the hash tables */ + if (id) if (!silc_hash_table_add(cache->id_table, id, c)) goto err; - } if (name) if (!silc_hash_table_add(cache->name_table, name, c)) goto err; @@ -175,6 +180,9 @@ SilcBool silc_idcache_del(SilcIDCache cache, SilcIDCacheEntry entry, { SilcBool ret = FALSE; + if (!cache) + return FALSE; + SILC_LOG_DEBUG(("Deleting cache entry %p", entry)); if (entry->name) @@ -200,7 +208,10 @@ SilcBool silc_idcache_del_by_id(SilcIDCache cache, void *id, { SilcIDCacheEntry c; - if (!silc_hash_table_find(cache->id_table, id, NULL, (void **)&c)) + if (!cache) + return FALSE; + + if (!silc_hash_table_find(cache->id_table, id, NULL, (void *)&c)) return FALSE; return silc_idcache_del(cache, c, app_context); @@ -213,7 +224,10 @@ SilcBool silc_idcache_del_by_context(SilcIDCache cache, void *context, { SilcIDCacheEntry c; - if (!silc_hash_table_find(cache->context_table, context, NULL, (void **)&c)) + if (!cache) + return FALSE; + + if (!silc_hash_table_find(cache->context_table, context, NULL, (void *)&c)) return FALSE; return silc_idcache_del(cache, c, app_context); @@ -225,24 +239,33 @@ SilcBool silc_idcache_update(SilcIDCache cache, SilcIDCacheEntry entry, void *new_id, char *new_name, SilcBool free_old_name) { - if (new_id) { - if (!silc_hash_table_del_by_context(cache->id_table, entry->id, entry)) - return FALSE; + if (!cache) + return FALSE; - if (cache->id_type == SILC_ID_CLIENT) - *(SilcClientID *)entry->id = *(SilcClientID *)new_id; - if (cache->id_type == SILC_ID_SERVER) - *(SilcServerID *)entry->id = *(SilcServerID *)new_id; - if (cache->id_type == SILC_ID_CHANNEL) - *(SilcChannelID *)entry->id = *(SilcChannelID *)new_id; + if (new_id) { + if (entry->id) { + if (!silc_hash_table_del_by_context(cache->id_table, entry->id, entry)) + return FALSE; + + if (cache->id_type == SILC_ID_CLIENT) + *(SilcClientID *)entry->id = *(SilcClientID *)new_id; + if (cache->id_type == SILC_ID_SERVER) + *(SilcServerID *)entry->id = *(SilcServerID *)new_id; + if (cache->id_type == SILC_ID_CHANNEL) + *(SilcChannelID *)entry->id = *(SilcChannelID *)new_id; + } else { + entry->id = new_id; + } if (!silc_hash_table_add(cache->id_table, entry->id, entry)) return FALSE; } if (new_name) { - if (!silc_hash_table_del_by_context(cache->name_table, entry->name, entry)) - return FALSE; + if (entry->name) + if (!silc_hash_table_del_by_context(cache->name_table, entry->name, + entry)) + return FALSE; if (free_old_name) silc_free(entry->name); @@ -263,22 +286,90 @@ SilcBool silc_idcache_update_by_context(SilcIDCache cache, void *context, { SilcIDCacheEntry c; - if (!silc_hash_table_find(cache->context_table, context, NULL, (void **)&c)) + if (!cache) + return FALSE; + + if (!silc_hash_table_find(cache->context_table, context, NULL, (void *)&c)) return FALSE; return silc_idcache_update(cache, c, new_id, new_name, free_old_name); } +/* Move entry to another cache */ + +SilcBool silc_idcache_move(SilcIDCache from_cache, SilcIDCache to_cache, + SilcIDCacheEntry entry) +{ + SilcIDCacheEntry c; + + SILC_LOG_DEBUG(("Moving entry %p from %p cache to %p cache", entry, + from_cache, to_cache)); + + if (!from_cache || !to_cache || !entry) + return FALSE; + + if (from_cache->id_type != to_cache->id_type) { + SILC_LOG_ERROR(("Incompatible ID caches, cannot move entry")); + return FALSE; + } + + if (entry->context) { + if (!silc_hash_table_find(from_cache->context_table, entry->context, + NULL, (void *)&c)) + return FALSE; + } else if (entry->name) { + if (!silc_hash_table_find(from_cache->name_table, entry->name, + NULL, (void *)&c)) + return FALSE; + } else if (entry->id) { + if (!silc_hash_table_find(from_cache->id_table, entry->id, + NULL, (void *)&c)) + return FALSE; + } else { + return FALSE; + } + + if (entry != c) + return FALSE; + + /* See if this entry is added already to cache */ + if (c->id && silc_idcache_find_by_id_one(to_cache, c->id, NULL)) { + SILC_LOG_ERROR(("Attempted to add same ID twice to ID Cache, id %s", + silc_id_render(c->id, to_cache->id_type))); + SILC_ASSERT(FALSE); + return FALSE; + } + + /* Remove from original cache */ + if (c->name) + silc_hash_table_del_by_context(from_cache->name_table, c->name, c); + if (c->context) + silc_hash_table_del_by_context(from_cache->context_table, c->context, c); + if (c->id) + silc_hash_table_del_by_context(from_cache->id_table, c->id, c); + + /* Move to the other cache */ + if (c->id) + silc_hash_table_add(to_cache->id_table, c->id, c); + if (c->name) + silc_hash_table_add(to_cache->name_table, c->name, c); + if (c->context) + silc_hash_table_add(to_cache->context_table, c->context, c); + + return TRUE; +} + /* Returns all cache entrys from the ID cache to the `ret' ID Cache List. */ SilcBool silc_idcache_get_all(SilcIDCache cache, SilcList *ret_list) { - if (!ret_list) + if (!cache || !ret_list) return FALSE; if (!silc_hash_table_count(cache->id_table)) return FALSE; + silc_list_init(*ret_list, struct SilcIDCacheEntryStruct, next); silc_hash_table_foreach(cache->id_table, silc_idcache_get_all_foreach, ret_list); @@ -293,12 +384,13 @@ SilcBool silc_idcache_get_all(SilcIDCache cache, SilcList *ret_list) SilcBool silc_idcache_find_by_id(SilcIDCache cache, void *id, SilcList *ret_list) { - if (!ret_list) + if (!cache || !ret_list) return FALSE; if (!silc_hash_table_count(cache->id_table)) return FALSE; + silc_list_init(*ret_list, struct SilcIDCacheEntryStruct, next); silc_hash_table_find_foreach(cache->id_table, id, silc_idcache_get_all_foreach, ret_list); @@ -313,6 +405,8 @@ SilcBool silc_idcache_find_by_id(SilcIDCache cache, void *id, SilcBool silc_idcache_find_by_id_one(SilcIDCache cache, void *id, SilcIDCacheEntry *ret) { + if (!cache) + return FALSE; return silc_hash_table_find_ext(cache->id_table, id, NULL, (void *)ret, NULL, NULL, silc_hash_id_compare_full, @@ -324,6 +418,8 @@ SilcBool silc_idcache_find_by_id_one(SilcIDCache cache, void *id, SilcBool silc_idcache_find_by_context(SilcIDCache cache, void *context, SilcIDCacheEntry *ret) { + if (!cache) + return FALSE; return silc_hash_table_find(cache->context_table, context, NULL, (void *)ret); } @@ -333,12 +429,13 @@ SilcBool silc_idcache_find_by_context(SilcIDCache cache, void *context, SilcBool silc_idcache_find_by_name(SilcIDCache cache, char *name, SilcList *ret_list) { - if (!ret_list) + if (!cache || !ret_list) return FALSE; if (!silc_hash_table_count(cache->name_table)) return FALSE; + silc_list_init(*ret_list, struct SilcIDCacheEntryStruct, next); silc_hash_table_find_foreach(cache->name_table, name, silc_idcache_get_all_foreach, ret_list); @@ -353,5 +450,7 @@ SilcBool silc_idcache_find_by_name(SilcIDCache cache, char *name, SilcBool silc_idcache_find_by_name_one(SilcIDCache cache, char *name, SilcIDCacheEntry *ret) { + if (!cache) + return FALSE; return silc_hash_table_find(cache->name_table, name, NULL, (void *)ret); }