X-Git-Url: http://the.earth.li/gitweb/?a=blobdiff_plain;f=keydb.c;h=3fe3d34d85afe8632e9426b2e08a3ea23bdb897e;hb=2edb917ed0be24b4a525bef5aa346389afbd1be3;hp=c5b07c628dfd2040d3152311dc85bec31ce729ad;hpb=656bb5c3981ae175698ff8782c7ec39e1f6451d1;p=onak.git

diff --git a/keydb.c b/keydb.c
index c5b07c6..3fe3d34 100644
--- a/keydb.c
+++ b/keydb.c
@@ -16,9 +16,10 @@
 
 #include <stdio.h>
 
+#include "decodekey.h"
+#include "hash.h"
 #include "keydb.h"
 #include "keyid.h"
-#include "keyindex.h"
 #include "keystructs.h"
 #include "mem.h"
 #include "parsekey.h"
@@ -83,13 +84,52 @@ struct ll *getkeysigs(uint64_t keyid)
 }
 #endif
 
+/**
+ *	cached_getkeysigs - Gets the signatures on a key.
+ *	@keyid: The key we want the signatures for.
+ *	
+ *	This function gets the signatures on a key. It's the same as the
+ *	getkeysigs function above except we use the hash module to cache the
+ *	data so if we need it again it's already loaded.
+ */
+struct ll *cached_getkeysigs(uint64_t keyid)
+{
+	struct stats_key *key = NULL;
+
+	if (keyid == 0)  {
+		return NULL;
+	}
+
+	key = findinhash(keyid);
+	if (key == NULL) {
+		key = malloc(sizeof(*key));
+		if (key != NULL) {
+			key->keyid = keyid;
+			key->colour = 0;
+			key->parent = 0;
+			key->sigs = NULL;
+			key->gotsigs = false;
+			addtohash(key);
+		} else {
+			perror("cached_getkeysigs()");
+			return NULL;
+		}
+	}
+	if (key->gotsigs == false) {
+		key->sigs = getkeysigs(key->keyid);
+		key->gotsigs = true;
+	}
+
+	return key->sigs;
+}
+
 #ifdef NEED_GETFULLKEYID
 /**
  *	getfullkeyid - Maps a 32bit key id to a 64bit one.
  *	@keyid: The 32bit keyid.
  *
  *	This function maps a 32bit key id to the full 64bit one. It returns the
- *	full keyid.
+ *	full keyid. If the key isn't found a keyid of 0 is returned.
  */
 uint64_t getfullkeyid(uint64_t keyid)
 {
@@ -97,8 +137,13 @@ uint64_t getfullkeyid(uint64_t keyid)
 
 	if (keyid < 0x100000000LL) {
 		fetch_key(keyid, &publickey, false);
-		keyid = get_keyid(publickey);
-		free_publickey(publickey);
+		if (publickey != NULL) {
+			keyid = get_keyid(publickey);
+			free_publickey(publickey);
+			publickey = NULL;
+		} else {
+			keyid = 0;
+		}
 	}
 	
 	return keyid;