/*
- $Id: cache.c,v 1.2 2009-11-28 12:30:12 franklahm Exp $
+ $Id: cache.c,v 1.6 2010-04-23 11:37:05 franklahm Exp $
Copyright (c) 2008,2009 Frank Lahm <franklahm@gmail.com>
This program is free software; you can redistribute it and/or modify
continue;
if (strftime(timestr, 200, "%c", tmp) == 0)
continue;
- LOG(log_debug9, logtype_default, "namecache{%d}]: name:%s, uuid:%s, cached: %s", i, entry->name, uuidstring, timestr);
+ LOG(log_debug9, logtype_default, "namecache{%d}: name:%s, uuid:%s, type: %s, cached: %s",
+ i, entry->name, uuidstring, uuidtype[entry->type], timestr);
free(uuidstring);
} while ((entry = entry->next) != NULL);
}
continue;
if (strftime(timestr, 200, "%c", tmp) == 0)
continue;
- LOG(log_debug9, logtype_default, "uuidcache{%d}: uuid:%s, name:%s, type:%d, cached: %s", i, uuidstring, entry->name, entry->type,timestr);
+ LOG(log_debug9, logtype_default, "uuidcache{%d}: uuid:%s, name:%s, type: %s, cached: %s",
+ i, uuidstring, entry->name, uuidtype[entry->type], timestr);
free(uuidstring);
} while ((entry = entry->next) != NULL);
}
return index;
}
-/* hash uuid_t into unsigned char */
+/* hash atalk_uuid_t into unsigned char */
static unsigned char hashuuid(uuidp_t uuid) {
unsigned char index = 83;
int i;
cacheduser_t *entry;
unsigned char hash;
+#ifdef DEBUG
+ dumpcache();
+#endif
+
/* allocate mem and copy values */
name = malloc(strlen(inname)+1);
if (!name) {
if (cacheduser)
free(cacheduser);
}
+
+#ifdef DEBUG
+ dumpcache();
+#endif
+
return ret;
}
cacheduser_t *entry;
time_t tim;
+#ifdef DEBUG
+ dumpcache();
+#endif
+
hash = hashstring((unsigned char *)name);
if (! namecache[hash])
/* found, now check if expired */
tim = time(NULL);
if ((tim - entry->creationtime) > CACHESECONDS) {
+ LOG(log_debug, logtype_default, "search_cachebyname: expired: name:\'%s\' in queue {%d}", entry->name, hash);
/* remove item */
if (entry->prev) /* 2nd to last in queue */
entry->prev->next = entry->next;
- else /* queue head */
- namecache[hash] = entry->next;
+ else { /* queue head */
+ if ((namecache[hash] = entry->next) != NULL)
+ namecache[hash]->prev = NULL;
+ }
free(entry->name);
free(entry->uuid);
free(entry);
+#ifdef DEBUG
+ dumpcache();
+#endif
return -1;
} else {
memcpy(uuid, entry->uuid, UUID_BINSIZE);
+#ifdef DEBUG
+ dumpcache();
+#endif
return 0;
}
}
entry = entry->next;
}
+#ifdef DEBUG
+ dumpcache();
+#endif
return -1;
}
cacheduser_t *entry;
time_t tim;
+#ifdef DEBUG
+ dumpcache();
+#endif
+
hash = hashuuid(uuidp);
if (! uuidcache[hash])
if (ret == 0) {
tim = time(NULL);
if ((tim - entry->creationtime) > CACHESECONDS) {
- LOG(log_info, logtype_default, "search_cachebyuuid: expired: name:\'%s\' in queue {%d}", entry->name, hash);
- if (entry->prev)
+ LOG(log_debug, logtype_default, "search_cachebyuuid: expired: name:\'%s\' in queue {%d}", entry->name, hash);
+ if (entry->prev) /* 2nd to last in queue */
entry->prev->next = entry->next;
- else
- uuidcache[hash] = entry->next;
+ else { /* queue head */
+ if ((uuidcache[hash] = entry->next) != NULL)
+ uuidcache[hash]->prev = NULL;
+ }
free(entry->name);
free(entry->uuid);
free(entry);
+#ifdef DEBUG
+ dumpcache();
+#endif
return -1;
} else {
*name = malloc(strlen(entry->name)+1);
strcpy(*name, entry->name);
*type = entry->type;
+#ifdef DEBUG
+ dumpcache();
+#endif
return 0;
}
}
entry = entry->next;
}
+#ifdef DEBUG
+ dumpcache();
+#endif
+
return -1;
}
cacheduser_t *entry;
unsigned char hash;
+#ifdef DEBUG
+ dumpcache();
+#endif
+
/* allocate mem and copy values */
name = malloc(strlen(inname)+1);
if (!name) {
if (cacheduser)
free(cacheduser);
}
+
+#ifdef DEBUG
+ dumpcache();
+#endif
+
return ret;
}