X-Git-Url: http://the.earth.li/gitweb/?a=blobdiff_plain;f=keydb_keyd.c;h=26cb326f758ae332bd5c9b9bb5e75a6cca6cc532;hb=408ea0b9ceafdc9f861701cfb14b57d09aa47777;hp=0399bc367a806dbcd453707d6b5b76920d3edc71;hpb=a57a146ebc3f15f1ba2dfe8ecb9b59702fb8f799;p=onak.git

diff --git a/keydb_keyd.c b/keydb_keyd.c
index 0399bc3..26cb326 100644
--- a/keydb_keyd.c
+++ b/keydb_keyd.c
@@ -342,18 +342,68 @@ uint64_t getfullkeyid(uint64_t keyid)
 }
 
 /**
- *	dumpdb - dump the key database
- *	@filenamebase: The base filename to use for the dump.
+ *	iterate_keys - call a function once for each key in the db.
+ *	@iterfunc: The function to call.
+ *	@ctx: A context pointer
  *
- *	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.
+ *	Calls iterfunc once for each key in the database. ctx is passed
+ *	unaltered to iterfunc. This function is intended to aid database dumps
+ *	and statistic calculations.
+ *
+ *	Returns the number of keys we iterated over.
  */
-int dumpdb(char *filenamebase)
+int iterate_keys(void (*iterfunc)(void *ctx, struct openpgp_publickey *key),
+		void *ctx)
 {
-	return 0;
+	struct buffer_ctx           keybuf;
+	struct openpgp_packet_list *packets = NULL;
+	struct openpgp_publickey   *key = NULL;
+	int                         cmd = KEYD_CMD_KEYITER;
+	ssize_t                     bytes = 0;
+	ssize_t                     count = 0;
+	int                         numkeys = 0;
+
+	write(keyd_fd, &cmd, sizeof(cmd));
+	read(keyd_fd, &cmd, sizeof(cmd));
+	if (cmd == KEYD_REPLY_OK) {
+		keybuf.offset = 0;
+		read(keyd_fd, &keybuf.size, sizeof(keybuf.size));
+		while (keybuf.size > 0) {
+			keybuf.buffer = malloc(keybuf.size);
+			bytes = count = 0;
+			logthing(LOGTHING_TRACE,
+					"Getting %d bytes of key data.",
+					keybuf.size);
+			while (bytes >= 0 && count < keybuf.size) {
+				bytes = read(keyd_fd, &keybuf.buffer[count],
+						keybuf.size - count);
+				logthing(LOGTHING_TRACE,
+						"Read %d bytes.", bytes);
+				count += bytes;
+			}
+			read_openpgp_stream(buffer_fetchchar, &keybuf,
+					&packets, 0);
+			parse_keys(packets, &key);
+
+			if (iterfunc != NULL && key != NULL) {
+				iterfunc(ctx, key);
+			}
+
+			free_publickey(key);
+			key = NULL;
+			free_packet_list(packets);
+			packets = NULL;
+			free(keybuf.buffer);
+			keybuf.buffer = NULL;
+			keybuf.size = keybuf.offset = 0;
+
+			numkeys++;
+
+			read(keyd_fd, &keybuf.size, sizeof(keybuf.size));
+		}
+	}
+	
+	return numkeys;
 }
 
 #define NEED_KEYID2UID 1