X-Git-Url: http://the.earth.li/gitweb/?a=blobdiff_plain;f=keyd.c;h=4534a570d263e0840101a3f7f8695fdee8e91a8e;hb=5d25774c5cd9f80709f852f79bce26d582fad360;hp=c2d83491ea91fc6e23dcd75ee57ff0a9bbef1ec9;hpb=28d25177e72f84408c99072fbe6cf05b4fc556fb;p=onak.git

diff --git a/keyd.c b/keyd.c
index c2d8349..4534a57 100644
--- a/keyd.c
+++ b/keyd.c
@@ -17,9 +17,9 @@
 #include <sys/socket.h>
 #include <sys/types.h>
 #include <sys/un.h>
+#include <time.h>
 #include <unistd.h>
 
-#include "config.h"
 #include "charfuncs.h"
 #include "cleanup.h"
 #include "keyd.h"
@@ -30,6 +30,9 @@
 #include "mem.h"
 #include "onak-conf.h"
 #include "parsekey.h"
+#include "version.h"
+
+static struct keyd_stats *stats;
 
 void daemonize(void)
 {
@@ -137,6 +140,7 @@ int sock_do(int fd)
 	struct openpgp_packet_list *packets = NULL;
 	struct openpgp_packet_list *list_end = NULL;
 	struct buffer_ctx storebuf;
+	struct skshash hash;
 
 	/*
 	 * Get the command from the client.
@@ -150,6 +154,11 @@ int sock_do(int fd)
 	}
 	
 	if (ret == 0) {
+		if (cmd < KEYD_CMD_LAST) {
+			stats->command_stats[cmd]++;
+		} else {
+			stats->command_stats[KEYD_CMD_UNKNOWN]++;
+		}
 		switch (cmd) {
 		case KEYD_CMD_VERSION:
 			cmd = KEYD_REPLY_OK;
@@ -341,6 +350,61 @@ int sock_do(int fd)
 			ret = 1;
 			trytocleanup();
 			break;
+		case KEYD_CMD_STATS:
+			cmd = KEYD_REPLY_OK;
+			write(fd, &cmd, sizeof(cmd));
+			cmd = sizeof(*stats);
+			write(fd, &cmd, sizeof(cmd));
+			write(fd, stats,
+				sizeof(*stats));
+			break;
+		case KEYD_CMD_GETSKSHASH:
+			cmd = KEYD_REPLY_OK;
+			write(fd, &cmd, sizeof(cmd));
+			bytes = read(fd, hash.hash, sizeof(hash.hash));
+			if (bytes != sizeof(hash.hash)) {
+				ret = 1;
+			}
+			storebuf.offset = 0;
+			if (ret == 0) {
+				logthing(LOGTHING_INFO,
+						"Fetching by hash"
+						", result: %d",
+						config.dbbackend->
+						fetch_key_skshash(&hash,
+							&key));
+				if (key != NULL) {
+					storebuf.size = 8192;
+					storebuf.buffer = malloc(8192);
+
+					flatten_publickey(key,
+							&packets,
+							&list_end);
+					write_openpgp_stream(buffer_putchar,
+							&storebuf,
+							packets);
+					logthing(LOGTHING_TRACE,
+							"Sending %d bytes.",
+							storebuf.offset);
+					write(fd, &storebuf.offset,
+						sizeof(storebuf.offset));
+					write(fd, storebuf.buffer,
+						storebuf.offset);
+
+					free(storebuf.buffer);
+					storebuf.buffer = NULL;
+					storebuf.size = storebuf.offset = 0;
+					free_packet_list(packets);
+					packets = list_end = NULL;
+					free_publickey(key);
+					key = NULL;
+				} else {
+					write(fd, &storebuf.offset,
+						sizeof(storebuf.offset));
+				}
+			}
+			break;
+
 		default:
 			logthing(LOGTHING_ERROR, "Got unknown command: %d",
 					cmd);
@@ -372,6 +436,7 @@ int sock_accept(int fd)
 	}
 
 	if (ret != -1) {
+		stats->connects++;
 		while (!sock_do(srv)) ;
 		sock_close(srv);
 	}
@@ -381,7 +446,7 @@ int sock_accept(int fd)
 
 static void usage(void)
 {
-	puts("keyd " PACKAGE_VERSION " - backend key serving daemon for the "
+	puts("keyd " ONAK_VERSION " - backend key serving daemon for the "
 		"onak PGP keyserver.\n");
 	puts("Usage:\n");
 	puts("\tkeyd [options]\n");
@@ -429,6 +494,15 @@ int main(int argc, char *argv[])
 	catchsignals();
 	signal(SIGPIPE, SIG_IGN);
 
+
+	stats = calloc(1, sizeof(*stats));
+	if (!stats) {
+		logthing(LOGTHING_ERROR,
+			"Couldn't allocate memory for stats structure.");
+		exit(EXIT_FAILURE);
+	}
+	stats->started = time(NULL);
+
 	snprintf(sockname, 1023, "%s/%s", config.db_dir, KEYD_SOCKET);
 	fd = sock_init(sockname);
 
@@ -449,6 +523,8 @@ int main(int argc, char *argv[])
 		unlink(sockname);
 	}
 
+	free(stats);
+
 	cleanuplogthing();
 	cleanupconfig();