X-Git-Url: https://git.sommitrealweird.co.uk/onak.git/blobdiff_plain/e3ee7975fc8f8b343390272663b8c644030b17c1..efdb27e3516c0de570a7a1476d15c4e84ac0d25c:/stats.c?ds=sidebyside

diff --git a/stats.c b/stats.c
index 61b5278..e009de5 100644
--- a/stats.c
+++ b/stats.c
@@ -9,10 +9,12 @@
 #include <stdio.h>
 #include <stdlib.h>
 
+#include "cleanup.h"
 #include "getcgi.h"
 #include "hash.h"
 #include "keydb.h"
 #include "ll.h"
+#include "onak-conf.h"
 #include "stats.h"
 
 /**
@@ -24,7 +26,7 @@
  */
 void initcolour(bool parent)
 {
-	unsigned long loop;
+	unsigned int loop;
 	struct ll *curkey;
 
 	/*
@@ -60,21 +62,22 @@ unsigned long findpath(struct stats_key *have, struct stats_key *want)
 	struct ll *sigs = NULL;
 	struct ll *nextkeys = NULL;
 	long curdegree = 0;
-	long count = 0;
+	unsigned long count = 0;
 	
 	curdegree = 1;
 	keys = lladd(NULL, want);
 	oldkeys = keys;
 
-	while (keys != NULL && have->colour == 0) {
-		sigs = cached_getkeysigs(((struct stats_key *)
+	while ((!cleanup()) && keys != NULL && have->colour == 0) {
+		sigs = config.dbbackend->cached_getkeysigs(((struct stats_key *)
 					keys->object)->keyid);
-		while (sigs != NULL && have->colour == 0) {
+		while ((!cleanup()) && sigs != NULL && have->colour == 0) {
 			/*
 			 * Check if we've seen this key before and if not mark
 			 * it and add its sigs to the list we want to look at.
 			 */
 			if (!((struct stats_key *)sigs->object)->disabled &&
+			    !((struct stats_key *)sigs->object)->revoked &&
 			    ((struct stats_key *)sigs->object)->colour == 0) {
 				count++;
 				((struct stats_key *)sigs->object)->colour =
@@ -126,27 +129,27 @@ void dofindpath(uint64_t have, uint64_t want, bool html, int count)
 	int pathnum;
 	char *uid;
 
-	fullhave = getfullkeyid(have);
-	fullwant = getfullkeyid(want);
+	fullhave = config.dbbackend->getfullkeyid(have);
+	fullwant = config.dbbackend->getfullkeyid(want);
 
 	/*
 	 * Make sure the keys we have and want are in the cache.
 	 */
-	cached_getkeysigs(fullhave);
-	cached_getkeysigs(fullwant);
+	(void) config.dbbackend->cached_getkeysigs(fullhave);
+	(void) config.dbbackend->cached_getkeysigs(fullwant);
 
 	if ((keyinfoa = findinhash(fullhave)) == NULL) {
-		printf("Couldn't find key 0x%llX.\n", have);
+		printf("Couldn't find key 0x%" PRIX64 ".\n", have);
 		return;
 	}
 	if ((keyinfob = findinhash(fullwant)) == NULL) {
-		printf("Couldn't find key 0x%llX.\n", want);
+		printf("Couldn't find key 0x%" PRIX64 ".\n", want);
 		return;
 	}
 
 	pathnum = 0;
 	
-	while (pathnum < count) {
+	while ((!cleanup()) && (pathnum < count)) {
 		/*
 		 * Fill the tree info up.
 		 */
@@ -160,22 +163,31 @@ void dofindpath(uint64_t have, uint64_t want, bool html, int count)
 			hashelements(),
 			html ? "<BR>" : "");
 		if (keyinfoa->colour == 0) {
-			printf("Can't find a link from 0x%08llX to 0x%08llX"
-				"%s\n",
+			if (pathnum == 0) {
+				printf("Can't find a link from 0x%08" PRIX64
+				" to 0x%08" PRIX64 "%s\n",
 				have,
 				want,
 				html ? "<BR>" : "");
+			} else {
+				printf("Can't find any further paths%s\n",
+					html ? "<BR>" : "");
+			}
+			pathnum = count;
 		} else {
-			printf("%d steps from 0x%08llX to 0x%08llX%s\n",
+			printf("%d steps from 0x%08" PRIX64 " to 0x%08" PRIX64
+				"%s\n",
 				keyinfoa->colour, have & 0xFFFFFFFF,
 				want & 0xFFFFFFFF,
 				html ? "<BR>" : "");
 			curkey = keyinfoa;
 			while (curkey != NULL && curkey->keyid != 0) {
-				uid = keyid2uid(curkey->keyid);
+				uid = config.dbbackend->keyid2uid(
+						curkey->keyid);
 				if (html && uid == NULL) {
 					printf("<a href=\"lookup?op=get&search="
-						"0x%08llX\">0x%08llX</a> (["
+						"0x%08" PRIX64 "\">0x%08" PRIX64
+						"</a> (["
 						"User id not found])%s<BR>\n",
 						curkey->keyid & 0xFFFFFFFF,
 						curkey->keyid & 0xFFFFFFFF,
@@ -183,9 +195,11 @@ void dofindpath(uint64_t have, uint64_t want, bool html, int count)
 							"" : " signs");
 				} else if (html && uid != NULL) {
 					printf("<a href=\"lookup?op=get&search="
-						"0x%08llX\">0x%08llX</a>"
+						"0x%08" PRIX64 "\">0x%08"
+						PRIX64 "</a>"
 						" (<a href=\"lookup?op=vindex&"
-						"search=0x%08llX\">%s</a>)%s"
+						"search=0x%08" PRIX64 
+						"\">%s</a>)%s"
 						"<BR>\n",
 						curkey->keyid & 0xFFFFFFFF,
 						curkey->keyid & 0xFFFFFFFF,
@@ -194,7 +208,7 @@ void dofindpath(uint64_t have, uint64_t want, bool html, int count)
 						(curkey->keyid == fullwant) ?
 						"" : " signs");
 				} else {
-					printf("0x%08llX (%s)%s\n",
+					printf("0x%08" PRIX64 " (%s)%s\n",
 						curkey->keyid & 0xFFFFFFFF,
 						(uid == NULL) ?
 							"[User id not found]" :
@@ -218,17 +232,11 @@ void dofindpath(uint64_t have, uint64_t want, bool html, int count)
 			}
 			curkey = keyinfoa;
 			while (curkey != NULL && curkey->keyid != 0) {
-				printf("0x%08llX ", curkey->keyid & 0xFFFFFFFF);
+				printf("0x%08" PRIX64 " ",
+						curkey->keyid & 0xFFFFFFFF);
 				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);
-			}
 		}
 		pathnum++;
 	}
@@ -255,7 +263,7 @@ struct stats_key *furthestkey(struct stats_key *have)
 	curll = lladd(NULL, have);
 
 	while (curll != NULL) {
-		sigs = cached_getkeysigs(((struct stats_key *)
+		sigs = config.dbbackend->cached_getkeysigs(((struct stats_key *)
 				curll->object)->keyid);
 		while (sigs != NULL) {
 			if (((struct stats_key *) sigs->object)->colour == 0) {