First cut at cleanup infrastructure.

[onak.git] / maxpath.c

diff --git a/maxpath.c b/maxpath.c
index f46ea4cb13db4cfa6f0c7657f7a2cffc1ddec6ba..dfee16c4025cba994b0a19cc55d2f2a68cf28dd0 100644 (file)
--- a/maxpath.c
+++ b/maxpath.c
@@ -1,9 +1,10 @@
 /*
 /*

-       gpgstats.c - Program to produce stats on a GPG keyring.
-       Written by Jonathan McDowell <noodles@earth.li>.
-
-       19/02/2000 - Started writing (sort of).
-*/
+ * maxpath.c - Find the longest trust path in the key database.
+ * 
+ * Jonathan McDowell <noodles@earth.li>
+ *
+ * Copyright 2001-2002 Project Purple.
+ */

 
 #include <stdio.h>
 #include <stdlib.h>
 
 #include <stdio.h>
 #include <stdlib.h>


@@ -13,6 +14,7 @@
 #include "hash.h"
 #include "keydb.h"
 #include "ll.h"
 #include "hash.h"
 #include "keydb.h"
 #include "ll.h"

+#include "onak-conf.h"

 #include "stats.h"
 
 void findmaxpath(unsigned long max)
 #include "stats.h"
 
 void findmaxpath(unsigned long max)


@@ -21,15 +23,25 @@ void findmaxpath(unsigned long max)
        struct ll *curkey;
        unsigned long distance, loop;
 
        struct ll *curkey;
        unsigned long distance, loop;
 

-       printf("In findmaxpath\n");

        distance = 0;
        from = to = tmp = NULL;
        distance = 0;
        from = to = tmp = NULL;

-       hash_getkeysigs(0xF1BD4BE45B430367);

 
 

+       /*
+        * 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);
+
+       /*
+        * Loop through the hash examining each key present and finding the
+        * furthest key from it. If it's further than our current max then
+        * store it as our new max and print out the fact we've found a new
+        * max.
+        */

        for (loop = 0; (loop < HASHSIZE) && (distance < max); loop++) {
                curkey = gethashtableentry(loop);
                while (curkey != NULL && distance < max) {
        for (loop = 0; (loop < HASHSIZE) && (distance < max); loop++) {
                curkey = gethashtableentry(loop);
                while (curkey != NULL && distance < max) {

-                       hash_getkeysigs(((struct stats_key *)
+                       cached_getkeysigs(((struct stats_key *)

                                        curkey->object)->keyid);
                        initcolour(false);
                        tmp = furthestkey((struct stats_key *)
                                        curkey->object)->keyid);
                        initcolour(false);
                        tmp = furthestkey((struct stats_key *)


@@ -38,7 +50,8 @@ void findmaxpath(unsigned long max)
                                from = (struct stats_key *)curkey->object;
                                to = tmp;
                                distance = to->colour;
                                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 %llX"
+                                               " to %llX (%ld steps)\n", 

                                                loop,
                                                from->keyid,
                                                to->keyid,
                                                loop,
                                                from->keyid,
                                                to->keyid,


@@ -51,16 +64,20 @@ void findmaxpath(unsigned long max)
                        from->keyid,
                        to->keyid,
                        distance);
                        from->keyid,
                        to->keyid,
                        distance);

+       dofindpath(to->keyid, from->keyid, false, 1);

 }
 
 int main(int argc, char *argv[])
 {
 }
 
 int main(int argc, char *argv[])
 {

-       initdb();
+       readconfig(NULL);
+       initdb(true);

        inithash();
        findmaxpath(30);
        printf("--------\n");
        findmaxpath(30);
        inithash();
        findmaxpath(30);
        printf("--------\n");
        findmaxpath(30);

+       destroyhash();

        cleanupdb();
        cleanupdb();

+       cleanupconfig();

        
        return EXIT_SUCCESS;
 }
        
        return EXIT_SUCCESS;
 }