X-Git-Url: https://git.tokkee.org/?p=sysdb.git;a=blobdiff_plain;f=src%2Ftools%2Fsysdb%2Fcommand.c;h=61960be83505ca167e4045f6a225854b9aeb0946;hp=3b64def385ebd64251bbd07dc4f79fe500353da8;hb=0a3dd5b9b97e25156412a95bcecf25f8d75c72fc;hpb=09f52d643f0c07cc0e0db33d7a5f72782390fc5a diff --git a/src/tools/sysdb/command.c b/src/tools/sysdb/command.c index 3b64def..61960be 100644 --- a/src/tools/sysdb/command.c +++ b/src/tools/sysdb/command.c @@ -29,63 +29,214 @@ # include "config.h" #endif /* HAVE_CONFIG_H */ +#include "sysdb.h" + #include "tools/sysdb/command.h" #include "tools/sysdb/input.h" +#include "tools/sysdb/json.h" #include "frontend/proto.h" +#include "utils/error.h" +#include "utils/proto.h" #include "utils/strbuf.h" +#include + #include #include +#include +#include + +static void +ok_printer(sdb_input_t __attribute__((unused)) *input, sdb_strbuf_t *buf) +{ + const char *msg = sdb_strbuf_string(buf); + if (msg && *msg) + printf("%s\n", msg); + else + printf("OK\n"); +} /* ok_printer */ + +static void +log_printer(sdb_input_t __attribute__((unused)) *input, sdb_strbuf_t *buf) +{ + uint32_t prio = 0; + + if (sdb_proto_unmarshal_int32(SDB_STRBUF_STR(buf), &prio) < 0) { + 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_input_t __attribute__((unused)) *input, sdb_strbuf_t *buf) +{ + size_t len = sdb_strbuf_len(buf); + uint32_t type = 0; + + 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; + } + + sdb_proto_unmarshal_int32(SDB_STRBUF_STR(buf), &type); + sdb_strbuf_skip(buf, 0, sizeof(uint32_t)); + if (sdb_json_print(input, (int)type, buf)) + sdb_log(SDB_LOG_ERR, "Failed to print result"); + printf("\n"); +} /* data_printer */ + +static struct { + int status; + void (*printer)(sdb_input_t *, sdb_strbuf_t *); +} response_printers[] = { + { SDB_CONNECTION_OK, ok_printer }, + { 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 */ int +sdb_command_print_reply(sdb_input_t *input) +{ + sdb_strbuf_t *recv_buf; + const char *result; + uint32_t rcode = 0; + + int status = -1; + size_t i; + + recv_buf = sdb_strbuf_create(1024); + if (! recv_buf) + return -1; + + if (sdb_client_recv(input->client, &rcode, recv_buf) < 0) + rcode = UINT32_MAX; + + if (sdb_client_eof(input->client)) { + sdb_strbuf_destroy(recv_buf); + return -1; + } + + 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(input, recv_buf); + sdb_strbuf_destroy(recv_buf); + return status; + } + } + + result = sdb_strbuf_string(recv_buf); + if (result && *result) + sdb_log(SDB_LOG_ERR, "%s", result); + else if (rcode == UINT32_MAX) { + char errbuf[1024]; + sdb_log(SDB_LOG_ERR, "%s", + sdb_strerror(errno, errbuf, sizeof(errbuf))); + } + + sdb_strbuf_destroy(recv_buf); + return status; +} /* sdb_command_print_reply */ + +char * sdb_command_exec(sdb_input_t *input) { const char *query; uint32_t query_len; + char *data = NULL; + query = sdb_strbuf_string(input->input); query_len = (uint32_t)input->query_len; assert(input->query_len <= input->tokenizer_pos); - /* removing leading and trailing whitespace */ - while (isspace((int)*query) && query_len) { + /* removing leading and trailing newlines */ + while (query_len && (*query == '\n')) { ++query; --query_len; } - while (query_len && (isspace((int)query[query_len - 1]) - || (query[query_len - 1] == ';'))) + while (query_len && (query[query_len - 1]) == '\n') --query_len; if (query_len) { - sdb_strbuf_t *recv_buf; - uint32_t rcode = 0; - - recv_buf = sdb_strbuf_create(1024); - if (! recv_buf) - return -1; - - sdb_client_send(input->client, CONNECTION_QUERY, query_len, query); - if (sdb_client_recv(input->client, &rcode, recv_buf) < 0) - rcode = UINT32_MAX; - - if (rcode == UINT32_MAX) - printf("ERROR: "); - printf("%s\n", sdb_strbuf_string(recv_buf)); - - sdb_strbuf_destroy(recv_buf); + data = strndup(query, query_len); + /* ignore errors; we'll only hide the command from the caller */ } - sdb_strbuf_skip(input->input, 0, input->query_len); - input->tokenizer_pos -= input->query_len; - input->query_len = 0; - return 0; + 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); + if (status < 0) { + sdb_log(SDB_LOG_ERR, "Failed to read reply from server"); + break; + } + + if ((status == SDB_CONNECTION_OK) + || (status == SDB_CONNECTION_DATA) + || (status == SDB_CONNECTION_ERROR)) + break; + } + clear_query(input); + return data; } /* sdb_command_exec */ +void +sdb_command_print_server_version(sdb_input_t *input) +{ + sdb_strbuf_t *buf = sdb_strbuf_create(32); + uint32_t code = 0, version = 0; + const char *extra; + + if ((sdb_client_rpc(input->client, SDB_CONNECTION_SERVER_VERSION, + 0, NULL, &code, buf) < 0) || (code != SDB_CONNECTION_OK)) + return; + if (sdb_strbuf_len(buf) < sizeof(version)) + return; + + sdb_proto_unmarshal_int32(SDB_STRBUF_STR(buf), &version); + extra = sdb_strbuf_string(buf) + sizeof(version); + sdb_log(SDB_LOG_INFO, "SysDB server %d.%d.%d%s", + SDB_VERSION_DECODE((int)version), extra); + sdb_strbuf_destroy(buf); +} /* sdb_command_print_server_version */ + /* vim: set tw=78 sw=4 ts=4 noexpandtab : */