Add a test for key fetching by SKS hash

[onak.git] / sixdegrees.c

diff --git a/sixdegrees.c b/sixdegrees.c
index d647f5e78b468f1246d6b69883ade9cacc5ec01e..10b58d687f06dcc69b36b1ac522039836735590f 100644 (file)
--- a/sixdegrees.c
+++ b/sixdegrees.c
@@ -13,6 +13,7 @@
 #include "keydb.h"
 #include "keystructs.h"
 #include "ll.h"
 #include "keydb.h"
 #include "keystructs.h"
 #include "ll.h"

+#include "log.h"

 #include "onak-conf.h"
 #include "stats.h"
 
 #include "onak-conf.h"
 #include "stats.h"
 


@@ -29,7 +30,8 @@ unsigned long countdegree(struct stats_key *have, bool sigs, int maxdegree)
 
        while (curll != NULL && curdegree <= maxdegree) {
                if (sigs) {
 
        while (curll != NULL && curdegree <= maxdegree) {
                if (sigs) {

-                       sigll = cached_getkeysigs(((struct stats_key *)
+                       sigll = config.dbbackend->cached_getkeysigs(
+                               ((struct stats_key *)

                                curll->object)->keyid);
                } else {
                        sigll = NULL;
                                curll->object)->keyid);
                } else {
                        sigll = NULL;


@@ -81,15 +83,16 @@ void sixdegrees(uint64_t keyid)
        long degree;
        char *uid;
 
        long degree;
        char *uid;
 

-       cached_getkeysigs(keyid);
+       config.dbbackend->cached_getkeysigs(keyid);

 
        if ((keyinfo = findinhash(keyid)) == NULL) {
 
        if ((keyinfo = findinhash(keyid)) == NULL) {

-               printf("Couldn't find key 0x%llX.\n", keyid);
+               printf("Couldn't find key 0x%016" PRIX64 ".\n", keyid);

                return;
        }
 
                return;
        }
 

-       uid = keyid2uid(keyinfo->keyid);
-       printf("Six degrees for 0x%llX (%s):\n", keyinfo->keyid, uid);
+       uid = config.dbbackend->keyid2uid(keyinfo->keyid);
+       printf("Six degrees for 0x%016" PRIX64 " (%s):\n", keyinfo->keyid,
+                       uid);

        free(uid);
        uid = NULL;
 
        free(uid);
        uid = NULL;
 


@@ -118,18 +121,20 @@ void sixdegrees(uint64_t keyid)
 
 int main(int argc, char *argv[])
 {
 
 int main(int argc, char *argv[])
 {

-       uint64_t keyid = 0x5B430367;
+       uint64_t keyid = 0x2DA8B985;

 
        if (argc == 2) {
                keyid = strtoll(argv[1], NULL, 16);
        }
 
 
        if (argc == 2) {
                keyid = strtoll(argv[1], NULL, 16);
        }
 

-       readconfig();
-       initdb();
+       readconfig(NULL);
+       initlogthing("sixdegrees", config.logfile);
+       config.dbbackend->initdb(true);

        inithash();
        inithash();

-       sixdegrees(getfullkeyid(keyid));
+       sixdegrees(config.dbbackend->getfullkeyid(keyid));

        destroyhash();
        destroyhash();

-       cleanupdb();
+       config.dbbackend->cleanupdb();
+       cleanuplogthing();

        cleanupconfig();
 
        return 0;
        cleanupconfig();
 
        return 0;