X-Git-Url: https://git.sommitrealweird.co.uk/onak.git/blobdiff_plain/8e454e9e224e84113a93ad22103613be4ff72b3f..6bcfac5f53de9dff2f646da360b7da1a6e3aa7c1:/keydb_db3.c?ds=inline diff --git a/keydb_db3.c b/keydb_db3.c index cffdb15..464dcc9 100644 --- a/keydb_db3.c +++ b/keydb_db3.c @@ -4,6 +4,8 @@ * Jonathan McDowell * * Copyright 2002 Project Purple + * + * $Id: keydb_db3.c,v 1.26 2004/05/27 03:33:24 noodles Exp $ */ #include @@ -28,6 +30,7 @@ #include "log.h" #include "onak-conf.h" #include "parsekey.h" +#include "wordlist.h" /** * dbenv - our database environment. @@ -35,9 +38,14 @@ static DB_ENV *dbenv = NULL; /** - * dbconn - our connection to the key database. + * numdb - The number of database files we have. */ -static DB *dbconn = NULL; +static int numdbs = 16; + +/** + * dbconn - our connections to the key database files. + */ +static DB **dbconns = NULL; /** * worddb - our connection to the word database. @@ -49,54 +57,13 @@ static DB *worddb = NULL; */ static DB_TXN *txn = NULL; -/** - * makewordlist - Takes a string and splits it into a set of unique words. - * @wordlist: The current word list. - * @words: The string to split and add. - * - * We take words and split it on non alpha numeric characters. These get - * added to the word list if they're not already present. If the wordlist - * is NULL then we start a new list, otherwise it's search for already - * added words. Note that words is modified in the process of scanning. - * - * Returns the new word list. - */ -struct ll *makewordlist(struct ll *wordlist, char *word) +DB *keydb(uint64_t keyid) { - char *start = NULL; - char *end = NULL; + uint64_t keytrun; - /* - * Walk through the words string, spliting on non alphanumerics and - * then checking if the word already exists in the list. If not then - * we add it. - */ - end = word; - while (end != NULL && *end != 0) { - start = end; - while (*start != 0 && !isalnum(*start)) { - start++; - } - end = start; - while (*end != 0 && isalnum(*end)) { - *end = tolower(*end); - end++; - } - if (end - start > 1) { - if (*end != 0) { - *end = 0; - end++; - } - - if (llfind(wordlist, start, - strcmp) == NULL) { - wordlist = lladd(wordlist, - start); - } - } - } + keytrun = keyid >> 8; - return wordlist; + return(dbconns[keytrun % numdbs]); } /** @@ -106,9 +73,41 @@ struct ll *makewordlist(struct ll *wordlist, char *word) * this file are called in order to allow the DB to be initialized ready * for access. */ -void initdb(void) +void initdb(bool readonly) { - int ret = 0; + char buf[1024]; + FILE *numdb = NULL; + int ret = 0; + int i = 0; + u_int32_t flags = 0; + + snprintf(buf, sizeof(buf) - 1, "%s/num_keydb", config.db_dir); + numdb = fopen(buf, "r"); + if (numdb != NULL) { + if (fgets(buf, sizeof(buf), numdb) != NULL) { + numdbs = atoi(buf); + } + fclose(numdb); + } else if (!readonly) { + logthing(LOGTHING_ERROR, "Couldn't open num_keydb: %s", + strerror(errno)); + numdb = fopen(buf, "w"); + if (numdb != NULL) { + fprintf(numdb, "%d", numdbs); + fclose(numdb); + } else { + logthing(LOGTHING_ERROR, + "Couldn't write num_keydb: %s", + strerror(errno)); + } + } + + dbconns = malloc(sizeof (DB *) * numdbs); + if (dbconns == NULL) { + logthing(LOGTHING_CRITICAL, + "Couldn't allocate memory for dbconns"); + exit(1); + } ret = db_env_create(&dbenv, 0); if (ret != 0) { @@ -136,30 +135,37 @@ void initdb(void) 0); if (ret != 0) { logthing(LOGTHING_CRITICAL, - "Erroring opening db environment: %s (%s)", + "Error opening db environment: %s (%s)", config.db_dir, db_strerror(ret)); exit(1); } - ret = db_create(&dbconn, dbenv, 0); - if (ret != 0) { - logthing(LOGTHING_CRITICAL, + for (i = 0; i < numdbs; i++) { + ret = db_create(&dbconns[i], dbenv, 0); + if (ret != 0) { + logthing(LOGTHING_CRITICAL, "db_create: %s", db_strerror(ret)); - exit(1); - } + exit(1); + } - ret = dbconn->open(dbconn, "keydb.db", + snprintf(buf, 1023, "keydb.%d.db", i); + flags = DB_CREATE; + if (readonly) { + flags = DB_RDONLY; + } + ret = dbconns[i]->open(dbconns[i], buf, NULL, DB_HASH, - DB_CREATE, + flags, 0664); - if (ret != 0) { - logthing(LOGTHING_CRITICAL, + if (ret != 0) { + logthing(LOGTHING_CRITICAL, "Error opening key database: %s (%s)", - "keydb.db", + buf, db_strerror(ret)); - exit(1); + exit(1); + } } ret = db_create(&worddb, dbenv, 0); @@ -170,7 +176,7 @@ void initdb(void) ret = worddb->set_flags(worddb, DB_DUP); ret = worddb->open(worddb, "worddb", NULL, DB_BTREE, - DB_CREATE, + flags, 0664); if (ret != 0) { logthing(LOGTHING_CRITICAL, @@ -191,10 +197,15 @@ void initdb(void) */ void cleanupdb(void) { + int i = 0; + + txn_checkpoint(dbenv, 0, 0, 0); worddb->close(worddb, 0); worddb = NULL; - dbconn->close(dbconn, 0); - dbconn = NULL; + for (i = 0; i < numdbs; i++) { + dbconns[i]->close(dbconns[i], 0); + dbconns[i] = NULL; + } dbenv->close(dbenv, 0); dbenv = NULL; } @@ -287,7 +298,7 @@ int fetch_key(uint64_t keyid, struct openpgp_publickey **publickey, starttrans(); } - ret = dbconn->get(dbconn, + ret = keydb(keyid)->get(keydb(keyid), txn, &key, &data, @@ -298,7 +309,7 @@ int fetch_key(uint64_t keyid, struct openpgp_publickey **publickey, fetchbuf.offset = 0; fetchbuf.size = data.size; read_openpgp_stream(buffer_fetchchar, &fetchbuf, - &packets); + &packets, 0); parse_keys(packets, publickey); free_packet_list(packets); packets = NULL; @@ -502,7 +513,7 @@ int store_key(struct openpgp_publickey *publickey, bool intrans, bool update) data.size = storebuf.offset; data.data = storebuf.buffer; - ret = dbconn->put(dbconn, + ret = keydb(keyid)->put(keydb(keyid), txn, &key, &data, @@ -711,7 +722,7 @@ int delete_key(uint64_t keyid, bool intrans) key.data = &keyid; key.size = sizeof(keyid); - dbconn->del(dbconn, + keydb(keyid)->del(keydb(keyid), txn, &key, 0); /* flags */ @@ -736,36 +747,49 @@ int delete_key(uint64_t keyid, bool intrans) */ int dumpdb(char *filenamebase) { - DBT key, data; - DBC *cursor = NULL; - int ret = 0; - int fd = -1; + DBT key, data; + DBC *cursor = NULL; + int ret = 0; + int fd = -1; + int i = 0; + char filename[1024]; + + filename[1023] = 0; + for (i = 0; i < numdbs; i++) { + ret = dbconns[i]->cursor(dbconns[i], + NULL, + &cursor, + 0); /* flags */ - starttrans(); - - ret = dbconn->cursor(dbconn, - txn, - &cursor, - 0); /* flags */ + snprintf(filename, 1023, "%s.%d.pgp", filenamebase, i); + fd = open(filename, O_CREAT | O_WRONLY | O_TRUNC, 0640); + if (fd == -1) { + logthing(LOGTHING_ERROR, + "Error opening keydump file (%s): %s", + filename, + strerror(errno)); + } else { + 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); + } + if (ret != DB_NOTFOUND) { + logthing(LOGTHING_ERROR, + "Problem reading key: %s", + db_strerror(ret)); + } + close(fd); + } - 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); + ret = cursor->c_close(cursor); + cursor = NULL; } - logthing(LOGTHING_ERROR, "Problem reading key: %s", db_strerror(ret)); - - close(fd); - - ret = cursor->c_close(cursor); - cursor = NULL; - - endtrans(); return 0; }