X-Git-Url: https://git.sommitrealweird.co.uk/onak.git/blobdiff_plain/ad30ce51bf609c35cd99a9ca46dd859b17d8164a..f9917d386685c7f641d493dbc78eb3eb41fb24bd:/gpgwww.c diff --git a/gpgwww.c b/gpgwww.c index 87fe4ce..7d90a00 100644 --- a/gpgwww.c +++ b/gpgwww.c @@ -14,6 +14,7 @@ #include "armor.h" #include "charfuncs.h" #include "cleanup.h" +#include "config.h" #include "getcgi.h" #include "hash.h" #include "keydb.h" @@ -60,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; @@ -92,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( + if (curkey->keyid != fullwant && + config.dbbackend->fetch_key( curkey->keyid, - &publickey, false)) { + &publickey, false)) { flatten_publickey(publickey, &packets, &list_end); @@ -113,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, &publickey, false)) { + if (config.dbbackend->fetch_key(fullwant, &publickey, false)) { flatten_publickey(publickey, &packets, &list_end); @@ -152,13 +154,15 @@ int main(int argc, char *argv[]) } if (op != OP_GET) { - printf("
Looking for path from 0x%llX to 0x%llX.\n", + printf("
Looking for path from 0x%016" PRIX64" to 0x%016" + PRIX64 ".\n", from, to); - printf("" - "Find reverse path\n", + printf("Find reverse path\n", to, from); - printf("" + printf("" "Get all keys listed
\n", from, to); @@ -167,9 +171,11 @@ int main(int argc, char *argv[]) readconfig(NULL); initlogthing("gpgwww", config.logfile); catchsignals(); - initdb(true); + 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("