[GENDLT-21] Fixed bug: Message Counter (MCNT) should be increased but is always 0

Signed-off-by: Christian Muck <christian.muck@bmw.de>

2 files changed, 6 insertions, 4 deletions

diff --git a/include/dlt/dlt_user.h b/include/dlt/dlt_user.h
index ac889c7..edfeef2 100755
--- a/include/dlt/dlt_user.h
+++ b/include/dlt/dlt_user.h
@@ -173,7 +173,8 @@ typedef enum
 typedef struct
 {
 	char contextID[4];                            /**< context id */
-    int32_t log_level_pos;                        /**< offset in user-application context field */
+	int32_t log_level_pos;                        /**< offset in user-application context field */
+    uint8_t mcnt;                                 /**< message counter */
 } DltContext;
 
 /**
@@ -187,7 +188,6 @@ typedef struct
 	int32_t log_level;                            /**< log level */
 	int32_t trace_status;                         /**< trace status */
 	int32_t args_num;                             /**< number of arguments for extended header*/
-	uint8_t mcnt;                                 /**< message counter */
 	char* context_description;                    /**< description of context */
 } DltContextData;
 
diff --git a/src/lib/dlt_user.c b/src/lib/dlt_user.c
index dc65cab..6ed45a6 100755
--- a/src/lib/dlt_user.c
+++ b/src/lib/dlt_user.c
@@ -569,6 +569,9 @@ int dlt_register_context_ll_ts(DltContext *handle, const char *contextid, const
     	return -1;
     }
 
+    /* Reset message counter */
+    handle->mcnt = 0;
+
     /* Store context id in log level/trace status field */
 
     /* Check if already registered, else register context */
@@ -2051,7 +2054,6 @@ int dlt_user_log_init(DltContext *handle, DltContextData *log)
     }
 
     log->handle = handle;
-    log->mcnt = 0;
 
     return 0;
 }
@@ -2131,7 +2133,7 @@ int dlt_user_log_send_log(DltContextData *log, int mtype)
     msg.standardheader->htyp = (msg.standardheader->htyp | DLT_HTYP_MSBF);
 #endif
 
-    msg.standardheader->mcnt = log->mcnt++;
+    msg.standardheader->mcnt = log->handle->mcnt++;
 
     /* Set header extra parameters */
     dlt_set_id(msg.headerextra.ecu,dlt_user.ecuID);