"Recognize" some extra subpacket types

[onak.git] / stats.c

diff --git a/stats.c b/stats.c
index 6a61879814b5c88b674d8982e5ed47cf92bc9ccd..ca7c929d73e29b0b357f6410a2917ad5718b22f3 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 = config.dbbackend->cached_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,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.
         */

-       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);
 
        if ((keyinfoa = findinhash(fullhave)) == NULL) {
                printf("Couldn't find key 0x%llX.\n", have);


@@ -148,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.
                 */


@@ -180,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> (["


@@ -256,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 = config.dbbackend->cached_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) {