Update Debian Vcs-* fields to point to git repository

[onak.git] / gpgwww.c

diff --git a/gpgwww.c b/gpgwww.c
index f2551ed7e87794c517e2729ab1792283d7767c58..84f00e4d70d9674cfc11f0c9babe1a112c714aca 100644 (file)
--- a/gpgwww.c
+++ b/gpgwww.c
@@ -1,11 +1,20 @@
 /*
  * gpgwww.c - www interface to path finder.
 /*
  * gpgwww.c - www interface to path finder.

- * 
- * Jonathan McDowell <noodles@earth.li>

  *
  *

- * Copyright 2001-2002 Project Purple.
+ * Copyright 2001-2004 Jonathan McDowell <noodles@earth.li>

  *
  *

- * $Id: gpgwww.c,v 1.14 2004/05/26 18:53:14 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, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

  */
 
 #include <inttypes.h>
  */
 
 #include <inttypes.h>


@@ -15,6 +24,7 @@
 
 #include "armor.h"
 #include "charfuncs.h"
 
 #include "armor.h"
 #include "charfuncs.h"

+#include "cleanup.h"

 #include "getcgi.h"
 #include "hash.h"
 #include "keydb.h"
 #include "getcgi.h"
 #include "hash.h"
 #include "keydb.h"


@@ -23,6 +33,7 @@
 #include "onak-conf.h"
 #include "parsekey.h"
 #include "stats.h"
 #include "onak-conf.h"
 #include "parsekey.h"
 #include "stats.h"

+#include "version.h"

 
 #define OP_UNKNOWN 0
 #define OP_GET     1
 
 #define OP_UNKNOWN 0
 #define OP_GET     1


@@ -58,17 +69,16 @@ int getkeyspath(uint64_t have, uint64_t want, int count)
        struct openpgp_packet_list *list_end = NULL;
        struct stats_key *keyinfoa, *keyinfob, *curkey;
        uint64_t fullhave, fullwant;
        struct openpgp_packet_list *list_end = NULL;
        struct stats_key *keyinfoa, *keyinfob, *curkey;
        uint64_t fullhave, fullwant;

-       int rec;

        int pathlen = 0;
 
        int pathlen = 0;
 

-       fullhave = getfullkeyid(have);
-       fullwant = getfullkeyid(want);
+       fullhave = config.dbbackend->getfullkeyid(have);
+       fullwant = config.dbbackend->getfullkeyid(want);

 
        /*
         * Make sure the keys we have and want are in the cache.
         */
 
        /*
         * Make sure the keys we have and want are in the cache.
         */

-       cached_getkeysigs(fullhave);
-       cached_getkeysigs(fullwant);
+       config.dbbackend->cached_getkeysigs(fullhave);
+       config.dbbackend->cached_getkeysigs(fullwant);

 
        if ((keyinfoa = findinhash(fullhave)) == NULL) {
                return 1;
 
        if ((keyinfoa = findinhash(fullhave)) == NULL) {
                return 1;


@@ -77,12 +87,12 @@ int getkeyspath(uint64_t have, uint64_t want, int count)
                return 1;
        }
        
                return 1;
        }
        

