X-Git-Url: https://the.earth.li/gitweb/?p=onak.git;a=blobdiff_plain;f=sixdegrees.c;h=f7f15200dd0d7b424276e10f9dd90ceb2c02b301;hp=e6a35947b00a3030c905a54ea36ef4c7617ab28d;hb=3da81770b841f841c5145f91a9ccedc296e13f4b;hpb=5e1b22d763640c4d7a09d07920403d8d491b4410

diff --git a/sixdegrees.c b/sixdegrees.c
index e6a3594..f7f1520 100644
--- a/sixdegrees.c
+++ b/sixdegrees.c
@@ -13,12 +13,13 @@
  * 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.
+ * this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+#include <getopt.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 
 #include "hash.h"
 #include "keydb.h"
@@ -28,7 +29,8 @@
 #include "onak-conf.h"
 #include "stats.h"
 
-unsigned long countdegree(struct stats_key *have, bool sigs, int maxdegree)
+unsigned long countdegree(struct onak_dbctx *dbctx,
+		struct stats_key *have, bool sigs, int maxdegree)
 {
 	unsigned long     count = 0, curdegree = 0;
 	struct ll        *curll, *nextll, *sigll, *tmp;
@@ -41,7 +43,7 @@ unsigned long countdegree(struct stats_key *have, bool sigs, int maxdegree)
 
 	while (curll != NULL && curdegree <= maxdegree) {
 		if (sigs) {
-			sigll = config.dbbackend->cached_getkeysigs(
+			sigll = dbctx->cached_getkeysigs(dbctx,
 				((struct stats_key *)
 				curll->object)->keyid);
 		} else {
@@ -87,21 +89,21 @@ unsigned long countdegree(struct stats_key *have, bool sigs, int maxdegree)
 	return count;
 }
 
-void sixdegrees(uint64_t keyid)
+void sixdegrees(struct onak_dbctx *dbctx, uint64_t keyid)
 {
 	struct stats_key *keyinfo;
 	int loop;
 	long degree;
 	char *uid;
 
-	config.dbbackend->cached_getkeysigs(keyid);
+	dbctx->cached_getkeysigs(dbctx, keyid);
 
 	if ((keyinfo = findinhash(keyid)) == NULL) {
 		printf("Couldn't find key 0x%016" PRIX64 ".\n", keyid);
 		return;
 	}
 
-	uid = config.dbbackend->keyid2uid(keyinfo->keyid);
+	uid = dbctx->keyid2uid(dbctx, keyinfo->keyid);
 	printf("Six degrees for 0x%016" PRIX64 " (%s):\n", keyinfo->keyid,
 			uid);
 	free(uid);
@@ -116,35 +118,54 @@ void sixdegrees(uint64_t keyid)
 	 * if it's signed by the key we're looking at.
 	 */
 	initcolour(false);
-	degree = countdegree(keyinfo, true, 7);
+	countdegree(dbctx, keyinfo, true, 7);
 
 	puts("\t\tSigned by\t\tSigns");
 	for (loop = 1; loop < 7; loop++) {
 		initcolour(false);
-		degree = countdegree(keyinfo, true, loop);
+		degree = countdegree(dbctx, keyinfo, true, loop);
 		printf("Degree %d:\t%8ld", loop, degree);
 
 		initcolour(false);
-		degree = countdegree(keyinfo, false, loop);
+		degree = countdegree(dbctx, keyinfo, false, loop);
 		printf("\t\t%8ld\n", degree);
 	}
 }
 
 int main(int argc, char *argv[])
 {
-	uint64_t keyid = 0x2DA8B985;
+	int optchar;
+	char *configfile = NULL;
+	uint64_t keyid = 0x94FA372B2DA8B985;
+	struct onak_dbctx *dbctx;
+
+	while ((optchar = getopt(argc, argv, "c:")) != -1 ) {
+		switch (optchar) {
+		case 'c':
+			if (configfile != NULL) {
+				free(configfile);
+			}
+			configfile = strdup(optarg);
+			break;
+		}
+	}
 
-	if (argc == 2) {
-		keyid = strtoll(argv[1], NULL, 16);
+	if (optind < argc) {
+		keyid = strtoll(argv[optind], NULL, 16);
 	}
 
-	readconfig(NULL);
+	readconfig(configfile);
+	free(configfile);
 	initlogthing("sixdegrees", config.logfile);
-	config.dbbackend->initdb(true);
-	inithash();
-	sixdegrees(config.dbbackend->getfullkeyid(keyid));
-	destroyhash();
-	config.dbbackend->cleanupdb();
+	dbctx = config.dbinit(config.backend, true);
+	if (dbctx != NULL) {
+		inithash();
+		sixdegrees(dbctx, keyid);
+		destroyhash();
+		dbctx->cleanupdb(dbctx);
+	} else {
+		fprintf(stderr, "Couldn't initialize key database.\n");
+	}
 	cleanuplogthing();
 	cleanupconfig();