X-Git-Url: https://git.sommitrealweird.co.uk/onak.git/blobdiff_plain/e3ee7975fc8f8b343390272663b8c644030b17c1..8d14d66b84cc370cefe54b33de1b95bb49c90bf6:/maxpath.c

diff --git a/maxpath.c b/maxpath.c
index 2f813de..ccd5008 100644
--- a/maxpath.c
+++ b/maxpath.c
@@ -14,6 +14,7 @@
 #include "hash.h"
 #include "keydb.h"
 #include "ll.h"
+#include "log.h"
 #include "onak-conf.h"
 #include "stats.h"
 
@@ -30,7 +31,7 @@ void findmaxpath(unsigned long max)
 	 * My (noodles@earth.li, DSA) key is in the strongly connected set of
 	 * keys, so we use it as a suitable starting seed.
 	 */
-	cached_getkeysigs(0xF1BD4BE45B430367);
+	config.dbbackend->cached_getkeysigs(0xF1BD4BE45B430367);
 
 	/*
 	 * Loop through the hash examining each key present and finding the
@@ -41,7 +42,8 @@ void findmaxpath(unsigned long max)
 	for (loop = 0; (loop < HASHSIZE) && (distance < max); loop++) {
 		curkey = gethashtableentry(loop);
 		while (curkey != NULL && distance < max) {
-			cached_getkeysigs(((struct stats_key *)
+			config.dbbackend->cached_getkeysigs(
+					((struct stats_key *)
 					curkey->object)->keyid);
 			initcolour(false);
 			tmp = furthestkey((struct stats_key *)
@@ -50,8 +52,9 @@ void findmaxpath(unsigned long max)
 				from = (struct stats_key *)curkey->object;
 				to = tmp;
 				distance = to->colour;
-				printf("Current max path (#%ld) is from %llX"
-						" to %llX (%ld steps)\n", 
+				printf("Current max path (#%ld) is from %"
+						PRIX64 " to %" PRIX64 
+						" (%ld steps)\n", 
 						loop,
 						from->keyid,
 						to->keyid,
@@ -60,7 +63,7 @@ void findmaxpath(unsigned long max)
 			curkey=curkey->next;
 		}
 	}
-	printf("Max path is from %llX to %llX (%ld steps)\n",
+	printf("Max path is from %" PRIX64 " to %" PRIX64 " (%ld steps)\n",
 			from->keyid,
 			to->keyid,
 			distance);
@@ -69,14 +72,16 @@ void findmaxpath(unsigned long max)
 
 int main(int argc, char *argv[])
 {
-	readconfig();
-	initdb();
+	readconfig(NULL);
+	initlogthing("maxpath", config.logfile);
+	config.dbbackend->initdb(true);
 	inithash();
 	findmaxpath(30);
 	printf("--------\n");
 	findmaxpath(30);
 	destroyhash();
-	cleanupdb();
+	config.dbbackend->cleanupdb();
+	cleanuplogthing();
 	cleanupconfig();
 	
 	return EXIT_SUCCESS;