X-Git-Url: https://the.earth.li/gitweb/?p=onak.git;a=blobdiff_plain;f=maxpath.c;h=f088cc615274cc6eb24a55c73f7391c9f7feffef;hp=b0d2e9a9c6a716a2f4f6368ee4c1e6f1b9179911;hb=76f079e5ebdb34acaaa2462a8d915ee06d3c8425;hpb=7f046503b8b8dcec51c1f7752e87ba0ba0af0631

diff --git a/maxpath.c b/maxpath.c
index b0d2e9a..f088cc6 100644
--- a/maxpath.c
+++ b/maxpath.c
@@ -1,25 +1,36 @@
 /*
  * maxpath.c - Find the longest trust path in the key database.
- * 
- * Jonathan McDowell <noodles@earth.li>
  *
- * Copyright 2001-2002 Project Purple.
+ * Copyright 2001-2002 Jonathan McDowell <noodles@earth.li>
  *
- * $Id: maxpath.c,v 1.10 2003/10/15 21:15:21 noodles Exp $
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+#include <getopt.h>
+#include <inttypes.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include "stats.h"
 #include "hash.h"
 #include "keydb.h"
 #include "ll.h"
+#include "log.h"
 #include "onak-conf.h"
 #include "stats.h"
 
-void findmaxpath(unsigned long max)
+void findmaxpath(struct onak_dbctx *dbctx, unsigned long max)
 {
 	struct stats_key *from, *to, *tmp;
 	struct ll *curkey;
@@ -29,10 +40,10 @@ void findmaxpath(unsigned long max)
 	from = to = tmp = NULL;
 
 	/*
-	 * My (noodles@earth.li, DSA) key is in the strongly connected set of
+	 * My (noodles@earth.li, RSA) key is in the strongly connected set of
 	 * keys, so we use it as a suitable starting seed.
 	 */
-	cached_getkeysigs(0xF1BD4BE45B430367);
+	dbctx->cached_getkeysigs(dbctx, 0x94FA372B2DA8B985);
 
 	/*
 	 * Loop through the hash examining each key present and finding the
@@ -43,17 +54,19 @@ 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 *)
+			dbctx->cached_getkeysigs(dbctx,
+					((struct stats_key *)
 					curkey->object)->keyid);
 			initcolour(false);
-			tmp = furthestkey((struct stats_key *)
+			tmp = furthestkey(dbctx, (struct stats_key *)
 						curkey->object);
 			if (tmp->colour > distance) {
 				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,
@@ -62,23 +75,45 @@ 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);
-	dofindpath(to->keyid, from->keyid, false, 1);
+	dofindpath(dbctx, to->keyid, from->keyid, false, 1);
 }
 
 int main(int argc, char *argv[])
 {
-	readconfig(NULL);
-	initdb();
-	inithash();
-	findmaxpath(30);
-	printf("--------\n");
-	findmaxpath(30);
-	destroyhash();
-	cleanupdb();
+	int optchar;
+	char *configfile = NULL;
+	struct onak_dbctx *dbctx;
+
+	while ((optchar = getopt(argc, argv, "c:")) != -1 ) {
+		switch (optchar) {
+		case 'c':
+			if (configfile != NULL) {
+				free(configfile);
+			}
+			configfile = strdup(optarg);
+			break;
+		}
+	}
+
+	readconfig(configfile);
+	free(configfile);
+	initlogthing("maxpath", config.logfile);
+	dbctx = config.dbinit(config.backend, true);
+	if (dbctx != NULL) {
+		inithash();
+		findmaxpath(dbctx, 30);
+		printf("--------\n");
+		findmaxpath(dbctx, 30);
+		destroyhash();
+		dbctx->cleanupdb(dbctx);
+	} else {
+		fprintf(stderr, "Couldn't initialize key database.\n");
+	}
+	cleanuplogthing();
 	cleanupconfig();
 	
 	return EXIT_SUCCESS;