X-Git-Url: https://git.sommitrealweird.co.uk/onak.git/blobdiff_plain/62078c1601192c2594b954a122ac44a0c319c9bd..36eef8ab7ec7c90e97f2371d7ca8c80d52fd3e27:/keydb_db3.c?ds=sidebyside

diff --git a/keydb_db3.c b/keydb_db3.c
index 5224b52..6177ac7 100644
--- a/keydb_db3.c
+++ b/keydb_db3.c
@@ -21,7 +21,7 @@
 #include "charfuncs.h"
 #include "keydb.h"
 #include "keyid.h"
-#include "keyindex.h"
+#include "decodekey.h"
 #include "keystructs.h"
 #include "mem.h"
 #include "onak-conf.h"
@@ -99,7 +99,7 @@ void initdb(void)
 	char buf[1024];
 	int ret = 0;
 
-	strcpy(buf, config.db2_dbpath);
+	strcpy(buf, config.db_dir);
 	strcat(buf, "/keydb.db");
 	
 	ret = db_create(&dbconn, NULL, 0);
@@ -116,7 +116,7 @@ void initdb(void)
 		exit(1);
 	}
 
-	strcpy(buf, config.db2_dbpath);
+	strcpy(buf, config.db_dir);
 	strcat(buf, "/worddb");
 	
 	ret = db_create(&worddb, NULL, 0);
@@ -217,6 +217,8 @@ int fetch_key(uint64_t keyid, struct openpgp_publickey **publickey,
 		read_openpgp_stream(buffer_fetchchar, &fetchbuf,
 				&packets);
 		parse_keys(packets, publickey);
+		free_packet_list(packets);
+		packets = NULL;
 		numkeys++;
 	} else if (ret != DB_NOTFOUND) {
 		dbconn->err(dbconn, ret, "Problem retrieving key");
@@ -225,6 +227,11 @@ int fetch_key(uint64_t keyid, struct openpgp_publickey **publickey,
 	return (numkeys);
 }
 
+int worddb_cmp(const char *d1, const char *d2)
+{
+	return memcmp(d1, d2, 12);
+}
+
 /**
  *	fetch_key_text - Trys to find the keys that contain the supplied text.
  *	@search: The text to search for.
@@ -241,39 +248,89 @@ int fetch_key_text(const char *search, struct openpgp_publickey **publickey)
 	uint64_t keyid;
 	int i;
 	int numkeys;
+	char *searchtext = NULL;
+	struct ll *wordlist = NULL;
+	struct ll *curword = NULL;
+	struct ll *keylist = NULL;
+	struct ll *newkeylist = NULL;
 
 	numkeys = 0;
+	searchtext = strdup(search);
+	wordlist = makewordlist(wordlist, searchtext);
+
 
 	ret = worddb->cursor(worddb,
 			NULL, /* txn */
 			&cursor,
 			0);   /* flags */
-	if (ret == 0) {
+
+	for (curword = wordlist; curword != NULL; curword = curword->next) {
 		memset(&key, 0, sizeof(key));
 		memset(&data, 0, sizeof(data));
-		key.data = (void *) search;
-		key.size = strlen(search);
+		key.data = curword->object;
+		key.size = strlen(curword->object);
+		data.flags = DB_DBT_MALLOC;
 		ret = cursor->c_get(cursor,
 				&key,
 				&data,
 				DB_SET);
-		while (ret == 0 && strcmp(key.data, search) == 0) {
+		while (ret == 0 && strncmp(key.data, curword->object,
+					key.size) == 0 &&
+				((char *) curword->object)[key.size] == 0) {
 			keyid = 0;
 			for (i = 4; i < 12; i++) {
 				keyid <<= 8;
-				keyid += ((unsigned char *) data.data)[i];
+				keyid += ((unsigned char *)
+						data.data)[i];
+			}
+
+			if (keylist == NULL ||
+					llfind(keylist, data.data,
+						worddb_cmp) != NULL) {
+				newkeylist = lladd(newkeylist, data.data);
+				data.data = NULL;
+			} else {
+				free(data.data);
+				data.data = NULL;
 			}
-			numkeys += fetch_key(keyid,
-					publickey,
-					false);
 			ret = cursor->c_get(cursor,
 					&key,
 					&data,
 					DB_NEXT);
 		}
-		ret = cursor->c_close(cursor);
-		cursor = NULL;
+		llfree(keylist, free);
+		keylist = newkeylist;
+		newkeylist = NULL;
+		if (data.data != NULL) {
+			free(data.data);
+			data.data = NULL;
+		}
 	}
+	llfree(wordlist, NULL);
+	wordlist = NULL;
+	
+	for (newkeylist = keylist;
+			newkeylist != NULL && numkeys < config.maxkeys;
+			newkeylist = newkeylist->next) {
+
+			keyid = 0;
+			for (i = 4; i < 12; i++) {
+				keyid <<= 8;
+				keyid += ((unsigned char *)
+						newkeylist->object)[i];
+			}
+
+			numkeys += fetch_key(keyid,
+					publickey,
+					false);
+	}
+	llfree(keylist, free);
+	keylist = NULL;
+	free(searchtext);
+	searchtext = NULL;
+
+	ret = cursor->c_close(cursor);
+	cursor = NULL;
 	
 	return (numkeys);
 }
@@ -355,6 +412,14 @@ int store_key(struct openpgp_publickey *publickey, bool intrans, bool update)
 		dbconn->err(dbconn, ret, "Problem storing key");
 	}
 
+	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.
 	 */