Add a suffix to integer marshal/unmarshal functions specifying the int size.

[sysdb.git] / src / tools / sysdb / command.c

diff --git a/src/tools/sysdb/command.c b/src/tools/sysdb/command.c
index 718309bfad693678f93e1017eb5e01578b1b3b5a..2706dd220e12fbe8e5bacb0af539b313d08a8a8a 100644 (file)
--- a/src/tools/sysdb/command.c
+++ b/src/tools/sysdb/command.c
@@ -29,11 +29,14 @@
 #      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>
@@ -43,6 +46,59 @@
 #include <stdlib.h>
 #include <string.h>
 
+static void
+log_printer(sdb_strbuf_t *buf)
+{
+       uint32_t prio = sdb_proto_unmarshal_int32(SDB_STRBUF_STR(buf));
+
+       if (prio == UINT32_MAX) {
+               sdb_log(SDB_LOG_WARNING, "Received a LOG message with invalid "
+                               "or missing priority");
+               prio = (uint32_t)SDB_LOG_ERR;
+       }
+       sdb_strbuf_skip(buf, 0, sizeof(prio));
+
+       sdb_log((int)prio, "%s", 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)) {
+               sdb_log(SDB_LOG_ERR, "Received a DATA message with invalid "
+                               "or missing data-type");
+               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;
+       input->have_input = 0;
+} /* clear_query */
+
 /*
  * public API
  */
@@ -53,7 +109,9 @@ sdb_command_print_reply(sdb_client_t *client)
        sdb_strbuf_t *recv_buf;
        const char *result;
        uint32_t rcode = 0;
-       int status = 0;
+
+       int status = -1;
+       size_t i;
 
        recv_buf = sdb_strbuf_create(1024);
        if (! recv_buf)
@@ -67,23 +125,24 @@ sdb_command_print_reply(sdb_client_t *client)
                return -1;
        }
 
-       if (rcode == UINT32_MAX) {
-               printf("ERROR: ");
-               status = -1;
-       }
-       else
+       if (rcode != UINT32_MAX)
                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);
-       /* At the moment, we don't care about the result type. We simply print the
-        * result without further parsing it. */
-       if (status == CONNECTION_DATA)
-               result += sizeof(uint32_t);
        if (result && *result)
-               printf("%s\n", result);
+               sdb_log(SDB_LOG_ERR, "%s", result);
        else if (rcode == UINT32_MAX) {
                char errbuf[1024];
-               printf("%s\n", sdb_strerror(errno, errbuf, sizeof(errbuf)));
+               sdb_log(SDB_LOG_ERR, "%s",
+                               sdb_strerror(errno, errbuf, sizeof(errbuf)));
        }
 
        sdb_strbuf_destroy(recv_buf);
@@ -114,24 +173,33 @@ sdb_command_exec(sdb_input_t *input)
        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);
-
-               /* 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). */
-               if (sdb_command_print_reply(input->client) < 0) {
-                       if (data)
-                               free(data);
-                       return NULL;
+       if (sdb_client_eof(input->client)) {
+               if (sdb_input_reconnect()) {
+                       clear_query(input);
+                       return data;
                }
        }
+       else if (! query_len)
+               return NULL;
+
+       sdb_client_send(input->client, SDB_CONNECTION_QUERY, query_len, query);
+
+       /* The server may send back log messages but will eventually reply to the
+        * query, which is either DATA or ERROR. */
+       while (42) {
+               int status = sdb_command_print_reply(input->client);
+               if (status < 0) {
+                       sdb_log(SDB_LOG_ERR, "Failed to read reply from server");
+                       break;
+               }
 
-       sdb_strbuf_skip(input->input, 0, input->query_len);
-       input->tokenizer_pos -= input->query_len;
-       input->query_len = 0;
+               if ((status == SDB_CONNECTION_DATA)
+                               || (status == SDB_CONNECTION_ERROR))
+                       break;
+       }
+       clear_query(input);
        return data;
 } /* sdb_command_exec */