X-Git-Url: http://git.silcnet.org/gitweb/?a=blobdiff_plain;f=lib%2Fsilcapputil%2Fsilcidcache.c;h=a6d8c26edeb7e4a49ad77917f76deb19c8f1e185;hb=52e57c880aba9c5e89f59d962eb9af75670b76e0;hp=c0824b2cd5a373bd759f47a92f812a2ba5f9abd8;hpb=88b30aa0a8625b2cdee0ea1e125dd0f205274ff0;p=silc.git

diff --git a/lib/silcapputil/silcidcache.c b/lib/silcapputil/silcidcache.c
index c0824b2c..a6d8c26e 100644
--- a/lib/silcapputil/silcidcache.c
+++ b/lib/silcapputil/silcidcache.c
@@ -4,7 +4,7 @@
 
   Author: Pekka Riikonen <priikone@silcnet.org>
 
-  Copyright (C) 2000 - 2006 Pekka Riikonen
+  Copyright (C) 2000 - 2007 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
@@ -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,18 +139,20 @@ 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, id %s",
-		     silc_id_render(id, cache->id_type)));
+		      silc_id_render(id, cache->id_type)));
       SILC_ASSERT(FALSE);
       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;
@@ -177,6 +181,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)
@@ -202,7 +209,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);
@@ -215,7 +225,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);
@@ -227,24 +240,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);
@@ -265,22 +287,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);
 
@@ -295,12 +385,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);
 
@@ -315,6 +406,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,
@@ -326,6 +419,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);
 }
@@ -335,12 +430,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);
 
@@ -355,5 +451,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);
 }