X-Git-Url: https://git.tokkee.org/?p=sysdb.git;a=blobdiff_plain;f=src%2Ftools%2Fsysdb%2Fcommand.c;h=5044c0e5213aac42cb4456cd9dafe465264f4010;hp=1128c388e8bbd827f63e63cb2cd2628137e146fd;hb=865b0a3b20fe3c1eb014e22e4b1f45f4fa931ce5;hpb=840ccffd2fbeb0277b1637941f396ce023dcec3d

diff --git a/src/tools/sysdb/command.c b/src/tools/sysdb/command.c
index 1128c38..5044c0e 100644
--- a/src/tools/sysdb/command.c
+++ b/src/tools/sysdb/command.c
@@ -29,42 +29,117 @@
 #	include "config.h"
 #endif /* HAVE_CONFIG_H */
 
+#include "sysdb.h"
+
 #include "tools/sysdb/command.h"
 #include "tools/sysdb/input.h"
 
 #include "frontend/proto.h"
 #include "utils/error.h"
+#include "utils/proto.h"
 #include "utils/strbuf.h"
 
 #include <errno.h>
 
 #include <assert.h>
 #include <ctype.h>
+#include <stdlib.h>
 #include <string.h>
 
+static void
+log_printer(sdb_strbuf_t *buf)
+{
+	uint32_t prio = sdb_proto_get_int(buf, 0);
+
+	if (prio == UINT32_MAX) {
+		printf("ERROR: Received a LOG message with invalid "
+				"or missing priority\n");
+		return;
+	}
+	sdb_strbuf_skip(buf, 0, sizeof(prio));
+
+	printf("%s: %s\n", SDB_LOG_PRIO_TO_STRING((int)prio),
+			sdb_strbuf_string(buf));
+} /* log_printer */
+
+static void
+data_printer(sdb_strbuf_t *buf)
+{
+	size_t len = sdb_strbuf_len(buf);
+
+	if ((! len) || (len == sizeof(uint32_t))) {
+		/* empty command or empty reply */
+		return;
+	}
+	else if (len < sizeof(uint32_t)) {
+		printf("ERROR: Received a DATA message with invalid "
+				"or missing data-type\n");
+		return;
+	}
+
+	/* At the moment, we don't care about the result type. We simply print the
+	 * result without further parsing it. */
+	sdb_strbuf_skip(buf, 0, sizeof(uint32_t));
+	printf("%s\n", sdb_strbuf_string(buf));
+} /* data_printer */
+
+static struct {
+	int status;
+	void (*printer)(sdb_strbuf_t *);
+} response_printers[] = {
+	{ SDB_CONNECTION_LOG,  log_printer },
+	{ SDB_CONNECTION_DATA, data_printer },
+};
+
+static void
+clear_query(sdb_input_t *input)
+{
+	sdb_strbuf_skip(input->input, 0, input->query_len);
+	input->tokenizer_pos -= input->query_len;
+	input->query_len = 0;
+} /* clear_query */
+
 /*
  * public API
  */
 
 int
-sdb_command_print_reply(sdb_input_t *input)
+sdb_command_print_reply(sdb_client_t *client)
 {
 	sdb_strbuf_t *recv_buf;
 	const char *result;
 	uint32_t rcode = 0;
 
+	int status = 0;
+	size_t i;
+
 	recv_buf = sdb_strbuf_create(1024);
 	if (! recv_buf)
 		return -1;
 
-	if (sdb_client_recv(input->client, &rcode, recv_buf) < 0)
+	if (sdb_client_recv(client, &rcode, recv_buf) < 0)
 		rcode = UINT32_MAX;
 
-	if (sdb_client_eof(input->client))
+	if (sdb_client_eof(client)) {
+		sdb_strbuf_destroy(recv_buf);
 		return -1;
+	}
 
-	if (rcode == UINT32_MAX)
+	if (rcode == UINT32_MAX) {
 		printf("ERROR: ");
+		status = -1;
+	}
+	else
+		status = (int)rcode;
+
+	for (i = 0; i < SDB_STATIC_ARRAY_LEN(response_printers); ++i) {
+		if (status == response_printers[i].status) {
+			response_printers[i].printer(recv_buf);
+			sdb_strbuf_destroy(recv_buf);
+			return status;
+		}
+	}
+
 	result = sdb_strbuf_string(recv_buf);
 	if (result && *result)
 		printf("%s\n", result);
@@ -74,7 +149,7 @@ sdb_command_print_reply(sdb_input_t *input)
 	}
 
 	sdb_strbuf_destroy(recv_buf);
-	return 0;
+	return status;
 } /* sdb_command_print_reply */
 
 char *
@@ -98,18 +173,33 @@ sdb_command_exec(sdb_input_t *input)
 	while (query_len && (query[query_len - 1]) == '\n')
 		--query_len;
 
+	if (sdb_client_eof(input->client)) {
+		if (sdb_input_reconnect()) {
+			clear_query(input);
+			return NULL;
+		}
+	}
+
 	if (query_len) {
 		data = strndup(query, query_len);
 		/* ignore errors; we'll only hide the command from the caller */
 
-		sdb_client_send(input->client, CONNECTION_QUERY, query_len, query);
-		if (sdb_command_print_reply(input))
-			return NULL;
+		sdb_client_send(input->client, SDB_CONNECTION_QUERY, query_len, query);
+
+		/* The server will send back *something*, either error/log messages
+		 * and/or the reply to the query. Here, we don't care about what it
+		 * sends back. We'll wait for the first reply and then return to the
+		 * main loop which will handle any subsequent replies, including
+		 * eventually the reply to the query (if it's not the first reply). */
+		/* TODO: wait for the actual reply instead */
+		if (sdb_command_print_reply(input->client) < 0) {
+			if (data)
+				free(data);
+			data = NULL;
+		}
 	}
 
-	sdb_strbuf_skip(input->input, 0, input->query_len);
-	input->tokenizer_pos -= input->query_len;
-	input->query_len = 0;
+	clear_query(input);
 	return data;
 } /* sdb_command_exec */