From eaf180bbe2cd7134cf31f2a8627fa861519d95ad Mon Sep 17 00:00:00 2001
From: Lassi Marttala <Lassi.LM.Marttala@partner.bmw.de>
Date: Fri, 18 Jan 2013 11:44:02 +0100
Subject: Unify ECU version sending functions

Review changes:
Lower log level when opening fails. It might be deliberately set to non-existent file.
Give name to period time in ECU version sending

Merge branch 'LM-GSWD-162'

Signed-off-by: Alexander Wenzel <Alexander.AW.Wenzel@bmw.de>
---
 src/daemon/dlt_daemon_common.c | 58 ++----------------------------------------
 1 file changed, 2 insertions(+), 56 deletions(-)

(limited to 'src/daemon/dlt_daemon_common.c')

diff --git a/src/daemon/dlt_daemon_common.c b/src/daemon/dlt_daemon_common.c
index 28e9d54..69aecdc 100644
--- a/src/daemon/dlt_daemon_common.c
+++ b/src/daemon/dlt_daemon_common.c
@@ -1562,7 +1562,6 @@ void dlt_daemon_control_set_timing_packets(int sock, DltDaemon *daemon, DltMessa
 
 void dlt_daemon_control_get_software_version(int sock, DltDaemon *daemon, int verbose)
 {
-	char version[DLT_DAEMON_COMMON_TEXTBUFSIZE];
     DltMessage msg;
     uint32_t len;
 	DltServiceGetSoftwareVersionResponse *resp;
@@ -1582,8 +1581,7 @@ void dlt_daemon_control_get_software_version(int sock, DltDaemon *daemon, int ve
     }
 
     /* prepare payload of data */
-    dlt_get_version(version);
-    len = strlen(version);
+    len = strlen(daemon->ECUVersionString);
 
     msg.datasize = sizeof(DltServiceGetSoftwareVersionResponse) + len;
     if (msg.databuffer && (msg.databuffersize < msg.datasize))
@@ -1605,7 +1603,7 @@ void dlt_daemon_control_get_software_version(int sock, DltDaemon *daemon, int ve
     resp->service_id = DLT_SERVICE_ID_GET_SOFTWARE_VERSION;
     resp->status = DLT_SERVICE_RESPONSE_OK;
     resp->length = len;
-    memcpy(msg.databuffer+sizeof(DltServiceGetSoftwareVersionResponse),version,len);
+    memcpy(msg.databuffer+sizeof(DltServiceGetSoftwareVersionResponse),daemon->ECUVersionString,len);
 
     /* send message */
     dlt_daemon_control_send_control_message(sock, daemon, &msg,"","",  verbose);
@@ -2139,58 +2137,6 @@ void dlt_daemon_control_service_response( int sock, DltDaemon *daemon, uint32_t
     dlt_message_free(&msg,0);
 }
 
-void dlt_daemon_control_send_ecu_version(int sock, DltDaemon *daemon, const char *version, int verbose)
-{
-    DltMessage msg;
-    uint32_t len;
-    DltServiceGetSoftwareVersionResponse *resp;
-
-    PRINT_FUNCTION_VERBOSE(verbose);
-
-    if (daemon==0 || version == NULL)
-    {
-        return;
-    }
-
-    /* initialise new message */
-    if (dlt_message_init(&msg,0)==-1)
-    {
-    	dlt_daemon_control_service_response(sock, daemon, DLT_SERVICE_ID_GET_SOFTWARE_VERSION, DLT_SERVICE_RESPONSE_ERROR,  verbose);
-		return;
-    }
-
-    /* prepare payload of data */
-    len = strlen(version);
-
-    msg.datasize = sizeof(DltServiceGetSoftwareVersionResponse) + len;
-    if (msg.databuffer && (msg.databuffersize < msg.datasize))
-    {
-        free(msg.databuffer);
-        msg.databuffer=0;
-    }
-    if (msg.databuffer == 0){
-    	msg.databuffer = (uint8_t *) malloc(msg.datasize);
-    	msg.databuffersize = msg.datasize;
-    }
-    if (msg.databuffer==0)
-    {
-        dlt_daemon_control_service_response(sock, daemon, DLT_SERVICE_ID_GET_SOFTWARE_VERSION, DLT_SERVICE_RESPONSE_ERROR,  verbose);
-        return;
-    }
-
-    resp = (DltServiceGetSoftwareVersionResponse*) msg.databuffer;
-    resp->service_id = DLT_SERVICE_ID_GET_SOFTWARE_VERSION;
-    resp->status = DLT_SERVICE_RESPONSE_OK;
-    resp->length = len;
-    memcpy(msg.databuffer+sizeof(DltServiceGetSoftwareVersionResponse),version,len);
-
-    /* send message */
-    dlt_daemon_control_send_control_message(sock, daemon, &msg,"","",  verbose);
-
-    /* free message */
-    dlt_message_free(&msg,0);
-}
-
 void dlt_daemon_control_send_control_message( int sock, DltDaemon *daemon, DltMessage *msg, char* appid, char* ctid, int verbose)
 {
     ssize_t ret;
-- 
cgit v1.2.1