Author: Pekka Riikonen <priikone@silcnet.org>
- 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
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;
{
SilcIDCacheEntry c;
- if (!id)
+ if (!cache)
+ return NULL;
+ if (!name && !id && !context)
return NULL;
/* Allocate new cache entry */
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, id %s",
- silc_id_render(id, cache->id_type)));
- SILC_ASSERT(FALSE);
+ 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;
{
SilcBool ret = FALSE;
+ if (!cache)
+ return FALSE;
+
SILC_LOG_DEBUG(("Deleting cache entry %p", entry));
if (entry->name)
{
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);
{
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);
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);
{
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))
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))
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,
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);
}
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))
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);
}
projects / silc.git / blobdiff