Added install target and files for filetransfer in the cmakelists . Fixed little bug in test filetransfer. Added filetransfer documentation and example program.

2 files changed, 177 insertions, 1 deletions

diff --git a/src/examples/CMakeLists.txt b/src/examples/CMakeLists.txt
index 6ea331d..6d903e0 100755
--- a/src/examples/CMakeLists.txt
+++ b/src/examples/CMakeLists.txt
@@ -51,7 +51,15 @@ ENDIF(GPROF_DLT_EXAMPLES)
 target_link_libraries(dlt-example-user-func dlt)
 set_target_properties(dlt-example-user-func PROPERTIES LINKER_LANGUAGE C)
 
-install(TARGETS dlt-example-user dlt-example-user-func
+set(dlt_example_filetransfer_SRCS dlt-example-filetransfer)
+add_executable(	dlt-example-filetransfer ${dlt_example_filetransfer_SRCS})
+IF(GPROF_DLT_EXAMPLES)
+	SET(CMAKE_C_FLAGS "-pg")
+ENDIF(GPROF_DLT_EXAMPLES)
+target_link_libraries(dlt-example-filetransfer dlt dlt-filetransfer )
+set_target_properties(dlt-example-filetransfer PROPERTIES LINKER_LANGUAGE C)
+
+install(TARGETS dlt-example-user dlt-example-user-func dlt-example-filetransfer
 	RUNTIME DESTINATION bin
 	COMPONENT base)
 
diff --git a/src/examples/dlt-example-filetransfer.c b/src/examples/dlt-example-filetransfer.c
new file mode 100644
index 0000000..4c6b12b
--- /dev/null
+++ b/src/examples/dlt-example-filetransfer.c
@@ -0,0 +1,168 @@
+#include "dlt/dlt_filetransfer.h" 	/*Needed for transferring files with the dlt protocol*/
+#include "dlt/dlt.h"			/*Needed for dlt logging*/
+
+
+#define MAXSTRLEN 1024
+
+#define FLTR_APP_DESC      "Filetransfer application"
+#define FLTR_CONTEXT_DESC  "Filetransfer context"
+
+#define FLTR_APP "FLTR"
+#define FLTR_CONTEXT "FLTR"
+
+#define TIMEOUT 1
+
+//!Declare some context for the file transfer. It's not a must have to do this, but later you can set a filter on this context in the dlt viewer.
+DLT_DECLARE_CONTEXT(fileContext);
+
+
+/**
+ * Print usage information of tool.
+ */
+void usage()
+{
+	char version[255];
+
+	dlt_get_version(version);
+
+    printf("Usage: dlt-example-filetransfer [options] <command>\n");
+    printf("Filetransfer example");
+    printf("%s \n", version);
+	printf("Command:\n");
+	printf("-f file      - File to transfer (absolute path)\n");
+    printf("Options:\n");
+    printf("-a apid      - Set application id to apid (default: FLTR)\n");
+    printf("-c ctid      - Set context id to ctid (default: FLTR)\n");
+    printf("-t ms        - Timeout between file packages in ms (minimum 1 ms)\n");
+    printf("-d           - Flag to delete the file after the transfer (default: false)\n"); 
+    printf("-i           - Flag to log file infos to DLT before transfer file (default: false)\n");  
+    printf("-h           - This help\n");
+
+}
+
+
+//!Main program dlt-test-filestransfer starts here
+int main(int argc, char* argv[])
+{	
+	char str[MAXSTRLEN];
+    int opt, timeout, dltResult;;
+
+    char apid[DLT_ID_SIZE];
+    char ctid[DLT_ID_SIZE];
+    
+    char version[255];
+
+	int dflag = 0;
+	int iflag = 0;
+	char *fvalue = 0;
+	char *tvalue = 0;
+
+    dlt_set_id(apid, FLTR_APP);
+    dlt_set_id(ctid, FLTR_CONTEXT);
+
+	while ((opt = getopt(argc, argv, "idf:t:a:c:h")) != -1)
+    {
+        switch (opt)
+        {
+		case 'd':
+        {
+            dflag = 1;
+            break;
+        }
+        case 'i':
+        {
+            iflag = 1;
+            break;
+        }
+        case 'f':
+        {
+            fvalue = optarg;
+            break;
+        }
+        case 't':
+        {
+            tvalue = optarg;
+            break;
+        }
+        case 'a':
+        {
+            dlt_set_id(apid,optarg);
+            break;
+        }
+        case 'c':
+        {
+            dlt_set_id(ctid,optarg);
+            break;
+        }
+        case 'h':
+        {
+            usage();
+            break;
+        }
+        case '?':
+        {
+            if (optopt == 'a' || optopt == 'c' || optopt == 'f' || optopt == 't')
+            {
+                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;
+        }
+        }
+    }
+	
+	if (tvalue)
+    {
+        timeout = atoi(tvalue);
+    }
+    else
+    {
+        timeout = TIMEOUT;
+    }
+
+	if (!fvalue)
+	{
+		usage();
+		return -1;
+	}
+
+	//Register the application at the dlt-daemon
+	dltResult = DLT_REGISTER_APP(apid,FLTR_APP_DESC);
+	
+	//Register the context of the main program at the dlt-daemon
+	dltResult = DLT_REGISTER_CONTEXT(fileContext,ctid,FLTR_CONTEXT_DESC);
+	
+	//More details in corresponding methods	
+	if( dltResult == 0 ){
+		if( iflag )
+		{
+			dlt_user_log_file_infoAbout(&fileContext,fvalue);
+		}
+		
+		if( dlt_user_log_file_complete(&fileContext,fvalue,dflag,timeout) < 0 )
+		{
+			printf("File couldn't be transferred. Please check the dlt log messages.\n");
+		}
+		
+	} 
+	else
+	{
+		printf("Filetransfer didn't start...error with dlt daemon. Please check the daemon.\n");
+	}
+	
+	//Unregister the context in which the file transfer happened from the dlt-daemon
+	DLT_UNREGISTER_CONTEXT(fileContext);
+	//Unregister the context of the main program from the dlt-daemon
+	DLT_UNREGISTER_APP();
+	
+	return 0;
+}