Implementation of command line tool dlt-control.

Signed-off-by: Alexander Wenzel <Alexander.AW.Wenzel@bmw.de>

4 files changed, 452 insertions, 12 deletions

diff --git a/include/dlt/dlt_client.h b/include/dlt/dlt_client.h
index 450d8cc..58bfaf0 100755
--- a/include/dlt/dlt_client.h
+++ b/include/dlt/dlt_client.h
@@ -119,6 +119,16 @@ int dlt_client_cleanup(DltClient *client, int verbose);
  * @return negative value if there was an error
  */

 int dlt_client_main_loop(DltClient *client, void *data, int verbose);
+/**

+ * Send ancontrol message to the dlt daemon

+ * @param client pointer to dlt client structure

+ * @param apid application id

+ * @param ctid context id

+ * @param payload Buffer filled with control message data

+ * @param size Size of control message data

+ * @return negative value if there was an error

+ */

+int dlt_client_send_ctrl_msg(DltClient *client, char *apid, char *ctid, uint8_t *payload, uint32_t size);

 /**
  * Send an injection message to the dlt daemon
  * @param client pointer to dlt client structure
diff --git a/src/console/CMakeLists.txt b/src/console/CMakeLists.txt
index 56ad44f..bbab009 100755
--- a/src/console/CMakeLists.txt
+++ b/src/console/CMakeLists.txt
@@ -24,7 +24,12 @@ add_executable(dlt-receive ${dlt_receive_SRCS} ${dlt_most_SRCS})
 target_link_libraries(dlt-receive dlt ${EXPAT_LIBRARIES})
 set_target_properties(dlt-receive PROPERTIES LINKER_LANGUAGE C)
 
-install(TARGETS dlt-convert dlt-receive
+set(dlt_control_SRCS dlt-control.c)
+add_executable(dlt-control ${dlt_control_SRCS} ${dlt_most_SRCS})
+target_link_libraries(dlt-control dlt ${EXPAT_LIBRARIES})
+set_target_properties(dlt-control PROPERTIES LINKER_LANGUAGE C)
+
+install(TARGETS dlt-convert dlt-receive dlt-control
 	RUNTIME DESTINATION bin
 	COMPONENT base)
 
diff --git a/src/console/dlt-control.c b/src/console/dlt-control.c
new file mode 100755
index 0000000..4d16be1
--- /dev/null
+++ b/src/console/dlt-control.c
@@ -0,0 +1,398 @@
+/**
+ * @licence app begin@
+ * Copyright (C) 2012  BMW AG
+ *
+ * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps.
+ *
+ * Contributions are licensed to the GENIVI Alliance under one or more
+ * Contribution License Agreements.
+ *
+ * \copyright
+ * This Source Code Form is subject to the terms of the
+ * Mozilla Public License, v. 2.0. If a  copy of the MPL was not distributed with
+ * this file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ *
+ * \author Alexander Wenzel <alexander.aw.wenzel@bmw.de> BMW 2011-2012
+ *
+ * \file dlt-receive.c
+ * For further information see http://www.genivi.org/.
+ * @licence end@
+ */
+
+
+/*******************************************************************************
+**                                                                            **
+**  SRC-MODULE: dlt-control.cpp                                               **
+**                                                                            **
+**  TARGET    : linux                                                         **
+**                                                                            **
+**  PROJECT   : DLT                                                           **
+**                                                                            **
+**  AUTHOR    : Alexander Wenzel Alexander.AW.Wenzel@bmw.de                   **
+**                                                                            **
+**  PURPOSE   :                                                               **
+**                                                                            **
+**  REMARKS   :                                                               **
+**                                                                            **
+**  PLATFORM DEPENDANT [yes/no]: yes                                          **
+**                                                                            **
+**  TO BE CHANGED BY USER [yes/no]: no                                        **
+**                                                                            **
+*******************************************************************************/
+
+/*******************************************************************************
+**                      Author Identity                                       **
+********************************************************************************
+**                                                                            **
+** Initials     Name                       Company                            **
+** --------     -------------------------  ---------------------------------- **
+**  aw          Alexander Wenzel           BMW                                **
+*******************************************************************************/
+
+#include <ctype.h>      /* for isprint() */
+#include <stdlib.h>     /* for atoi() */
+#include <sys/stat.h>   /* for S_IRUSR, S_IWUSR, S_IRGRP, S_IROTH */
+#include <fcntl.h>      /* for open() */
+#include <sys/uio.h>    /* for writev() */
+#include <string.h>     /* for open() */
+
+#include "dlt_client.h"
+
+#define DLT_RECEIVE_TEXTBUFSIZE 10024  /* Size of buffer for text output */
+
+#define DLT_RECEIVE_ECU_ID "RECV"
+
+/* Function prototypes */
+int dlt_receive_message_callback(DltMessage *message, void *data);
+
+typedef struct {
+    int vflag;
+    int yflag;
+    char *evalue;
+
+    char *avalue;
+    char *cvalue;
+    int svalue;
+    char *mvalue;
+    char *xvalue;
+    int tvalue;
+
+    int bvalue;
+    char ecuid[4];
+    DltFile file;
+    DltFilter filter;
+} DltReceiveData;
+
+
+void hexAsciiToBinary (const char *ptr,uint8_t *binary,int *size)
+{
+
+	char ch = *ptr;
+	int pos = 0;
+	binary[pos] = 0;
+	int first = 1;
+	int found;
+
+	for(;;)
+	{
+
+		if(ch == 0)
+		{
+			*size = pos;
+			return;
+		}
+
+
+		found = 0;
+		if (ch >= '0' && ch <= '9')
+		{
+			binary[pos] = (binary[pos] << 4) + (ch - '0');
+			found = 1;
+		}
+		else if (ch >= 'A' && ch <= 'F')
+		{
+			binary[pos] = (binary[pos] << 4) + (ch - 'A' + 10);
+			found = 1;
+		}
+		else if (ch >= 'a' && ch <= 'f')
+		{
+			binary[pos] = (binary[pos] << 4) + (ch - 'a' + 10);
+			found = 1;
+		}
+		if(found)
+		{
+			if(first)
+				first = 0;
+			else
+			{
+				first = 1;
+				pos++;
+				if(pos>=*size)
+					return;
+				binary[pos]=0;
+			}
+		}
+
+		ch = *(++ptr);
+	}
+
+}
+
+/**
+ * Print usage information of tool.
+ */
+void usage()
+{
+    char version[255];
+
+    dlt_get_version(version);
+
+    printf("Usage: dlt-control [options] hostname/serial_device_name\n");
+    printf("Send control message to DLT daemon.\n");
+    printf("%s \n", version);
+    printf("Options:\n");
+    printf("  -v            Verbose mode\n");
+    printf("  -h            Usage\n");
+    printf("  -y            Serial device mode\n");
+    printf("  -b baudrate   Serial device baudrate (Default: 115200)\n");
+    printf("  -e ecuid      Set ECU ID (Default: RECV)\n");
+    printf("\n");
+    printf("  -a id		    Control message application id\n");
+    printf("  -c id    		Control message context id\n");
+    printf("  -s id    		Control message injection service id\n");
+    printf("  -m message    Control message injection in ASCII\n");
+    printf("  -x message    Control message injection in Hex e.g. 'ad 01 24 ef'\n");
+    printf("  -t milliseconds Timeout to terminate application (Default:1000)'\n");
+}
+
+/**
+ * Main function of tool.
+ */
+int main(int argc, char* argv[])
+{
+    DltClient      dltclient;
+    DltReceiveData dltdata;
+    int c;
+    int index;
+
+    /* Initialize dltdata */
+    dltdata.vflag = 0;
+    dltdata.yflag = 0;
+    dltdata.evalue = 0;
+    dltdata.bvalue = 0;
+
+    dltdata.avalue = 0;
+    dltdata.cvalue = 0;
+    dltdata.svalue = 0;
+    dltdata.mvalue = 0;
+    dltdata.xvalue = 0;
+    dltdata.tvalue = 1000;
+
+    /* Fetch command line arguments */
+    opterr = 0;
+
+    while ((c = getopt (argc, argv, "vhye:b:a:c:s:m:x:t:")) != -1)
+        switch (c)
+        {
+        case 'v':
+			{
+            	dltdata.vflag = 1;
+            	break;
+			}
+        case 'h':
+			{
+            	usage();
+            	return -1;
+			}
+        case 'y':
+			{
+            	dltdata.yflag = 1;
+            	break;
+			}
+        case 'e':
+			{
+            	dltdata.evalue = optarg;
+            	break;
+			}
+        case 'b':
+			{
+            	dltdata.bvalue = atoi(optarg);
+            	break;
+			}
+
+        case 'a':
+			{
+            	dltdata.avalue = optarg;
+            	break;
+			}
+        case 'c':
+			{
+            	dltdata.cvalue = optarg;
+            	break;
+			}
+        case 's':
+			{
+            	dltdata.svalue = atoi(optarg);
+            	break;
+			}
+        case 'm':
+			{
+            	dltdata.mvalue = optarg;
+            	break;
+			}
+        case 'x':
+			{
+            	dltdata.xvalue = optarg;
+            	break;
+			}
+        case 't':
+			{
+            	dltdata.tvalue = atoi(optarg);;
+            	break;
+			}
+
+        case '?':
+			{
+		        if (optopt == 'o' || optopt == 'f')
+				{
+		            fprintf (stderr, "Option -%c requires an argument.\n", optopt);
+		        }
+				else if (isprint (optopt))
+				{
+		            fprintf (stderr, "Unknown option `-%c'.\n", optopt);
+		        }
+				else
+				{
+		            fprintf (stderr, "Unknown option character `\\x%x'.\n",optopt);
+				}
+		        /* unknown or wrong option used, show usage information and terminate */
+		        usage();
+		        return -1;
+			}
+        default:
+			{
+            	abort ();
+                return -1;//for parasoft
+			}
+        }
+
+    /* Initialize DLT Client */
+    dlt_client_init(&dltclient, dltdata.vflag);
+
+    /* Register callback to be called when message was received */
+    dlt_client_register_message_callback(dlt_receive_message_callback);
+
+    /* Setup DLT Client structure */
+    dltclient.serial_mode = dltdata.yflag;
+
+    if (dltclient.serial_mode==0)
+    {
+        for (index = optind; index < argc; index++)
+        {
+            dltclient.servIP = argv[index];
+        }
+
+        if (dltclient.servIP == 0)
+        {
+            /* no hostname selected, show usage and terminate */
+            fprintf(stderr,"ERROR: No hostname selected\n");
+            usage();
+            dlt_client_cleanup(&dltclient,dltdata.vflag);
+            return -1;
+        }
+    }
+    else
+    {
+        for (index = optind; index < argc; index++)
+        {
+            dltclient.serialDevice = argv[index];
+        }
+
+        if (dltclient.serialDevice == 0)
+        {
+            /* no serial device name selected, show usage and terminate */
+            fprintf(stderr,"ERROR: No serial device name specified\n");
+            usage();
+            return -1;
+        }
+
+		dlt_client_setbaudrate(&dltclient,dltdata.bvalue);
+    }
+
+    /* initialise structure to use DLT file */
+    dlt_file_init(&(dltdata.file),dltdata.vflag);
+
+    /* first parse filter file if filter parameter is used */
+    dlt_filter_init(&(dltdata.filter),dltdata.vflag);
+
+    if (dltdata.evalue)
+	{
+        dlt_set_id(dltdata.ecuid,dltdata.evalue);
+    }
+	else
+	{
+        dlt_set_id(dltdata.ecuid,DLT_RECEIVE_ECU_ID);
+	}
+
+    /* Connect to TCP socket or open serial device */
+    if (dlt_client_connect(&dltclient, dltdata.vflag)!=-1)
+    {
+    	/* send injection message */
+    	if(dltdata.mvalue && dltdata.avalue && dltdata.cvalue)
+    	{
+    		/* ASCII */
+    		printf("Send injection message:\n");
+    		printf("AppId: %s\n",dltdata.avalue);
+    		printf("ConId: %s\n",dltdata.cvalue);
+    		printf("ServiceId: %d\n",dltdata.svalue);
+    		printf("Message: %s\n",dltdata.mvalue);
+    		/* send control message in ascii */
+    		dlt_client_send_inject_msg(&dltclient,dltdata.avalue,dltdata.cvalue,dltdata.svalue,(uint8_t*)dltdata.mvalue,strlen(dltdata.mvalue));
+    	}
+    	else if(dltdata.xvalue && dltdata.avalue && dltdata.cvalue)
+    	{
+    		/* Hex */
+    		uint8_t buffer[1024];
+    		int size = 1024;
+    		printf("Send injection message:\n");
+    		printf("AppId: %s\n",dltdata.avalue);
+    		printf("ConId: %s\n",dltdata.cvalue);
+    		printf("ServiceId: %d\n",dltdata.svalue);
+    		printf("Message: %s\n",dltdata.xvalue);
+    		hexAsciiToBinary(dltdata.xvalue,buffer,&size);
+    		printf("Size: %d\n",size);
+    		/* send control message in hex */
+    		dlt_client_send_inject_msg(&dltclient,dltdata.avalue,dltdata.cvalue,dltdata.svalue,buffer,size);
+    	}
+
+        /* Dlt Client Main Loop */
+        //dlt_client_main_loop(&dltclient, &dltdata, dltdata.vflag);
+
+    	/* Wait timeout */
+    	usleep(dltdata.tvalue*1000);
+
+        /* Dlt Client Cleanup */
+        dlt_client_cleanup(&dltclient,dltdata.vflag);
+    }
+
+    dlt_file_free(&(dltdata.file),dltdata.vflag);
+
+    dlt_filter_free(&(dltdata.filter),dltdata.vflag);
+
+    return 0;
+}
+
+int dlt_receive_message_callback(DltMessage *message, void *data)
+{
+	DltReceiveData *dltdata;
+
+    if ((message==0) || (data==0))
+	{
+        return -1;
+	}
+
+    dltdata = (DltReceiveData*)data;
+
+    return 0;
+}
diff --git a/src/lib/dlt_client.c b/src/lib/dlt_client.c
index 7f86b3d..76a4c71 100755
--- a/src/lib/dlt_client.c
+++ b/src/lib/dlt_client.c
@@ -315,16 +315,15 @@ int dlt_client_main_loop(DltClient *client, void *data, int verbose)
     return 0;
 }
 
