X-Git-Url: https://the.earth.li/gitweb/?a=blobdiff_plain;f=keydctl.c;h=a2b312ca985d9f274f4858ebccba6dc239e8b96c;hb=adc800dbc424a1e246dd4a82a0c2e88eeda25531;hp=e46a355c5aa41aa5030c75c0cd3c04e1e1eb6815;hpb=5e1b22d763640c4d7a09d07920403d8d491b4410;p=onak.git

diff --git a/keydctl.c b/keydctl.c
index e46a355..a2b312c 100644
--- a/keydctl.c
+++ b/keydctl.c
@@ -13,8 +13,7 @@
  * more details.
  *
  * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc., 51
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 #include <errno.h>
@@ -32,7 +31,7 @@
 #include "version.h"
 
 /* HACK: We need to stop onak-conf.o requiring this. */
-void *DBFUNCS = NULL;
+void *DBINIT = NULL;
 
 static int keyd_fd = -1;
 static int verbose = 0;
@@ -99,7 +98,7 @@ static void keyd_connect(void)
 
 	sock.sun_family = AF_UNIX;
 	snprintf(sock.sun_path, sizeof(sock.sun_path) - 1, "%s/%s",
-			config.db_dir,
+			config.sock_dir,
 			KEYD_SOCKET);
 	if (connect(keyd_fd, (struct sockaddr *) &sock, sizeof(sock)) < 0) {
 		if (verbose >= 0) {
@@ -154,23 +153,37 @@ static void keyd_status(void)
 	uint32_t reply;
 	struct keyd_stats stats;
 
-	keyd_do_command(KEYD_CMD_VERSION, &reply, sizeof(reply));
+	if (keyd_do_command(KEYD_CMD_VERSION, &reply, sizeof(reply)) == -1) {
+		printf("Got failure asking for keyd version.\n");
+		return;
+	}
 	printf("Using keyd protocol version %d.\n", reply);
 
-	keyd_do_command(KEYD_CMD_STATS, &stats, sizeof(stats));
+	if (keyd_do_command(KEYD_CMD_STATS, &stats, sizeof(stats)) == -1) {
+		printf("Got failure asking for keyd statistics.\n");
+		return;
+	}
+
 	printf("keyd running since %s", ctime(&stats.started));
 	printf("%d client connections received\n", stats.connects);
 
 	printf("Command statistics:\n");
 	printf("  Version:          %d\n",
 		stats.command_stats[KEYD_CMD_VERSION]);
-	printf("  Get key:          %d\n", stats.command_stats[KEYD_CMD_GET]);
+	printf("  Get key by ID:    %d\n",
+		stats.command_stats[KEYD_CMD_GET_ID]);
+	printf("  Get key by FP:    %d\n",
+		stats.command_stats[KEYD_CMD_GET_FP]);
+	printf("  Get key by hash:  %d\n",
+		stats.command_stats[KEYD_CMD_GET_SKSHASH]);
 	printf("  Store key:        %d\n",
 		stats.command_stats[KEYD_CMD_STORE]);
 	printf("  Delete key:       %d\n",
 		stats.command_stats[KEYD_CMD_DELETE]);
+	printf("  Update key:       %d\n",
+		stats.command_stats[KEYD_CMD_UPDATE]);
 	printf("  Search key:       %d\n",
-		stats.command_stats[KEYD_CMD_GETTEXT]);
+		stats.command_stats[KEYD_CMD_GET_TEXT]);
 	printf("  Get full keyid:   %d\n",
 		stats.command_stats[KEYD_CMD_GETFULLKEYID]);
 	printf("  Iterate all keys: %d\n",
@@ -190,7 +203,7 @@ static void usage(void)
 {
 	puts("keydctl " ONAK_VERSION " - control an onak keyd instance.\n");
 	puts("Usage:\n");
-	puts("\tonak [options] <command> <parameters>\n");
+	puts("\tkeydctl [options] <command> <parameters>\n");
 	puts("\tCommands:\n");
 	puts("\tcheck    - check if keyd is running");
 	puts("\tquit     - request that keyd cleanly shuts down");
@@ -220,6 +233,7 @@ int main(int argc, char *argv[])
 	configfile = NULL;
 
 	if ((argc - optind) < 1) {
+		cleanupconfig();
 		usage();
 	} else if (!strcmp("check", argv[optind])) {
 		/* Just do the connect and close quietly */
@@ -235,9 +249,11 @@ int main(int argc, char *argv[])
 		keyd_do_command(KEYD_CMD_QUIT, NULL, 0);
 		keyd_close();
 	} else {
+		cleanupconfig();
 		usage();
 	}
 
+	cleanupconfig();
 
 	exit(EXIT_SUCCESS);
 }