X-Git-Url: https://git.sommitrealweird.co.uk/onak.git/blobdiff_plain/34b03028378025ad22c8d29f70e81109cee690c2..2edb917ed0be24b4a525bef5aa346389afbd1be3:/stats.c

diff --git a/stats.c b/stats.c
index 3f897ca..2e63479 100644
--- a/stats.c
+++ b/stats.c
@@ -67,7 +67,7 @@ unsigned long findpath(struct stats_key *have, struct stats_key *want)
 	oldkeys = keys;
 
 	while (keys != NULL && have->colour == 0) {
-		sigs = hash_getkeysigs(((struct stats_key *)
+		sigs = cached_getkeysigs(((struct stats_key *)
 					keys->object)->keyid);
 		while (sigs != NULL && have->colour == 0) {
 			/*
@@ -129,8 +129,8 @@ void dofindpath(uint64_t have, uint64_t want, bool html)
 	/*
 	 * Make sure the keys we have and want are in the cache.
 	 */
-	hash_getkeysigs(fullhave);
-	hash_getkeysigs(fullwant);
+	cached_getkeysigs(fullhave);
+	cached_getkeysigs(fullwant);
 
 	if ((keyinfoa = findinhash(fullhave)) == NULL) {
 		printf("Couldn't find key 0x%llX.\n", have);
@@ -165,30 +165,30 @@ void dofindpath(uint64_t have, uint64_t want, bool html)
 		while (curkey != NULL && curkey->keyid != 0) {
 			uid = keyid2uid(curkey->keyid);
 			if (html && uid == NULL) {
-				printf("<a href=\"lookup?op=get&search=%llX\">"
-					"0x%08llX</a> ([User id not found])%s"
-					"<BR>\n",
+				printf("<a href=\"lookup?op=get&search="
+					"0x%08llX\">0x%08llX</a> ([User id"
+					" not found])%s<BR>\n",
 					curkey->keyid & 0xFFFFFFFF,
 					curkey->keyid & 0xFFFFFFFF,
-					(curkey->keyid == want) ? "" :
+					(curkey->keyid == fullwant) ? "" :
 					 " signs");
 			} else if (html && uid != NULL) {
-				printf("<a href=\"lookup?op=get&search=%llX\">"
-					"0x%08llX</a>"
+				printf("<a href=\"lookup?op=get&search="
+					"0x%08llX\">0x%08llX</a>"
 					" (<a href=\"lookup?op=vindex"
-					"&search=0x%llX\">%s</a>)%s<BR>\n",
+					"&search=0x%08llX\">%s</a>)%s<BR>\n",
 					curkey->keyid & 0xFFFFFFFF,
 					curkey->keyid & 0xFFFFFFFF,
 					curkey->keyid & 0xFFFFFFFF,
 					txt2html(uid),
-					(curkey->keyid == want) ? "" :
+					(curkey->keyid == fullwant) ? "" :
 					 " signs");
 			} else {
 				printf("0x%08llX (%s)%s\n",
 					curkey->keyid & 0xFFFFFFFF,
 					(uid == NULL) ? "[User id not found]" :
 						uid,
-					(curkey->keyid == want) ? "" :
+					(curkey->keyid == fullwant) ? "" :
 					 " signs");
 			}
 			if (uid != NULL) {
@@ -208,6 +208,13 @@ void dofindpath(uint64_t have, uint64_t want, bool html)
 			curkey = findinhash(curkey->parent);
 		}
 		putchar('\n');
+		if (html) {
+			printf("<BR>"
+				"<A HREF=\"gpgwww?from=0x%08llX&to=0x%08llX\">"
+					"Find reverse path</A>\n",
+					want,
+					have);
+		}
 	}
 }
 
@@ -232,7 +239,7 @@ struct stats_key *furthestkey(struct stats_key *have)
 	curll = lladd(NULL, have);
 
 	while (curll != NULL) {
-		sigs = hash_getkeysigs(((struct stats_key *)
+		sigs = cached_getkeysigs(((struct stats_key *)
 				curll->object)->keyid);
 		while (sigs != NULL) {
 			if (((struct stats_key *) sigs->object)->colour == 0) {