From 3333d351eed69ea1c5d7702f8a65515be716e697 Mon Sep 17 00:00:00 2001 From: Michal Bloch Date: Tue, 19 Jan 2021 20:44:19 +0100 Subject: [PATCH] Be more assertive regarding request types Dispatchers now exist so a type mismatch should never happen. Change-Id: Ife09ed700e20375dabef165b3878c48de1adeaa5 Signed-off-by: Michal Bloch --- src/logger/log_buffer.c | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/src/logger/log_buffer.c b/src/logger/log_buffer.c index 7505a99..8200bb4 100644 --- a/src/logger/log_buffer.c +++ b/src/logger/log_buffer.c @@ -77,12 +77,7 @@ static int service_writer_handle_req_util(struct logger *server, struct writer * assert(wr); assert(msg); - // check request type, that should be always DLOG_REQ_HANDLE_LOGUTIL - // as dispatched by service_writer_handle_req_ctrl handler - // don't assert for compatibility with service_writer_handle_req_pipe - // and possible mistakes in the future that would be hard to track - if (msg->request != DLOG_REQ_HANDLE_LOGUTIL) - return -EINVAL; + assert(msg->request == DLOG_REQ_HANDLE_LOGUTIL); if (msg->length <= sizeof(struct dlog_control_msg) || msg->length > sizeof(struct dlog_control_msg) + MAX_LOGGER_REQUEST_LEN) @@ -188,12 +183,7 @@ static int service_writer_handle_req_clear(struct logger *server, struct writer (void) server; assert(msg); - // check request type, that should be always DLOG_REQ_CLEAR - // as dispatched by service_writer_handle_req_ctrl handler - // don't assert for compatibility with service_writer_handle_req_pipe - // and possible mistakes in the future that would be hard to track - if (msg->request != DLOG_REQ_CLEAR) - return -EINVAL; + assert(msg->request == DLOG_REQ_CLEAR); if (msg->length != (sizeof(struct dlog_control_msg))) return -EINVAL; @@ -253,10 +243,7 @@ static int service_writer_handle_req_pipe(struct logger *server, struct writer * assert(msg); - // check request type given by user - // don't assert that as the message is not parsed before - if (msg->request != DLOG_REQ_PIPE) - return -EINVAL; + assert(msg->request == DLOG_REQ_PIPE); if (msg->length != sizeof(struct dlog_control_msg)) return -EINVAL; -- 2.7.4