projects
/
onak.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove my name from the lookup/gpgwww trailers.
[onak.git]
/
gpgwww.c
diff --git
a/gpgwww.c
b/gpgwww.c
index 44c226ccae6c7a849f7220d1316710ac28482986..fa898683061e22c7ac3628679b3f9bff30d2a9e4 100644
(file)
--- a/
gpgwww.c
+++ b/
gpgwww.c
@@
-14,7
+14,6
@@
#include "armor.h"
#include "charfuncs.h"
#include "cleanup.h"
#include "armor.h"
#include "charfuncs.h"
#include "cleanup.h"
-#include "config.h"
#include "getcgi.h"
#include "hash.h"
#include "keydb.h"
#include "getcgi.h"
#include "hash.h"
#include "keydb.h"
@@
-23,6
+22,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
@@
-61,14
+61,14
@@
int getkeyspath(uint64_t have, uint64_t want, int count)
int rec;
int pathlen = 0;
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.
*/
/*
* Make sure the keys we have and want are in the cache.
*/
- cached_getkeysigs(fullhave);
- cached_getkeysigs(fullwant);
+ c
onfig.dbbackend->c
ached_getkeysigs(fullhave);
+ c
onfig.dbbackend->c
ached_getkeysigs(fullwant);
if ((keyinfoa = findinhash(fullhave)) == NULL) {
return 1;
if ((keyinfoa = findinhash(fullhave)) == NULL) {
return 1;
@@
-93,9
+93,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
+115,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
+154,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%0
8llX&to=0x%08llX\">"
- "Find reverse path</A>\n",
+ printf("<A HREF=\"gpgwww?from=0x%0
16" 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);
@@
-168,9
+171,11
@@
int main(int argc, char *argv[])
readconfig(NULL);
initlogthing("gpgwww", config.logfile);
catchsignals();
readconfig(NULL);
initlogthing("gpgwww", config.logfile);
catchsignals();
- initdb(true);
+
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) {
@@
-179,15
+184,13
@@
int main(int argc, char *argv[])
dofindpath(from, to, true, 3);
}
destroyhash();
dofindpath(from, to, true, 3);
}
destroyhash();
- cleanupdb();
+ c
onfig.dbbackend->c
leanupdb();
cleanuplogthing();
cleanupconfig();
if (op != OP_GET) {
puts("<HR>");
cleanuplogthing();
cleanupconfig();
if (op != OP_GET) {
puts("<HR>");
- puts("Produced by gpgwww " PACKAGE_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();
}