projects
/
onak.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix up keyd compilation under 64 bit.
[onak.git]
/
stats.c
diff --git
a/stats.c
b/stats.c
index 7b516c6355aa1b284b85eecd807dca057db11454..ca7c929d73e29b0b357f6410a2917ad5718b22f3 100644
(file)
--- a/
stats.c
+++ b/
stats.c
@@
-9,10
+9,12
@@
#include <stdio.h>
#include <stdlib.h>
#include <stdio.h>
#include <stdlib.h>
+#include "cleanup.h"
#include "getcgi.h"
#include "hash.h"
#include "keydb.h"
#include "ll.h"
#include "getcgi.h"
#include "hash.h"
#include "keydb.h"
#include "ll.h"
+#include "onak-conf.h"
#include "stats.h"
/**
#include "stats.h"
/**
@@
-66,10
+68,10
@@
unsigned long findpath(struct stats_key *have, struct stats_key *want)
keys = lladd(NULL, want);
oldkeys = keys;
keys = lladd(NULL, want);
oldkeys = keys;
- while (keys != NULL && have->colour == 0) {
- sigs = cached_getkeysigs(((struct stats_key *)
+ while (
(!cleanup()) &&
keys != NULL && have->colour == 0) {
+ sigs = c
onfig.dbbackend->c
ached_getkeysigs(((struct stats_key *)
keys->object)->keyid);
keys->object)->keyid);
- while (sigs != NULL && have->colour == 0) {
+ while (
(!cleanup()) &&
sigs != NULL && have->colour == 0) {
/*
* Check if we've seen this key before and if not mark
* it and add its sigs to the list we want to look at.
/*
* Check if we've seen this key before and if not mark
* it and add its sigs to the list we want to look at.
@@
-127,14
+129,14
@@
void dofindpath(uint64_t have, uint64_t want, bool html, int count)
int pathnum;
char *uid;
int pathnum;
char *uid;
- 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.
*/
- (void) cached_getkeysigs(fullhave);
- (void) cached_getkeysigs(fullwant);
+ (void) c
onfig.dbbackend->c
ached_getkeysigs(fullhave);
+ (void) c
onfig.dbbackend->c
ached_getkeysigs(fullwant);
if ((keyinfoa = findinhash(fullhave)) == NULL) {
printf("Couldn't find key 0x%llX.\n", have);
if ((keyinfoa = findinhash(fullhave)) == NULL) {
printf("Couldn't find key 0x%llX.\n", have);
@@
-147,7
+149,7
@@
void dofindpath(uint64_t have, uint64_t want, bool html, int count)
pathnum = 0;
pathnum = 0;
- while (
pathnum < count
) {
+ while (
(!cleanup()) && (pathnum < count)
) {
/*
* Fill the tree info up.
*/
/*
* Fill the tree info up.
*/
@@
-179,7
+181,8
@@
void dofindpath(uint64_t have, uint64_t want, bool html, int count)
html ? "<BR>" : "");
curkey = keyinfoa;
while (curkey != NULL && curkey->keyid != 0) {
html ? "<BR>" : "");
curkey = keyinfoa;
while (curkey != NULL && curkey->keyid != 0) {
- uid = keyid2uid(curkey->keyid);
+ uid = config.dbbackend->keyid2uid(
+ curkey->keyid);
if (html && uid == NULL) {
printf("<a href=\"lookup?op=get&search="
"0x%08llX\">0x%08llX</a> (["
if (html && uid == NULL) {
printf("<a href=\"lookup?op=get&search="
"0x%08llX\">0x%08llX</a> (["
@@
-255,7
+258,7
@@
struct stats_key *furthestkey(struct stats_key *have)
curll = lladd(NULL, have);
while (curll != NULL) {
curll = lladd(NULL, have);
while (curll != NULL) {
- sigs = cached_getkeysigs(((struct stats_key *)
+ sigs = c
onfig.dbbackend->c
ached_getkeysigs(((struct stats_key *)
curll->object)->keyid);
while (sigs != NULL) {
if (((struct stats_key *) sigs->object)->colour == 0) {
curll->object)->keyid);
while (sigs != NULL) {
if (((struct stats_key *) sigs->object)->colour == 0) {