-int dlt_client_send_inject_msg(DltClient *client, char *apid, char *ctid, uint32_t serviceID, uint8_t *buffer, uint32_t size)
+int dlt_client_send_ctrl_msg(DltClient *client, char *apid, char *ctid, uint8_t *payload, uint32_t size)
 {
 	DltMessage msg;
-        int ret;
-        int offset=0;
+    int ret;
+    int offset=0;
 
 	int32_t len;
 
-	if ((client==0) || (client->sock<0) || (apid==0) || (ctid==0) || (buffer==0) || (size==0) ||
-		(serviceID<DLT_SERVICE_ID_CALLSW_CINJECTION))
+	if ((client==0) || (client->sock<0) || (apid==0) || (ctid==0))
 	{
 		return -1;
 	}
@@ -336,7 +335,7 @@ int dlt_client_send_inject_msg(DltClient *client, char *apid, char *ctid, uint32
 	}
 
 	/* prepare payload of data */
-	msg.datasize = sizeof(uint32_t) + sizeof(uint32_t) + size;
+	msg.datasize = size;
 	if (msg.databuffer && (msg.databuffersize < msg.datasize))
 	{
 		free(msg.databuffer);
@@ -352,11 +351,8 @@ int dlt_client_send_inject_msg(DltClient *client, char *apid, char *ctid, uint32
 		return -1;
 	}
 
-	memcpy(msg.databuffer  , &serviceID,sizeof(serviceID));
-	offset+=sizeof(uint32_t);
-	memcpy(msg.databuffer+offset, &size, sizeof(size));
-	offset+=sizeof(uint32_t);
-	memcpy(msg.databuffer+offset, buffer, size);
+	/* copy data */
+	memcpy(msg.databuffer,payload,size);
 
 	/* prepare storage header */
     msg.storageheader = (DltStorageHeader*)msg.headerbuffer;
@@ -450,6 +446,37 @@ int dlt_client_send_inject_msg(DltClient *client, char *apid, char *ctid, uint32
 	return 0;
 }
 
+int dlt_client_send_inject_msg(DltClient *client, char *apid, char *ctid, uint32_t serviceID, uint8_t *buffer, uint32_t size)
+{
+	uint8_t *payload;
+	int offset;
+
+	payload = (uint8_t *) malloc(sizeof(uint32_t) + sizeof(uint32_t) + size);
+
+	if(payload==0)
+	{
+		return -1;
+	}
+
+	offset = 0;
+	memcpy(payload  , &serviceID,sizeof(serviceID));
+	offset+=sizeof(uint32_t);
+	memcpy(payload+offset, &size, sizeof(size));
+	offset+=sizeof(uint32_t);
+	memcpy(payload+offset, buffer, size);
+
+	/* free message */
+	if (dlt_client_send_ctrl_msg(client,apid,ctid,payload,sizeof(uint32_t) + sizeof(uint32_t) + size)==-1)
+	{
+		free(payload);
+		return -1;
+	}
+
+	free(payload);
+
+	return 0;
+}
+
 int dlt_client_setbaudrate(DltClient *client, int baudrate)
 {
 	if (client==0)