-       while (pathlen < count) {
+       while ((!cleanup()) && (pathlen < count)) {

                /*
                 * Fill the tree info up.
                 */
                initcolour(true);
                /*
                 * Fill the tree info up.
                 */
                initcolour(true);

-               rec = findpath(keyinfoa, keyinfob);
+               findpath(keyinfoa, keyinfob);

                keyinfob->parent = 0;
                if (keyinfoa->colour == 0) {
                        pathlen = count;
                keyinfob->parent = 0;
                if (keyinfoa->colour == 0) {
                        pathlen = count;


@@ -93,9 +103,10 @@ int getkeyspath(uint64_t have, uint64_t want, int count)
                         */
                        curkey = findinhash(keyinfoa->parent);
                        while (curkey != NULL && curkey->keyid != 0) {
                         */
                        curkey = findinhash(keyinfoa->parent);
                        while (curkey != NULL && curkey->keyid != 0) {

-                               if (curkey->keyid != fullwant && fetch_key(
+                               if (curkey->keyid != fullwant &&
+                                               config.dbbackend->fetch_key(

                                                curkey->keyid,
                                                curkey->keyid,

-                                                       &publickey, false)) {
+                                               &publickey, false)) {

                                        flatten_publickey(publickey,
                                                        &packets,
                                                        &list_end);
                                        flatten_publickey(publickey,
                                                        &packets,
                                                        &list_end);


@@ -114,7 +125,7 @@ int getkeyspath(uint64_t have, uint64_t want, int count)
        /*
         * Add the destination key to the list of returned keys.
         */
        /*
         * Add the destination key to the list of returned keys.
         */

-       if (fetch_key(fullwant, &publickey, false)) {
+       if (config.dbbackend->fetch_key(fullwant, &publickey, false)) {

                flatten_publickey(publickey,
                                &packets,
                                &list_end);
                flatten_publickey(publickey,
                                &packets,
                                &list_end);


@@ -153,13 +164,15 @@ int main(int argc, char *argv[])
        }
 
        if (op != OP_GET) {
        }
 
        if (op != OP_GET) {

-               printf("<P>Looking for path from 0x%llX to 0x%llX.\n",
+               printf("<P>Looking for path from 0x%016" PRIX64" to 0x%016"
+                               PRIX64 ".\n",

                                from, to);
                                from, to);

-               printf("<A HREF=\"gpgwww?from=0x%08llX&to=0x%08llX\">"
-                               "Find reverse path</A>\n",
+               printf("<A HREF=\"gpgwww?from=0x%016" PRIX64 "&to=0x%016" PRIX64
+                               "\">Find reverse path</A>\n",

                                to,
                                from);
                                to,
                                from);

-               printf("<A HREF=\"gpgwww?from=0x%08llX&to=0x%08llX&op=get\">"
+               printf("<A HREF=\"gpgwww?from=0x%08" PRIX64 "&to=0x%08" PRIX64
+                               "&op=get\">"

                                "Get all keys listed</A></P>\n",
                                from,
                                to);
                                "Get all keys listed</A></P>\n",
                                from,
                                to);


@@ -167,9 +180,12 @@ int main(int argc, char *argv[])
 
        readconfig(NULL);
        initlogthing("gpgwww", config.logfile);
 
        readconfig(NULL);
        initlogthing("gpgwww", config.logfile);

-       initdb(true);
+       catchsignals();
+       config.dbbackend->initdb(true);

        inithash();
        inithash();

-       logthing(LOGTHING_NOTICE, "Looking for path from 0x%llX to 0x%llX.",
+       logthing(LOGTHING_NOTICE, "Looking for path from 0x%016" PRIX64
+                       " to 0x%016"
+                       PRIX64,

                        from,
                        to);
        if (op == OP_GET) {
                        from,
                        to);
        if (op == OP_GET) {


@@ -178,15 +194,13 @@ int main(int argc, char *argv[])
                dofindpath(from, to, true, 3);
        }
        destroyhash();
                dofindpath(from, to, true, 3);
        }
        destroyhash();

-       cleanupdb();
+       config.dbbackend->cleanupdb();

        cleanuplogthing();
        cleanupconfig();
 
        if (op != OP_GET) {
                puts("<HR>");
        cleanuplogthing();
        cleanupconfig();
 
        if (op != OP_GET) {
                puts("<HR>");

-               puts("Produced by gpgwww " VERSION ", part of onak. "
-                       "<A HREF=\"mailto:noodles-onak@earth.li\">"
-                       "Jonathan McDowell</A>");
+               puts("Produced by gpgwww " ONAK_VERSION ", part of onak. ");

                end_html();
        }
 
                end_html();
        }