X-Git-Url: http://the.earth.li/gitweb/?a=blobdiff_plain;f=keydb_db4.c;h=986c49af2925f190b2d906555edaf1fc77c3aefc;hb=3561aed8483fe3076c7689f93fbc94ca63de77b3;hp=1596e5b97f4c7f60167eebd1318c8322f130e4aa;hpb=404bc09a23d44a088ed4970975924469947cb4d5;p=onak.git

diff --git a/keydb_db4.c b/keydb_db4.c
index 1596e5b..986c49a 100644
--- a/keydb_db4.c
+++ b/keydb_db4.c
@@ -69,6 +69,92 @@ DB *keydb(uint64_t keyid)
 	return(dbconns[keytrun % numdbs]);
 }
 
+/**
+ *	starttrans - Start a transaction.
+ *
+ *	Start a transaction. Intended to be used if we're about to perform many
+ *	operations on the database to help speed it all up, or if we want
+ *	something to only succeed if all relevant operations are successful.
+ */
+static bool db4_starttrans(void)
+{
+	int ret;
+
+	log_assert(dbenv != NULL);
+	log_assert(txn == NULL);
+
+	ret = dbenv->txn_begin(dbenv,
+		NULL, /* No parent transaction */
+		&txn,
+		0);
+	if (ret != 0) {
+		logthing(LOGTHING_CRITICAL,
+				"Error starting transaction: %s",
+				db_strerror(ret));
+		exit(1);
+	}
+
+	return true;
+}
+
+/**
+ *	endtrans - End a transaction.
+ *
+ *	Ends a transaction.
+ */
+static void db4_endtrans(void)
+{
+	int ret;
+
+	log_assert(dbenv != NULL);
+	log_assert(txn != NULL);
+
+	ret = txn->commit(txn,
+		0);
+	if (ret != 0) {
+		logthing(LOGTHING_CRITICAL,
+				"Error ending transaction: %s",
+				db_strerror(ret));
+		exit(1);
+	}
+	txn = NULL;
+
+	return;
+}
+
+/**
+ *	cleanupdb - De-initialize the key database.
+ *
+ *	This function should be called upon program exit to allow the DB to
+ *	cleanup after itself.
+ */
+static void db4_cleanupdb(void)
+{
+	int i = 0;
+
+	if (dbenv != NULL) {
+		dbenv->txn_checkpoint(dbenv, 0, 0, 0);
+		if (id32db != NULL) {
+			id32db->close(id32db, 0);
+			id32db = NULL;
+		}
+		if (worddb != NULL) {
+			worddb->close(worddb, 0);
+			worddb = NULL;
+		}
+		for (i = 0; i < numdbs; i++) {
+			if (dbconns[i] != NULL) {
+				dbconns[i]->close(dbconns[i], 0);
+				dbconns[i] = NULL;
+			}
+		}
+		free(dbconns);
+		dbconns = NULL;
+		dbenv->close(dbenv, 0);
+		dbenv = NULL;
+	}
+}
+
 /**
  *	initdb - Initialize the key database.
  *
@@ -76,7 +162,7 @@ DB *keydb(uint64_t keyid)
  *	this file are called in order to allow the DB to be initialized ready
  *	for access.
  */
-void initdb(bool readonly)
+static void db4_initdb(bool readonly)
 {
 	char       buf[1024];
 	FILE      *numdb = NULL;
@@ -144,11 +230,13 @@ void initdb(bool readonly)
 					"Error opening db environment: %s (%s)",
 					config.db_dir,
 					db_strerror(ret));
