Fix segfault with non existant short key id & keydb_fs.

[onak.git] / stats.c

diff --git a/stats.c b/stats.c
index a295a1ed231b84e27fd1b363320e28b3cfe662a7..7b516c6355aa1b284b85eecd807dca057db11454 100644 (file)
--- a/stats.c
+++ b/stats.c
@@ -24,7 +24,7 @@
  */
 void initcolour(bool parent)
 {
-       unsigned long loop;
+       unsigned int loop;
        struct ll *curkey;
 
        /*
@@ -60,7 +60,7 @@ 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);
@@ -75,6 +75,7 @@ unsigned long findpath(struct stats_key *have, struct stats_key *want)
                         * 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 =
@@ -132,8 +133,8 @@ void dofindpath(uint64_t have, uint64_t want, bool html, int count)
        /*
         * Make sure the keys we have and want are in the cache.
         */
-       cached_getkeysigs(fullhave);
-       cached_getkeysigs(fullwant);
+       (void) cached_getkeysigs(fullhave);
+       (void) cached_getkeysigs(fullwant);
 
        if ((keyinfoa = findinhash(fullhave)) == NULL) {
                printf("Couldn't find key 0x%llX.\n", have);
@@ -160,11 +161,17 @@ void dofindpath(uint64_t have, uint64_t want, bool html, int count)
                        hashelements(),
                        html ? "<BR>" : "");
                if (keyinfoa->colour == 0) {
-                       printf("Can't find a link from 0x%08llX to 0x%08llX"
-                               "%s\n",
+                       if (pathnum == 0) {
+                               printf("Can't find a link from 0x%08llX to "
+                               "0x%08llX%s\n",
                                have,
                                want,
                                html ? "<BR>" : "");
+                       } else {
+                               printf("Can't find any further paths%s\n",
+                                       html ? "<BR>" : "");
+                       }
+                       pathnum = count;
                } else {
                        printf("%d steps from 0x%08llX to 0x%08llX%s\n",
                                keyinfoa->colour, have & 0xFFFFFFFF,