From 2cec5d20ae0b5361a84bfb8170335f2502ddd88f Mon Sep 17 00:00:00 2001 From: "S. Hameed" Date: Fri, 20 Mar 2015 18:01:24 +0900 Subject: Add Service ID Last entry to avoid further modifications in dependent code Signed-off-by: S. Hameed Signed-off-by: Christoph Lipka --- include/dlt/dlt_protocol.h | 1 + src/daemon/dlt_daemon_client.c | 2 +- src/shared/dlt_common.c | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/include/dlt/dlt_protocol.h b/include/dlt/dlt_protocol.h index b4fff5c..7bf8b1c 100755 --- a/include/dlt/dlt_protocol.h +++ b/include/dlt/dlt_protocol.h @@ -189,6 +189,7 @@ #define DLT_SERVICE_ID_SET_DEFAULT_TRACE_STATUS 0x12 /**< Service ID: Set default trace status */ #define DLT_SERVICE_ID_GET_SOFTWARE_VERSION 0x13 /**< Service ID: Get software version */ #define DLT_SERVICE_ID_MESSAGE_BUFFER_OVERFLOW 0x14 /**< Service ID: Message buffer overflow */ +#define DLT_SERVICE_ID_LAST_ENTRY 0x15 /**< Service ID: Last entry to avoid any further modifications in dependent code */ #define DLT_SERVICE_ID_UNREGISTER_CONTEXT 0xf01 /**< Service ID: Message unregister context */ #define DLT_SERVICE_ID_CONNECTION_INFO 0xf02 /**< Service ID: Message connection info */ #define DLT_SERVICE_ID_TIMEZONE 0xf03 /**< Service ID: Timezone */ diff --git a/src/daemon/dlt_daemon_client.c b/src/daemon/dlt_daemon_client.c index 00ad5b9..6fde373 100644 --- a/src/daemon/dlt_daemon_client.c +++ b/src/daemon/dlt_daemon_client.c @@ -299,7 +299,7 @@ int dlt_daemon_client_process_control(int sock, DltDaemon *daemon, DltDaemonLoca id_tmp = *((uint32_t*)(msg->databuffer)); id=DLT_ENDIAN_GET_32(msg->standardheader->htyp ,id_tmp); - if ((id > 0) && (id <= DLT_SERVICE_ID_MESSAGE_BUFFER_OVERFLOW)) + if ((id > 0) && (id < DLT_SERVICE_ID_LAST_ENTRY)) { /* Control message handling */ switch (id) diff --git a/src/shared/dlt_common.c b/src/shared/dlt_common.c index 194f548..dce48c6 100755 --- a/src/shared/dlt_common.c +++ b/src/shared/dlt_common.c @@ -953,7 +953,7 @@ int dlt_message_payload(DltMessage *msg,char *text,int textlength,int type,int v /* process message id / service id */ if (DLT_MSG_IS_CONTROL(msg)) { - if (id > 0 && id <= DLT_SERVICE_ID_MESSAGE_BUFFER_OVERFLOW) + if (id > 0 && id < DLT_SERVICE_ID_LAST_ENTRY) { snprintf(text+strlen(text),textlength-strlen(text),"%s",service_id[id]); /* service id */ } -- cgit v1.2.1