X-Git-Url: https://git.sommitrealweird.co.uk/onak.git/blobdiff_plain/1534798322db09b0f676ab5096ba5a3351b57c6c..9c96da2b288cebb53388ad4e30adbe9b87f67d91:/gpgwww.c?ds=sidebyside

diff --git a/gpgwww.c b/gpgwww.c
index 570f1a8..7d90a00 100644
--- a/gpgwww.c
+++ b/gpgwww.c
@@ -4,8 +4,6 @@
  * 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 <inttypes.h>
@@ -15,6 +13,8 @@
 
 #include "armor.h"
 #include "charfuncs.h"
+#include "cleanup.h"
+#include "config.h"
 #include "getcgi.h"
 #include "hash.h"
 #include "keydb.h"
@@ -61,14 +61,14 @@ int getkeyspath(uint64_t have, uint64_t want, int count)
 	int rec;
 	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.
 	 */
-	cached_getkeysigs(fullhave);
-	cached_getkeysigs(fullwant);
+	config.dbbackend->cached_getkeysigs(fullhave);
+	config.dbbackend->cached_getkeysigs(fullwant);
 
 	if ((keyinfoa = findinhash(fullhave)) == NULL) {
 		return 1;
@@ -77,7 +77,7 @@ int getkeyspath(uint64_t have, uint64_t want, int count)
 		return 1;
 	}
 	
-	while (pathlen < count) {
+	while ((!cleanup()) && (pathlen < count)) {
 		/*
 		 * Fill the tree info up.
 		 */
@@ -93,9 +93,10 @@ int getkeyspath(uint64_t have, uint64_t want, int count)
 			 */
 			curkey = findinhash(keyinfoa->parent);
 			while (curkey != NULL && curkey->keyid != 0) {
-	    			if (curkey->keyid != fullwant && fetch_key(
-						curkey->keyid & 0xFFFFFFFF,
-							&publickey, false)) {
+	    			if (curkey->keyid != fullwant &&
+						config.dbbackend->fetch_key(
+						curkey->keyid,
+						&publickey, false)) {
 	      				flatten_publickey(publickey,
 							&packets,
 							&list_end);
@@ -114,7 +115,7 @@ int getkeyspath(uint64_t have, uint64_t want, int count)
 	/*
 	 * Add the destination key to the list of returned keys.
 	 */
-	if (fetch_key(fullwant & 0xFFFFFFFF, &publickey, false)) {
+	if (config.dbbackend->fetch_key(fullwant, &publickey, false)) {
 		flatten_publickey(publickey,
 				&packets,
 				&list_end);
@@ -153,13 +154,15 @@ int main(int argc, char *argv[])
 	}
 
 	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);
-		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);
-		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);
@@ -167,9 +170,12 @@ int main(int argc, char *argv[])
 
 	readconfig(NULL);
 	initlogthing("gpgwww", config.logfile);
-	initdb(true);
+	catchsignals();
+	config.dbbackend->initdb(true);
 	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) {
@@ -178,13 +184,13 @@ int main(int argc, char *argv[])
 		dofindpath(from, to, true, 3);
 	}
 	destroyhash();
-	cleanupdb();
+	config.dbbackend->cleanupdb();
 	cleanuplogthing();
 	cleanupconfig();
 
 	if (op != OP_GET) {
 		puts("<HR>");
-		puts("Produced by gpgwww " VERSION ", part of onak. "
+		puts("Produced by gpgwww " PACKAGE_VERSION ", part of onak. "
 			"<A HREF=\"mailto:noodles-onak@earth.li\">"
 			"Jonathan McDowell</A>");
 		end_html();