+			dbenv->close(dbenv, 0);
+			dbenv = NULL;
 		}
 	}
 
 	if (ret == 0) {
-		starttrans();
+		db4_starttrans();
 
 		for (i = 0; !ret && i < numdbs; i++) {
 			ret = db_create(&dbconns[i], dbenv, 0);
@@ -235,7 +323,7 @@ void initdb(bool readonly)
 	}
 
 	if (ret != 0) {
-		cleanupdb();
+		db4_cleanupdb();
 		logthing(LOGTHING_CRITICAL,
 				"Error opening database; exiting");
 		exit(EXIT_FAILURE);
@@ -244,92 +332,6 @@ void initdb(bool readonly)
 	return;
 }
 
-/**
- *	cleanupdb - De-initialize the key database.
- *
- *	This function should be called upon program exit to allow the DB to
- *	cleanup after itself.
- */
-void cleanupdb(void)
-{
-	int i = 0;
-
-	if (dbenv != NULL) {
-		dbenv->txn_checkpoint(dbenv, 0, 0, 0);
-		if (id32db != NULL) {
-			id32db->close(id32db, 0);
-			id32db = NULL;
-		}
-		if (worddb != NULL) {
-			worddb->close(worddb, 0);
-			worddb = NULL;
-		}
-		for (i = 0; i < numdbs; i++) {
-			if (dbconns[i] != NULL) {
-				dbconns[i]->close(dbconns[i], 0);
-				dbconns[i] = NULL;
-			}
-		}
-		free(dbconns);
-		dbconns = NULL;
-		dbenv->close(dbenv, 0);
-		dbenv = NULL;
-	}
-}
-
-/**
- *	starttrans - Start a transaction.
- *
- *	Start a transaction. Intended to be used if we're about to perform many
- *	operations on the database to help speed it all up, or if we want
- *	something to only succeed if all relevant operations are successful.
- */
-bool starttrans(void)
-{
-	int ret;
-
-	log_assert(dbenv != NULL);
-	log_assert(txn == NULL);
-
-	ret = dbenv->txn_begin(dbenv,
-		NULL, /* No parent transaction */
-		&txn,
-		0);
-	if (ret != 0) {
-		logthing(LOGTHING_CRITICAL,
-				"Error starting transaction: %s",
-				db_strerror(ret));
-		exit(1);
-	}
-
-	return true;
-}
-
-/**
- *	endtrans - End a transaction.
- *
- *	Ends a transaction.
- */
-void endtrans(void)
-{
-	int ret;
-
-	log_assert(dbenv != NULL);
-	log_assert(txn != NULL);
-
-	ret = txn->commit(txn,
-		0);
-	if (ret != 0) {
-		logthing(LOGTHING_CRITICAL,
-				"Error ending transaction: %s",
-				db_strerror(ret));
-		exit(1);
-	}
-	txn = NULL;
-
-	return;
-}
-
 /**
  *	fetch_key - Given a keyid fetch the key from storage.
  *	@keyid: The keyid to fetch.
@@ -342,7 +344,7 @@ void endtrans(void)
  *	in and then parse_keys() to parse the packets into a publickey
  *	structure.
  */
-int fetch_key(uint64_t keyid, struct openpgp_publickey **publickey,
+static int db4_fetch_key(uint64_t keyid, struct openpgp_publickey **publickey,
 		bool intrans)
 {
 	struct openpgp_packet_list *packets = NULL;
@@ -365,7 +367,7 @@ int fetch_key(uint64_t keyid, struct openpgp_publickey **publickey,
 	key.data = &keyid;
 
 	if (!intrans) {
-		starttrans();
+		db4_starttrans();
 	}
 
 	ret = keydb(keyid)->get(keydb(keyid),
@@ -410,7 +412,8 @@ int worddb_cmp(const void *d1, const void *d2)
  *	This function searches for the supplied text and returns the keys that
  *	contain it.
  */
-int fetch_key_text(const char *search, struct openpgp_publickey **publickey)
+static int db4_fetch_key_text(const char *search,
+		struct openpgp_publickey **publickey)
 {
 	DBC *cursor = NULL;
 	DBT key, data;
@@ -429,7 +432,7 @@ int fetch_key_text(const char *search, struct openpgp_publickey **publickey)
 	wordlist = makewordlist(wordlist, searchtext);
 
 	for (curword = wordlist; curword != NULL; curword = curword->next) {
-		starttrans();
+		db4_starttrans();
 
 		ret = worddb->cursor(worddb,
 				txn,
@@ -483,7 +486,7 @@ int fetch_key_text(const char *search, struct openpgp_publickey **publickey)
 	llfree(wordlist, NULL);
 	wordlist = NULL;
 	
-	starttrans();
+	db4_starttrans();
 	for (i = 0; i < keylist.count; i++) {
 		numkeys += fetch_key(keylist.keys[i],
 			publickey,
@@ -510,7 +513,8 @@ int fetch_key_text(const char *search, struct openpgp_publickey **publickey)
  *	the file. If update is true then we delete the old key first, otherwise
  *	we trust that it doesn't exist.
  */
-int store_key(struct openpgp_publickey *publickey, bool intrans, bool update)
+static int db4_store_key(struct openpgp_publickey *publickey, bool intrans,
+		bool update)
 {
 	struct     openpgp_packet_list *packets = NULL;
 	struct     openpgp_packet_list *list_end = NULL;
@@ -533,7 +537,7 @@ int store_key(struct openpgp_publickey *publickey, bool intrans, bool update)
 	keyid = get_keyid(publickey);
 
 	if (!intrans) {
-		starttrans();
+		db4_starttrans();
 	}
 
 	/*
@@ -737,7 +741,7 @@ int store_key(struct openpgp_publickey *publickey, bool intrans, bool update)
  *	This function deletes a public key from whatever storage mechanism we
  *	are using. Returns 0 if the key existed.
  */
-int delete_key(uint64_t keyid, bool intrans)
+static int db4_delete_key(uint64_t keyid, bool intrans)
 {
 	struct openpgp_publickey *publickey = NULL;
 	DBT key, data;
@@ -754,7 +758,7 @@ int delete_key(uint64_t keyid, bool intrans)
 	bool deadlock = false;
 
 	if (!intrans) {
-		starttrans();
+		db4_starttrans();
 	}
 
 	fetch_key(keyid, &publickey, true);
@@ -952,8 +956,8 @@ int delete_key(uint64_t keyid, bool intrans)
  *
  *	Returns the number of keys we iterated over.
  */
-int iterate_keys(void (*iterfunc)(void *ctx, struct openpgp_publickey *key),
-		void *ctx)
+static int db4_iterate_keys(void (*iterfunc)(void *ctx,
+		struct openpgp_publickey *key),	void *ctx)
 {
 	DBT                         dbkey, data;
 	DBC                        *cursor = NULL;
@@ -1014,7 +1018,7 @@ int iterate_keys(void (*iterfunc)(void *ctx, struct openpgp_publickey *key),
  *	This function maps a 32bit key id to the full 64bit one. It returns the
  *	full keyid. If the key isn't found a keyid of 0 is returned.
  */
-uint64_t getfullkeyid(uint64_t keyid)
+static uint64_t db4_getfullkeyid(uint64_t keyid)
 {
 	DBT       key, data;
 	DBC      *cursor = NULL;
@@ -1063,3 +1067,20 @@ uint64_t getfullkeyid(uint64_t keyid)
 #define NEED_KEYID2UID 1
 #define NEED_UPDATEKEYS 1
 #include "keydb.c"
+
+struct dbfuncs keydb_db4_funcs = {
+	.initdb			= db4_initdb,
+	.cleanupdb		= db4_cleanupdb,
+	.starttrans		= db4_starttrans,
+	.endtrans		= db4_endtrans,
+	.fetch_key		= db4_fetch_key,
+	.fetch_key_text		= db4_fetch_key_text,
+	.store_key		= db4_store_key,
+	.update_keys		= generic_update_keys,
+	.delete_key		= db4_delete_key,
+	.getkeysigs		= generic_getkeysigs,
+	.cached_getkeysigs	= generic_cached_getkeysigs,
+	.keyid2uid		= generic_keyid2uid,
+	.getfullkeyid		= db4_getfullkeyid,
+	.iterate_keys		= db4_iterate_keys,
+};