X-Git-Url: https://git.sommitrealweird.co.uk/onak.git/blobdiff_plain/4c697995f8aa32c5ab1474509691d100e5f06a3f..5b3f77c7fbafb036d20a1577ed74f475e94ed821:/sixdegrees.c

diff --git a/sixdegrees.c b/sixdegrees.c
index 128e8f3..d4e55c1 100644
--- a/sixdegrees.c
+++ b/sixdegrees.c
@@ -13,13 +13,15 @@
 #include "keydb.h"
 #include "keystructs.h"
 #include "ll.h"
+#include "log.h"
 #include "onak-conf.h"
 #include "stats.h"
 
-unsigned long countdegree(struct stats_key *have, int maxdegree)
+unsigned long countdegree(struct stats_key *have, bool sigs, int maxdegree)
 {
-	unsigned long count = 0, curdegree = 0;
-	struct ll *curll, *nextll, *sigll, *tmp;
+	unsigned long     count = 0, curdegree = 0;
+	struct ll        *curll, *nextll, *sigll, *tmp;
+	struct stats_key *key = NULL;
 
 	++curdegree;
 
@@ -27,8 +29,18 @@ unsigned long countdegree(struct stats_key *have, int maxdegree)
 	curll = lladd(NULL, have);
 
 	while (curll != NULL && curdegree <= maxdegree) {
-		sigll = cached_getkeysigs(((struct stats_key *)
+		if (sigs) {
+			sigll = config.dbbackend->cached_getkeysigs(
+				((struct stats_key *)
 				curll->object)->keyid);
+		} else {
+			sigll = NULL;
+			key = findinhash(((struct stats_key *)
+				curll->object)->keyid);
+			if (key != NULL) {
+				sigll = key->signs;
+			}
+		}
 		while (sigll != NULL) {
 			if (((struct stats_key *) sigll->object)->colour==0) {
 				/* We've never seen it. Count it, mark it and
@@ -71,29 +83,38 @@ void sixdegrees(uint64_t keyid)
 	long degree;
 	char *uid;
 
-	cached_getkeysigs(keyid);
+	config.dbbackend->cached_getkeysigs(keyid);
 
 	if ((keyinfo = findinhash(keyid)) == NULL) {
 		printf("Couldn't find key 0x%llX.\n", keyid);
 		return;
 	}
 
-	uid = keyid2uid(keyinfo->keyid);
+	uid = config.dbbackend->keyid2uid(keyinfo->keyid);
 	printf("Six degrees for 0x%llX (%s):\n", keyinfo->keyid, uid);
 	free(uid);
 	uid = NULL;
 
-	puts("\t\tSigned by");
+	/*
+	 * Cheat. This prefills the ->sign part of all the keys we want to
+	 * look at so that we can output that info at the same time as the
+	 * signers. However we're assuming that the signers and signees are
+	 * reasonably closely related otherwise the info is wildly off - the
+	 * only way to get 100% accurate results is to examine every key to see
+	 * if it's signed by the key we're looking at.
+	 */
+	initcolour(false);
+	degree = countdegree(keyinfo, true, 7);
+
+	puts("\t\tSigned by\t\tSigns");
 	for (loop = 1; loop < 7; loop++) {
 		initcolour(false);
-		degree = countdegree(keyinfo, loop);
-		printf("Degree %d:\t%8ld\n", loop, degree);
-		/*
-		 * TODO: Used to have keys we signed as well but this takes a
-		 * lot of resource and isn't quite appropriate for something
-		 * intended to be run on the fly. Given this isn't a CGI at
-		 * present perhaps should be readded.
-		 */
+		degree = countdegree(keyinfo, true, loop);
+		printf("Degree %d:\t%8ld", loop, degree);
+
+		initcolour(false);
+		degree = countdegree(keyinfo, false, loop);
+		printf("\t\t%8ld\n", degree);
 	}
 }
 
@@ -105,12 +126,14 @@ int main(int argc, char *argv[])
 		keyid = strtoll(argv[1], NULL, 16);
 	}
 
-	readconfig();
-	initdb();
+	readconfig(NULL);
+	initlogthing("sixdegrees", config.logfile);
+	config.dbbackend->initdb(true);
 	inithash();
-	sixdegrees(keyid);
+	sixdegrees(config.dbbackend->getfullkeyid(keyid));
 	destroyhash();
-	cleanupdb();
+	config.dbbackend->cleanupdb();
+	cleanuplogthing();
 	cleanupconfig();
 
 	return 0;