]> git.sommitrealweird.co.uk Git - onak.git/blobdiff - gpgwww.c
cscvs to tla changeset 130
[onak.git] / gpgwww.c
index 5f7da460e45626a1fb2106c0084bc875d9aa5837..4668239bb3334347cbcf7be8c933a1e662a6346a 100644 (file)
--- a/gpgwww.c
+++ b/gpgwww.c
@@ -4,89 +4,22 @@
  * Jonathan McDowell <noodles@earth.li>
  *
  * Copyright 2001-2002 Project Purple.
+ *
+ * $Id: gpgwww.c,v 1.14 2004/05/26 18:53:14 noodles Exp $
  */
 
-// #include <stdint.h>
 #include <inttypes.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 
 #include "getcgi.h"
 #include "hash.h"
 #include "keydb.h"
-#include "onak_conf.h"
+#include "log.h"
+#include "onak-conf.h"
 #include "stats.h"
 
-void dofindpath(uint64_t have, uint64_t want, bool html)
-{
-       struct stats_key *keyinfoa, *keyinfob, *curkey;
-       int rec;
-       char *uid;
-
-       /*
-        * Make sure the keys we have and want are in the cache.
-        */
-       hash_getkeysigs(have);
-       hash_getkeysigs(want);
-
-       if ((keyinfoa = findinhash(have)) == NULL) {
-               printf("Couldn't find key 0x%llX.\n", have);
-               return;
-       }
-       if ((keyinfob = findinhash(want)) == NULL) {
-               printf("Couldn't find key 0x%llX.\n", want);
-               return;
-       }
-       
-       /*
-        * Fill the tree info up.
-        */
-       initcolour(true);
-       rec = findpath(keyinfoa, keyinfob);
-       keyinfob->parent = 0;
-
-       printf("%d nodes examined. %ld elements in the hash\n", rec,
-                       hashelements());
-       if (keyinfoa->colour == 0) {
-               printf("Can't find a link from 0x%llX to 0x%llX\n",
-                               have,
-                               want);
-       } else {
-               printf("%d steps from 0x%llX to 0x%llX\n",
-                               keyinfoa->colour, have, want);
-               curkey = keyinfoa;
-               while (curkey != NULL && curkey->keyid != 0) {
-                       uid = keyid2uid(curkey->keyid);
-                       if (html && uid == NULL) {
-                               printf("<a href=\"lookup?op=get&search=%llX\">"
-                                       "0x%llX</a> ([User id not found])%s)%s\n",
-                                       curkey->keyid,
-                                       curkey->keyid,
-                                       (curkey->keyid == want) ? "" :
-                                        " signs");
-                       } else if (html && uid != NULL) {
-                               printf("<a href=\"lookup?op=get&search=%llX\">"
-                                       "0x%llX</a> (<a href=\"lookup?op=vindex"
-                                       "&search=0x%llX\">%s</a>)%s\n",
-                                       curkey->keyid,
-                                       curkey->keyid,
-                                       curkey->keyid,
-                                       txt2html(keyid2uid(curkey->keyid)),
-                                       (curkey->keyid == want) ? "" :
-                                        " signs");
-                       } else {
-                               printf("0x%llX (%s)%s\n",
-                                       curkey->keyid,
-                                       (uid == NULL) ? "[User id not found]" :
-                                               uid,
-                                       (curkey->keyid == want) ? "" :
-                                        " signs");
-                       }
-                       curkey = findinhash(curkey->parent);
-               }
-       }
-}
-
 void parsecgistuff(char **cgiparams, uint64_t *from, uint64_t *to)
 {
        int i = 0;
@@ -113,13 +46,7 @@ int main(int argc, char *argv[])
 
        cgiparams = getcgivars(argc, argv);
 
-       puts("Content-Type: text/html\n");
-       puts("<HTML>");
-       puts("<HEAD>");
-       puts("<TITLE>Experimental PGP key path finder results</TITLE>");
-       puts("</HEAD>");
-       puts("<BODY>");
-       puts("</BODY>");
+       start_html("Experimental PGP key path finder results");
 
        parsecgistuff(cgiparams, &from, &to);
 
@@ -129,17 +56,33 @@ int main(int argc, char *argv[])
                exit(1);
        }
 
-       printf("<P>Looking for path from 0x%llX to 0x%llX</P>\n", from, to);
-       puts("<PRE>");
-       initdb();
+       printf("<P>Looking for path from 0x%llX to 0x%llX.\n", from, to);
+       printf("<A HREF=\"gpgwww?from=0x%08llX&to=0x%08llX\">"
+                       "Find reverse path</A></P>\n",
+                       to,
+                       from);
+
+       readconfig(NULL);
+       initlogthing("gpgwww", config.logfile);
+       initdb(true);
        inithash();
-       dofindpath(from, to, true);
+       logthing(LOGTHING_NOTICE, "Looking for path from 0x%llX to 0x%llX.",
+                       from,
+                       to);
+       dofindpath(from, to, true, 3);
+       destroyhash();
        cleanupdb();
-       puts("</PRE>");
+       cleanuplogthing();
+       cleanupconfig();
 
        puts("<HR>");
-       puts("Produced by gpgwww " VERSION ", part of onak. <A HREF=\"mailto:noodles-onak@earth.li\">Jonathan McDowell</A>");
-       puts("</HTML>");
+       puts("Produced by gpgwww " VERSION ", part of onak. "
+               "<A HREF=\"mailto:noodles-onak@earth.li\">"
+               "Jonathan McDowell</A>");
+       end_html();
+
+       cleanupcgi(cgiparams);
+       cgiparams = NULL;
 
        return EXIT_SUCCESS;
 }