X-Git-Url: https://git.sommitrealweird.co.uk/onak.git/blobdiff_plain/a8b85fe447aaf5520ba259ab9eeb86a7f3446763..f0a63a7442a69bd08130efcb03d5e4b18110b859:/stats.c?ds=inline diff --git a/stats.c b/stats.c index 6a61879..bcc4f91 100644 --- a/stats.c +++ b/stats.c @@ -1,20 +1,31 @@ /* * stats.c - various routines to do stats on the key graph * - * Jonathan McDowell + * Copyright 2000-2004,2007-2009 Jonathan McDowell * - * Copyright 2000-2002 Project Purple + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the Free + * Software Foundation; version 2 of the License. * - * $Id: stats.c,v 1.11 2003/06/04 22:32:56 noodles Exp $ + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along with + * this program; if not, write to the Free Software Foundation, Inc., 51 + * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #include #include +#include "cleanup.h" #include "getcgi.h" #include "hash.h" #include "keydb.h" #include "ll.h" +#include "onak-conf.h" #include "stats.h" /** @@ -26,7 +37,7 @@ */ void initcolour(bool parent) { - unsigned long loop; + unsigned int loop; struct ll *curkey; /* @@ -62,21 +73,22 @@ unsigned long findpath(struct stats_key *have, struct stats_key *want) 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; - while (keys != NULL && have->colour == 0) { - sigs = cached_getkeysigs(((struct stats_key *) + while ((!cleanup()) && keys != NULL && have->colour == 0) { + sigs = config.dbbackend->cached_getkeysigs(((struct stats_key *) 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 && + !((struct stats_key *)sigs->object)->revoked && ((struct stats_key *)sigs->object)->colour == 0) { count++; ((struct stats_key *)sigs->object)->colour = @@ -128,27 +140,27 @@ void dofindpath(uint64_t have, uint64_t want, bool html, int count) 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. */ - cached_getkeysigs(fullhave); - cached_getkeysigs(fullwant); + (void) config.dbbackend->cached_getkeysigs(fullhave); + (void) config.dbbackend->cached_getkeysigs(fullwant); 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) { - printf("Couldn't find key 0x%llX.\n", want); + printf("Couldn't find key 0x%016" PRIX64 ".\n", want); return; } pathnum = 0; - while (pathnum < count) { + while ((!cleanup()) && (pathnum < count)) { /* * Fill the tree info up. */ @@ -163,8 +175,8 @@ void dofindpath(uint64_t have, uint64_t want, bool html, int count) html ? "
" : ""); if (keyinfoa->colour == 0) { if (pathnum == 0) { - printf("Can't find a link from 0x%08llX to " - "0x%08llX%s\n", + printf("Can't find a link from 0x%08" PRIX64 + " to 0x%08" PRIX64 "%s\n", have, want, html ? "
" : ""); @@ -174,16 +186,19 @@ void dofindpath(uint64_t have, uint64_t want, bool html, int count) } 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 ? "
" : ""); curkey = keyinfoa; while (curkey != NULL && curkey->keyid != 0) { - uid = keyid2uid(curkey->keyid); + uid = config.dbbackend->keyid2uid( + curkey->keyid); if (html && uid == NULL) { printf("0x%08llX ([" + "0x%08" PRIX64 "\">0x%08" PRIX64 + " ([" "User id not found])%s
\n", curkey->keyid & 0xFFFFFFFF, curkey->keyid & 0xFFFFFFFF, @@ -191,9 +206,11 @@ void dofindpath(uint64_t have, uint64_t want, bool html, int count) "" : " signs"); } else if (html && uid != NULL) { printf("0x%08llX" + "0x%08" PRIX64 "\">0x%08" + PRIX64 "" " (%s)%s" + "search=0x%08" PRIX64 + "\">%s)%s" "
\n", curkey->keyid & 0xFFFFFFFF, curkey->keyid & 0xFFFFFFFF, @@ -202,7 +219,7 @@ void dofindpath(uint64_t have, uint64_t want, bool html, int count) (curkey->keyid == fullwant) ? "" : " signs"); } else { - printf("0x%08llX (%s)%s\n", + printf("0x%08" PRIX64 " (%s)%s\n", curkey->keyid & 0xFFFFFFFF, (uid == NULL) ? "[User id not found]" : @@ -226,7 +243,8 @@ void dofindpath(uint64_t have, uint64_t want, bool html, int count) } 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'); @@ -256,7 +274,7 @@ struct stats_key *furthestkey(struct stats_key *have) curll = lladd(NULL, have); while (curll != NULL) { - sigs = cached_getkeysigs(((struct stats_key *) + sigs = config.dbbackend->cached_getkeysigs(((struct stats_key *) curll->object)->keyid); while (sigs != NULL) { if (((struct stats_key *) sigs->object)->colour == 0) {