#include "decodekey.h"
#include "keystructs.h"
#include "mem.h"
+#include "log.h"
#include "onak-conf.h"
#include "parsekey.h"
*/
void initdb(void)
{
- char buf[1024];
int ret = 0;
ret = db_env_create(&dbenv, 0);
if (ret != 0) {
- fprintf(stderr, "db_env_create: %s\n", db_strerror(ret));
+ logthing(LOGTHING_CRITICAL,
+ "db_env_create: %s", db_strerror(ret));
exit(1);
}
+ /*
+ * This is a bit of a kludge. Either we run a separate process for
+ * deadlock detection or we do this every time we run. What we really
+ * want to do is specify that our locks are exclusive locks when we
+ * start to do an update.
+ */
+ ret = lock_detect(dbenv,
+ 0, /* flags */
+ DB_LOCK_RANDOM,
+ NULL); /* If non null int* for number broken */
+
ret = dbenv->open(dbenv, config.db_dir,
DB_INIT_LOG | DB_INIT_MPOOL | DB_INIT_LOCK |
DB_INIT_TXN |
- DB_RECOVER | DB_CREATE,
+ DB_CREATE,
0);
if (ret != 0) {
dbenv->err(dbenv, ret, "%s", config.db_dir);
ret = db_create(&dbconn, dbenv, 0);
if (ret != 0) {
- fprintf(stderr, "db_create: %s\n", db_strerror(ret));
+ logthing(LOGTHING_CRITICAL,
+ "db_create: %s", db_strerror(ret));
exit(1);
}
ret = db_create(&worddb, dbenv, 0);
if (ret != 0) {
- fprintf(stderr, "db_create: %s\n", db_strerror(ret));
+ logthing(LOGTHING_CRITICAL, "db_create: %s", db_strerror(ret));
exit(1);
}
ret = worddb->set_flags(worddb, DB_DUP);
{
int ret;
+ assert(dbenv != NULL);
assert(txn == NULL);
ret = txn_begin(dbenv,
{
int ret;
+ assert(dbenv != NULL);
assert(txn != NULL);
ret = txn_commit(txn,
unsigned char worddb_data[12];
struct ll *wordlist = NULL;
struct ll *curword = NULL;
+ bool deadlock = false;
keyid = get_keyid(publickey);
* it definitely needs updated.
*/
if (update) {
- delete_key(keyid, true);
+ deadlock = (delete_key(keyid, true) == -1);
}
/*
* Convert the key to a flat set of binary data.
*/
- next = publickey->next;
- publickey->next = NULL;
- flatten_publickey(publickey, &packets, &list_end);
- publickey->next = next;
-
- storebuf.offset = 0;
- storebuf.size = 8192;
- storebuf.buffer = malloc(8192);
+ if (!deadlock) {
+ next = publickey->next;
+ publickey->next = NULL;
+ flatten_publickey(publickey, &packets, &list_end);
+ publickey->next = next;
+
+ storebuf.offset = 0;
+ storebuf.size = 8192;
+ storebuf.buffer = malloc(8192);
- write_openpgp_stream(buffer_putchar, &storebuf, packets);
-
- /*
- * Now we have the key data store it in the DB; the keyid is the key.
- */
- memset(&key, 0, sizeof(key));
- memset(&data, 0, sizeof(data));
- key.data = &keyid;
- key.size = sizeof(keyid);
- keyid &= 0xFFFFFFFF;
- data.size = storebuf.offset;
- data.data = storebuf.buffer;
+ write_openpgp_stream(buffer_putchar, &storebuf, packets);
- ret = dbconn->put(dbconn,
- txn,
- &key,
- &data,
- 0); /* flags*/
- if (ret != 0) {
- dbconn->err(dbconn, ret, "Problem storing key");
- }
+ /*
+ * Now we have the key data store it in the DB; the keyid is
+ * the key.
+ */
+ memset(&key, 0, sizeof(key));
+ memset(&data, 0, sizeof(data));
+ key.data = &keyid;
+ key.size = sizeof(keyid);
+ keyid &= 0xFFFFFFFF;
+ data.size = storebuf.offset;
+ data.data = storebuf.buffer;
- free(storebuf.buffer);
- storebuf.buffer = NULL;
- storebuf.size = 0;
- storebuf.offset = 0;
+ ret = dbconn->put(dbconn,
+ txn,
+ &key,
+ &data,
+ 0); /* flags*/
+ if (ret != 0) {
+ dbconn->err(dbconn, ret, "Problem storing key");
+ if (ret == DB_LOCK_DEADLOCK) {
+ deadlock = true;
+ }
+ }
- free_packet_list(packets);
- packets = NULL;
+ free(storebuf.buffer);
+ storebuf.buffer = NULL;
+ storebuf.size = 0;
+ storebuf.offset = 0;
+
+ free_packet_list(packets);
+ packets = NULL;
+ }
/*
* Walk through our uids storing the words into the db with the keyid.
*/
- uids = keyuids(publickey, &primary);
+ if (!deadlock) {
+ uids = keyuids(publickey, &primary);
+ }
if (uids != NULL) {
for (i = 0; ret == 0 && uids[i] != NULL; i++) {
wordlist = makewordlist(wordlist, uids[i]);
}
- for (curword = wordlist; curword != NULL;
+ for (curword = wordlist; curword != NULL && !deadlock;
curword = curword->next) {
memset(&key, 0, sizeof(key));
memset(&data, 0, sizeof(data));
if (ret != 0) {
worddb->err(worddb, ret,
"Problem storing key");
+ if (ret == DB_LOCK_DEADLOCK) {
+ deadlock = true;
+ }
}
}
endtrans();
}
- return 0;
+ return deadlock ? -1 : 0 ;
}
/**
unsigned char worddb_data[12];
struct ll *wordlist = NULL;
struct ll *curword = NULL;
+ bool deadlock = false;
keyid &= 0xFFFFFFFF;
&cursor,
0); /* flags */
- for (curword = wordlist; curword != NULL;
+ for (curword = wordlist; curword != NULL && !deadlock;
curword = curword->next) {
memset(&key, 0, sizeof(key));
memset(&data, 0, sizeof(data));
if (ret != 0) {
worddb->err(worddb, ret,
"Problem deleting word.");
+ if (ret == DB_LOCK_DEADLOCK) {
+ deadlock = true;
+ }
}
}
ret = cursor->c_close(cursor);
publickey = NULL;
}
- key.data = &keyid;
- key.size = sizeof(keyid);
+ if (!deadlock) {
+ key.data = &keyid;
+ key.size = sizeof(keyid);
- dbconn->del(dbconn,
- txn,
- &key,
- 0); /* flags */
+ dbconn->del(dbconn,
+ txn,
+ &key,
+ 0); /* flags */
+ }
if (!intrans) {
endtrans();
}
- return (ret == DB_NOTFOUND);
+ return deadlock ? (-1) : (ret == DB_NOTFOUND);
+}
+
+/**
+ * dumpdb - dump the key database
+ * @filenamebase: The base filename to use for the dump.
+ *
+ * Dumps the database into one or more files, which contain pure OpenPGP
+ * that can be reimported into onak or gpg. filenamebase provides a base
+ * file name for the dump; several files may be created, all of which will
+ * begin with this string and then have a unique number and a .pgp
+ * extension.
+ */
+int dumpdb(char *filenamebase)
+{
+ DBT key, data;
+ DBC *cursor = NULL;
+ int ret = 0;
+ int fd = -1;
+
+ starttrans();
+
+ ret = dbconn->cursor(dbconn,
+ txn,
+ &cursor,
+ 0); /* flags */
+
+ fd = open(filenamebase, O_CREAT | O_WRONLY | O_TRUNC, 0640);
+ memset(&key, 0, sizeof(key));
+ memset(&data, 0, sizeof(data));
+ ret = cursor->c_get(cursor, &key, &data, DB_NEXT);
+ while (ret == 0) {
+ write(fd, data.data, data.size);
+ memset(&key, 0, sizeof(key));
+ memset(&data, 0, sizeof(data));
+ ret = cursor->c_get(cursor, &key, &data, DB_NEXT);
+ }
+ dbconn->err(dbconn, ret, "Problem reading key");
+
+ close(fd);
+
+ ret = cursor->c_close(cursor);
+ cursor = NULL;
+
+ endtrans();
+
+ return 0;
}
/*
projects / onak.git / blobdiff