projects
/
onak.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add -c option to specify keyd config file on command line
[onak.git]
/
stats.c
diff --git
a/stats.c
b/stats.c
index 6a61879814b5c88b674d8982e5ed47cf92bc9ccd..88d7a050de183bc266367e1ed3fe3d3225845ba4 100644
(file)
--- a/
stats.c
+++ b/
stats.c
@@
-4,17
+4,17
@@
* Jonathan McDowell <noodles@earth.li>
*
* Copyright 2000-2002 Project Purple
* Jonathan McDowell <noodles@earth.li>
*
* Copyright 2000-2002 Project Purple
- *
- * $Id: stats.c,v 1.11 2003/06/04 22:32:56 noodles Exp $
*/
#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"
/**
@@
-26,7
+26,7
@@
*/
void initcolour(bool parent)
{
*/
void initcolour(bool parent)
{
- unsigned
long
loop;
+ unsigned
int
loop;
struct ll *curkey;
/*
struct ll *curkey;
/*
@@
-62,21
+62,22
@@
unsigned long findpath(struct stats_key *have, struct stats_key *want)
struct ll *sigs = NULL;
struct ll *nextkeys = NULL;
long curdegree = 0;
struct ll *sigs = NULL;
struct ll *nextkeys = NULL;
long curdegree = 0;
- long count = 0;
+
unsigned
long count = 0;
curdegree = 1;
keys = lladd(NULL, want);
oldkeys = keys;
curdegree = 1;
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.
*/
if (!((struct stats_key *)sigs->object)->disabled &&
/*
* 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.
*/
if (!((struct stats_key *)sigs->object)->disabled &&
+ !((struct stats_key *)sigs->object)->revoked &&
((struct stats_key *)sigs->object)->colour == 0) {
count++;
((struct stats_key *)sigs->object)->colour =
((struct stats_key *)sigs->object)->colour == 0) {
count++;
((struct stats_key *)sigs->object)->colour =
@@
-128,27
+129,27
@@
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.
*/
- cached_getkeysigs(fullhave);
- cached_getkeysigs(fullwant);
+
(void) config.dbbackend->
cached_getkeysigs(fullhave);
+
(void) config.dbbackend->
cached_getkeysigs(fullwant);
if ((keyinfoa = findinhash(fullhave)) == NULL) {
if ((keyinfoa = findinhash(fullhave)) == NULL) {
- printf("Couldn't find key 0x%
llX
.\n", have);
+ printf("Couldn't find key 0x%
016" PRIX64 "
.\n", have);
return;
}
if ((keyinfob = findinhash(fullwant)) == NULL) {
return;
}
if ((keyinfob = findinhash(fullwant)) == NULL) {
- printf("Couldn't find key 0x%
llX
.\n", want);
+ printf("Couldn't find key 0x%
016" PRIX64 "
.\n", want);
return;
}
pathnum = 0;
return;
}
pathnum = 0;
- while (
pathnum < count
) {
+ while (
(!cleanup()) && (pathnum < count)
) {
/*
* Fill the tree info up.
*/
/*
* Fill the tree info up.
*/
@@
-163,8
+164,8
@@
void dofindpath(uint64_t have, uint64_t want, bool html, int count)
html ? "<BR>" : "");
if (keyinfoa->colour == 0) {
if (pathnum == 0) {
html ? "<BR>" : "");
if (keyinfoa->colour == 0) {
if (pathnum == 0) {
- printf("Can't find a link from 0x%08
llX to "
- "
0x%08llX
%s\n",
+ printf("Can't find a link from 0x%08
" PRIX64
+ "
to 0x%08" PRIX64 "
%s\n",
have,
want,
html ? "<BR>" : "");
have,
want,
html ? "<BR>" : "");
@@
-174,16
+175,19
@@
void dofindpath(uint64_t have, uint64_t want, bool html, int count)
}
pathnum = count;
} else {
}
pathnum = count;
} else {
- printf("%d steps from 0x%08llX to 0x%08llX%s\n",
+ printf("%d steps from 0x%08" PRIX64 " to 0x%08" PRIX64
+ "%s\n",
keyinfoa->colour, have & 0xFFFFFFFF,
want & 0xFFFFFFFF,
html ? "<BR>" : "");
curkey = keyinfoa;
while (curkey != NULL && curkey->keyid != 0) {
keyinfoa->colour, have & 0xFFFFFFFF,
want & 0xFFFFFFFF,
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="
if (html && uid == NULL) {
printf("<a href=\"lookup?op=get&search="
- "0x%08llX\">0x%08llX</a> (["
+ "0x%08" PRIX64 "\">0x%08" PRIX64
+ "</a> (["
"User id not found])%s<BR>\n",
curkey->keyid & 0xFFFFFFFF,
curkey->keyid & 0xFFFFFFFF,
"User id not found])%s<BR>\n",
curkey->keyid & 0xFFFFFFFF,
curkey->keyid & 0xFFFFFFFF,
@@
-191,9
+195,11
@@
void dofindpath(uint64_t have, uint64_t want, bool html, int count)
"" : " signs");
} else if (html && uid != NULL) {
printf("<a href=\"lookup?op=get&search="
"" : " signs");
} else if (html && uid != NULL) {
printf("<a href=\"lookup?op=get&search="
- "0x%08llX\">0x%08llX</a>"
+ "0x%08" PRIX64 "\">0x%08"
+ PRIX64 "</a>"
" (<a href=\"lookup?op=vindex&"
" (<a href=\"lookup?op=vindex&"
- "search=0x%08llX\">%s</a>)%s"
+ "search=0x%08" PRIX64
+ "\">%s</a>)%s"
"<BR>\n",
curkey->keyid & 0xFFFFFFFF,
curkey->keyid & 0xFFFFFFFF,
"<BR>\n",
curkey->keyid & 0xFFFFFFFF,
curkey->keyid & 0xFFFFFFFF,
@@
-202,7
+208,7
@@
void dofindpath(uint64_t have, uint64_t want, bool html, int count)
(curkey->keyid == fullwant) ?
"" : " signs");
} else {
(curkey->keyid == fullwant) ?
"" : " signs");
} else {
- printf("0x%08
llX
(%s)%s\n",
+ printf("0x%08
" PRIX64 "
(%s)%s\n",
curkey->keyid & 0xFFFFFFFF,
(uid == NULL) ?
"[User id not found]" :
curkey->keyid & 0xFFFFFFFF,
(uid == NULL) ?
"[User id not found]" :
@@
-226,7
+232,8
@@
void dofindpath(uint64_t have, uint64_t want, bool html, int count)
}
curkey = keyinfoa;
while (curkey != NULL && curkey->keyid != 0) {
}
curkey = keyinfoa;
while (curkey != NULL && curkey->keyid != 0) {
- printf("0x%08llX ", curkey->keyid & 0xFFFFFFFF);
+ printf("0x%08" PRIX64 " ",
+ curkey->keyid & 0xFFFFFFFF);
curkey = findinhash(curkey->parent);
}
putchar('\n');
curkey = findinhash(curkey->parent);
}
putchar('\n');
@@
-256,7
+263,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) {