From a3eaeb6a1fbae461f197ce7cb0e20772b5d416e1 Mon Sep 17 00:00:00 2001 From: Dmitry Simonenko Date: Fri, 8 Sep 2017 15:45:00 +0300 Subject: [PATCH] odissey: reply incorrect console query text --- sources/console.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/sources/console.c b/sources/console.c index cb034bcb..147b1039 100644 --- a/sources/console.c +++ b/sources/console.c @@ -654,29 +654,38 @@ od_console_query(od_console_t *console, od_msgconsole_t *msg_console) break; case OD_PARSER_EOF: default: - goto bad_command; + goto bad_query; } od_keyword_t *keyword; keyword = od_keyword_match(od_console_keywords, &token); if (keyword == NULL) - goto bad_command; + goto bad_query; switch (keyword->id) { case OD_LSHOW: rc = od_console_query_show(client, &parser); if (rc == -1) - goto bad_command; + goto bad_query; break; case OD_LSET: rc = od_console_query_set(client, &parser); if (rc == -1) - goto bad_command; + goto bad_query; break; default: - goto bad_command; + goto bad_query; } return 0; +bad_query: + od_error_client(&instance->logger, &client->id, "console", + "bad console command: %.*s", query_len, query); + shapito_stream_reset(&client->stream); + od_frontend_errorf(client, SHAPITO_SYNTAX_ERROR, "bad console command: %.*s", + query_len, query); + shapito_be_write_ready(&client->stream, 'I'); + return -1; + bad_command: od_error_client(&instance->logger, &client->id, "console", "bad console command");