struct SilcIDCacheListStruct {
SilcIDCacheEntry cache[64];
SilcIDCacheEntry *cache_dyn;
- uint32 cache_dyn_count;
- uint32 cache_count;
- uint32 pos;
+ SilcUInt32 cache_dyn_count;
+ SilcUInt32 cache_count;
+ SilcUInt32 pos;
+ bool dyn;
};
/* Allocates new ID cache object. The initial amount of allocated entries
The `id_type' defines the types of the ID's that will be saved to the
cache. */
-SilcIDCache silc_idcache_alloc(uint32 count, SilcIdType id_type,
+SilcIDCache silc_idcache_alloc(SilcUInt32 count, SilcIdType id_type,
SilcIDCacheDestructor destructor)
{
SilcIDCache cache;
cache = silc_calloc(1, sizeof(*cache));
cache->id_table = silc_hash_table_alloc(count, silc_hash_id,
- (void *)(uint32)id_type,
+ (void *)(SilcUInt32)id_type,
silc_hash_id_compare,
- (void *)(uint32)id_type,
+ (void *)(SilcUInt32)id_type,
silc_idcache_destructor, NULL,
FALSE);
cache->name_table = silc_hash_table_alloc(count, silc_hash_string, NULL,
the entry never expires from the cache. */
bool silc_idcache_add(SilcIDCache cache, char *name, void *id,
- void *context, int expire)
+ void *context, int expire, SilcIDCacheEntry *ret)
{
SilcIDCacheEntry c;
- uint32 curtime = time(NULL);
SILC_LOG_DEBUG(("Adding cache entry"));
c = silc_calloc(1, sizeof(*c));
c->id = id;
c->name = name;
- c->expire = (expire ? (curtime + SILC_ID_CACHE_EXPIRE) : 0);
+ c->expire = expire;
c->context = context;
/* Add the new entry to the hash tables */
silc_hash_table_rehash(cache->context_table, 0);
}
+ if (ret)
+ *ret = c;
+
return TRUE;
}
ret = silc_hash_table_del(cache->context_table, old->context);
if (old->id)
ret = silc_hash_table_del(cache->id_table, old->id);
+ else
+ silc_free(old);
return ret;
}
ret = silc_hash_table_del(cache->context_table, c->context);
if (c->id)
ret = silc_hash_table_del_by_context(cache->id_table, c->id, c);
+ else
+ silc_free(c);
return ret;
}
void *user_context)
{
SilcIDCache cache = (SilcIDCache)user_context;
- uint32 curtime = time(NULL);
+ SilcUInt32 curtime = time(NULL);
SilcIDCacheEntry c = (SilcIDCacheEntry)context;
if (c->expire && c->expire < curtime) {
/* Try to add to static cache */
if (!list->cache_dyn_count)
- for (i = 0; i < sizeof(list->cache); i++) {
+ for (i = 0; i < (sizeof(list->cache) / sizeof(list->cache[0])); i++) {
if (!list->cache[i]) {
list->cache[i] = cache;
list->cache_count++;
if (i >= list->cache_dyn_count) {
int k;
- i += 5;
+ i = list->cache_dyn_count;
list->cache_dyn = silc_realloc(list->cache_dyn,
- sizeof(*list->cache) * (i));
+ sizeof(*list->cache_dyn) * (i + 5));
/* NULL the reallocated area */
- for (k = list->cache_dyn_count; k < i; k++)
+ for (k = i; k < (i + 5); k++)
list->cache_dyn[k] = NULL;
- list->cache_dyn[list->cache_dyn_count] = cache;
- list->cache_dyn_count = i;
+ list->cache_dyn[i] = cache;
list->cache_count++;
+ list->cache_dyn_count += 5;
}
}
bool silc_idcache_list_next(SilcIDCacheList list, SilcIDCacheEntry *ret)
{
- int dyn = FALSE;
list->pos++;
- if (list->pos >= sizeof(list->cache)) {
+ if (!list->dyn &&
+ list->pos >= (sizeof(list->cache) / sizeof(list->cache[0]))) {
list->pos = 0;
- dyn = TRUE;
+ list->dyn = TRUE;
}
- if (dyn && list->pos >= list->cache_dyn_count)
+ if (list->dyn && list->pos >= list->cache_dyn_count)
return FALSE;
- if (!dyn && !list->cache[list->pos])
+ if (!list->dyn && !list->cache[list->pos])
return FALSE;
- if (dyn && !list->cache_dyn[list->pos])
+ if (list->dyn && !list->cache_dyn[list->pos])
return FALSE;
if (ret) {
- if (!dyn)
+ if (!list->dyn)
*ret = list->cache[list->pos];
else
*ret = list->cache_dyn[list->pos];