1 files changed, 32 insertions, 696 deletions

diff --git a/src/system/dlt-system.c b/src/system/dlt-system.c
index b04cdfb..6e1d22e 100755..100644
--- a/src/system/dlt-system.c
+++ b/src/system/dlt-system.c
@@ -13,7 +13,7 @@
  * this file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
  *
- * \author Alexander Wenzel <alexander.aw.wenzel@bmw.de> BMW 2011-2012
+ * \author Lassi Marttala <lassi.lm.marttala@partner.bmw.de> BMW 2012
  *
  * \file dlt-system.c
  * For further information see http://www.genivi.org/.
@@ -28,7 +28,8 @@
 **                                                                            **
 **  PROJECT   : DLT                                                           **
 **                                                                            **
-**  AUTHOR    : Alexander Wenzel Alexander.AW.Wenzel@bmw.de                   **
+**  AUTHOR    : Lassi Marttala <lassi.lm.marttala@partner.bmw.de>             **
+**              Alexander Wenzel Alexander.AW.Wenzel@bmw.de                   **
 **                                                                            **
 **  PURPOSE   :                                                               **
 **                                                                            **
@@ -40,722 +41,57 @@
 **                                                                            **
 *******************************************************************************/
 
-/*******************************************************************************
-**                      Author Identity                                       **
-********************************************************************************
-**                                                                            **
-** Initials     Name                       Company                            **
-** --------     -------------------------  ---------------------------------- **
-**  aw          Alexander Wenzel           BMW                                **
-*******************************************************************************/
-
-/*******************************************************************************
-**                      Revision Control History                              **
-*******************************************************************************/
+#include "dlt-system.h"
 
 #include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
-#include <signal.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
 #include <errno.h>
+#include <signal.h>
 
-#include <netdb.h>
-#include <ctype.h>
-#include <fcntl.h>
-#include <pthread.h>
-#include <unistd.h>
-
-#include <sys/timerfd.h>
-#include <sys/stat.h>
-#include <sys/time.h>
-#include <linux/stat.h>
-
-#include "dlt_common.h"
-#include "dlt_user.h"
-
-#include "dlt-system.h"
-#include "dlt-system_cfg.h"
-#include "dlt-system-log.h"
-
-/* Port number, to which the syslogd-ng sends its log messages */
-#define MAXSTRLEN             1024
-
-DLT_DECLARE_CONTEXT(syslogContext);
-DLT_DECLARE_CONTEXT(processesContext);
-DLT_DECLARE_CONTEXT(filetransferContext);
-DLT_DECLARE_CONTEXT(shellContext);
-DltContext logFileContext[DLT_SYSTEM_LOG_FILE_MAX];
-
-DltSystemOptions options;
-DltSystemRuntime runtime;
-
-void dlt_system_init_options(DltSystemOptions *options)
-{
-	int num;
-	
-	strncpy(options->ConfigurationFile,DEFAULT_CONFIGURATION_FILE,sizeof(options->ConfigurationFile));
-	strncpy(options->ApplicationId,DEFAULT_APPLICATION_ID,sizeof(options->ApplicationId));
-	options->daemonise = 0;
-
-	/* Syslog Adapter */
-	options->SyslogEnable = 0;
-	strncpy(options->SyslogContextId,DEFAULT_SYSLOG_CONTEXT_ID,sizeof(options->SyslogContextId));
-	options->SyslogPort = DEFAULT_SYSLOG_PORT;
-
-	/* Filetransfer */
-	options->FiletransferEnable = 0;
-	options->FiletransferCompression1 = 1;
-	options->FiletransferCompression2 = 0;
-	options->FiletransferCompressionLevel = 5;
-	strncpy(options->FiletransferContextId,DEFAULT_FILETRANSFER_CONTEXT_ID,sizeof(options->FiletransferContextId));
-	strncpy(options->FiletransferDirectory1,DEFAULT_FILETRANSFER_DIRECTORY,sizeof(options->FiletransferDirectory1));
-	options->FiletransferDirectory2[0]=0;
-	options->FiletransferTimeStartup = DEFAULT_FILETRANSFER_TIME_STARTUP;
-	options->FiletransferTimeDelay = DEFAULT_FILETRANSFER_TIME_DELAY;
-	options->FiletransferTimeoutBetweenLogs = DEFAULT_FILETRANSFER_TIMEOUT_BETWEEN_LOGS;
-
-	/* Log file */
-	options->LogFileEnable = 0;
-	options->LogFileNumber = 0;
-	for(num=0;num<DLT_SYSTEM_LOG_FILE_MAX;num++) {
-		options->LogFileFilename[num][0]=0;
-		options->LogFileMode[num]=0;
-		options->LogFileContextId[num][0]=0;
-		options->LogFileTimeDelay[num]=0;
-	}
-	
-	/* Log processes */
-	options->LogProcessesEnable = 0;
-	strncpy(options->LogProcessesContextId,DEFAULT_LOG_PROCESSES_CONTEXT_ID,sizeof(options->LogProcessesContextId));
-	options->LogProcessNumber = 0;
-	for(num=0;num<DLT_SYSTEM_LOG_PROCESSES_MAX;num++) {
-		options->LogProcessName[num][0]=0;
-		options->LogProcessFilename[num][0]=0;
-		options->LogProcessMode[num]=0;
-		options->LogProcessTimeDelay[num]=0;
-	}
-	
-}
-
-int dlt_system_parse_options(DltSystemOptions *options,int argc, char* argv[])
-{
-	int opt;
-    char version[255];
-	
-    while ((opt = getopt(argc, argv, "c:hd")) != -1)
-    {
-        switch (opt)
-        {
-			case 'd':
-			{
-				options->daemonise = 1;
-				break;
-			}
-			case 'c':
-			{
-				strncpy(options->ConfigurationFile,optarg,sizeof(options->ConfigurationFile));
-				break;
-			}
-			case 'h':
-			{
-				dlt_get_version(version);
-
-				printf("Usage: dlt-system [options]\n");
-				printf("System information manager and forwarder to DLT daemon.\n");
-				printf("%s \n", version);
-				printf("Options:\n");
-				printf("-d           - Daemonize\n");
-				printf("-c filename  - Set configuration file (default: /etc/dlt-system.conf)\n");
-				printf("-h           - This help\n");
-				return -1;
-				break;
-			}
-			default: /* '?' */
-			{
-				fprintf(stderr, "Unknown option '%c'\n", optopt);
-				return -1;
-			}
-        }
-    }	
-    
-    return 0;
-}
+DLT_DECLARE_CONTEXT(dltsystem)
 
-int dlt_system_parse_configuration(DltSystemOptions *options)
+int main(int argc, char* argv[])
 {
-	FILE * pFile;
-	char line[1024];
-	char token[1024];
-	char value[1024];
-    char *pch;
-
-	/* open configuration file */
-	pFile = fopen (options->ConfigurationFile,"r");
-
-	if (pFile!=NULL)
-	{
-		while(1)
-		{
-			/* fetch line from configuration file */
-			if ( fgets (line , 1024 , pFile) != NULL )
-			{
-				  //printf("Line: %s\n",line);
-				  pch = strtok (line," =\r\n");
-				  token[0]=0;
-				  value[0]=0;
-				  
-				  while (pch != NULL)
-				  {
-					if(strcmp(pch,"#")==0)
-						break;
-
-					if(token[0]==0)
-					{
-						strncpy(token,pch,sizeof(token));
-					}
-					else
-					{
-						strncpy(value,pch,sizeof(value));
-						break;
-					}
-
-					pch = strtok (NULL, " =\r\n");
-				  }
-				  
-				  if(token[0] && value[0])
-				  {
-						/* parse arguments here */
-						if(strcmp(token,"ApplicationId")==0)
-						{
-							strncpy(options->ApplicationId,value,sizeof(options->ApplicationId));
-							printf("Option: %s=%s\n",token,value);
-						}
-						/* Syslog Adapter */
-						else if(strcmp(token,"SyslogEnable")==0)
-						{
-							options->SyslogEnable = atoi(value);
-							printf("Option: %s=%s\n",token,value);
-						}
-						else if(strcmp(token,"SyslogContextId")==0)
-						{
-							strncpy(options->SyslogContextId,value,sizeof(options->SyslogContextId));
-							printf("Option: %s=%s\n",token,value);
-						}
-						else if(strcmp(token,"SyslogPort")==0)
-						{
-							options->SyslogPort = atoi(value);
-							printf("Option: %s=%s\n",token,value);
-						}
-						/* Filetransfer */
-						else if(strcmp(token,"FiletransferEnable")==0)
-						{
-							options->FiletransferEnable = atoi(value);
-							printf("Option: %s=%s\n",token,value);
-						}
-						else if(strcmp(token,"FiletransferCompression1")==0)
-						{
-							options->FiletransferCompression1 = atoi(value);
-							printf("Option: %s=%s\n",token,value);
-						}
-						else if(strcmp(token,"FiletransferCompression2")==0)
-						{
-							options->FiletransferCompression2 = atoi(value);
-							printf("Option: %s=%s\n",token,value);
-						}
-						else if(strcmp(token,"FiletransferCompressionLevel")==0)
-						{
-							options->FiletransferCompressionLevel = atoi(value);
-							printf("Option: %s=%s\n",token,value);
-						}
-						else if(strcmp(token,"FiletransferDirectory1")==0)
-						{
-							strncpy(options->FiletransferDirectory1,value,sizeof(options->FiletransferDirectory1));
-							printf("Option: %s=%s\n",token,value);
-						}
-						else if(strcmp(token,"FiletransferDirectory2")==0)
-						{
-							strncpy(options->FiletransferDirectory2,value,sizeof(options->FiletransferDirectory2));
-							printf("Option: %s=%s\n",token,value);
-						}
-						else if(strcmp(token,"FiletransferContextId")==0)
-						{
-							strncpy(options->FiletransferContextId,value,sizeof(options->FiletransferContextId));
-							printf("Option: %s=%s\n",token,value);
-						}
-						else if(strcmp(token,"FiletransferTimeStartup")==0)
-						{
-							options->FiletransferTimeStartup = atoi(value);
-							printf("Option: %s=%s\n",token,value);
-						}
-						else if(strcmp(token,"FiletransferTimeDelay")==0)
-						{
-							options->FiletransferTimeDelay = atoi(value);
-							printf("Option: %s=%s\n",token,value);
-						}
-						else if(strcmp(token,"FiletransferTimeoutBetweenLogs")==0)
-						{
-							options->FiletransferTimeoutBetweenLogs = atoi(value);
-							printf("Option: %s=%s\n",token,value);
-						}
-						/* Log File */
-						else if(strcmp(token,"LogFileEnable")==0)
-						{
-							options->LogFileEnable = atoi(value);
-							printf("Option: %s=%s\n",token,value);
-						}
-						else if(strcmp(token,"LogFileFilename")==0)
-						{
-							strncpy(options->LogFileFilename[options->LogFileNumber],value,sizeof(options->LogFileFilename[options->LogFileNumber]));
-							printf("Option: %s=%s\n",token,value);
-						}
-						else if(strcmp(token,"LogFileMode")==0)
-						{
-							options->LogFileMode[options->LogFileNumber] = atoi(value);
-							printf("Option: %s=%s\n",token,value);
-						}
-						else if(strcmp(token,"LogFileTimeDelay")==0)
-						{
-							options->LogFileTimeDelay[options->LogFileNumber] = atoi(value);
-							printf("Option: %s=%s\n",token,value);
-						}
-						else if(strcmp(token,"LogFileContextId")==0)
-						{
-							strncpy(options->LogFileContextId[options->LogFileNumber],value,sizeof(options->LogFileContextId[options->LogFileNumber]));
-							printf("Option: %s=%s\n",token,value);
-							if(options->LogFileNumber <  (DLT_SYSTEM_LOG_FILE_MAX-1) )
-								options->LogFileNumber++;
-						}
-						/* Log processes */
-						else if(strcmp(token,"LogProcessesEnable")==0)
-						{
-							options->LogProcessesEnable = atoi(value);
-							printf("Option: %s=%s\n",token,value);
-						}
-						else if(strcmp(token,"LogProcessesContextId")==0)
-						{
-							strncpy(options->LogProcessesContextId,value,sizeof(options->LogProcessesContextId));
-							printf("Option: %s=%s\n",token,value);
-						}
-						else if(strcmp(token,"LogProcessName")==0)
-						{
-							strncpy(options->LogProcessName[options->LogProcessNumber],value,sizeof(options->LogProcessName[options->LogProcessNumber]));
-							printf("Option: %s=%s\n",token,value);
-						}
-						else if(strcmp(token,"LogProcessFilename")==0)
-						{
-							strncpy(options->LogProcessFilename[options->LogProcessNumber],value,sizeof(options->LogProcessFilename[options->LogProcessNumber]));
-							printf("Option: %s=%s\n",token,value);
-						}
-						else if(strcmp(token,"LogProcessMode")==0)
-						{
-							options->LogProcessMode[options->LogProcessNumber] = atoi(value);
-							printf("Option: %s=%s\n",token,value);
-						}
-						else if(strcmp(token,"LogProcessTimeDelay")==0)
-						{
-							options->LogProcessTimeDelay[options->LogProcessNumber] = atoi(value);
-							printf("Option: %s=%s\n",token,value);
-							if(options->LogProcessNumber <  (DLT_SYSTEM_LOG_PROCESSES_MAX-1) )
-								options->LogProcessNumber++;
-						}
-						else
-						{
-							fprintf(stderr, "Unknown option: %s=%s\n",token,value);
-						}
-					}
+	DltSystemCliOptions options;
+	DltSystemConfiguration config;
 
-			}
-			else
-			{
-				break;
-			}
-		}
-		fclose (pFile);
-	}
-	else
+	if(read_command_line(&options, argc, argv) < 0)
 	{
-		fprintf(stderr, "Cannot open configuration file: %s\n",options->ConfigurationFile);
+		fprintf(stderr, "Failed to read command line!\n");
 		return -1;
-	}	
-
-	return 0;
-}
-
-void dlt_system_daemonize()
-{
-    int i,ret;
-    //int lfp,bytes_written;
-
-    /* Daemonize */
-    i=fork();
-    if (i<0)
-    {
-        exit(-1); /* fork error */
-    }
-
-    if (i>0)
-    {
-        exit(0); /* parent exits */
-    }
-    /* child (daemon) continues */
-
-    /* Process independency */
-
-     /* obtain a new process group */
-    if (setsid()==-1)
-    {
-        exit(-1); /* fork error */
-    }
-
-    /* Close descriptors */
-    for (i=getdtablesize();i>=0;--i)
-    {
-        close(i); /* close all descriptors */
-    }
-
-    /* Open standard descriptors stdin, stdout, stderr */
-    i=open("/dev/null",O_RDWR); /* open stdin */
-    ret=dup(i); /* stdout */
-    ret=dup(i); /* stderr */
-
-    /* Set umask */
-    //umask(DLT_DAEMON_UMASK);
-
-    /* Change to known directory */
-    //ret=chdir(DLT_USER_DIR);
-
-    /* Ensure single copy of daemon;
-       run only one instance at a time */
-#if 0
-    lfp=open(DLT_DAEMON_LOCK_FILE,O_RDWR|O_CREAT,DLT_DAEMON_LOCK_FILE_PERM);
-    if (lfp<0)
-    {
-    	dlt_log(LOG_CRIT, "can't open lock file, exiting DLT daemon\n");
-        exit(-1); /* can not open */
-    }
-    if (lockf(lfp,F_TLOCK,0)<0)
-    {
-    	dlt_log(LOG_CRIT, "can't lock lock file, exiting DLT daemon\n");
-        exit(-1); /* can not lock */
-    }
-    /* only first instance continues */
-
-    sprintf(str,"%d\n",getpid());
-    bytes_written=write(lfp,str,strlen(str)); /* record pid to lockfile */
-
-#endif
-    /* Catch signals */
-    signal(SIGCHLD,SIG_IGN); /* ignore child */
-    signal(SIGTSTP,SIG_IGN); /* ignore tty signals */
-    signal(SIGTTOU,SIG_IGN);
-    signal(SIGTTIN,SIG_IGN);
-
-} /* dlt_system_daemonize() */
-
-void dlt_system_cleanup()
-{
-	int num;
-	
-	if(options.SyslogEnable)
-		DLT_UNREGISTER_CONTEXT(syslogContext);	
-
-	if(options.FiletransferEnable)
-		DLT_UNREGISTER_CONTEXT(filetransferContext);
-
-	if(options.LogFileEnable) {
-		for(num=0;num<options.LogFileNumber;num++) {
-			if(options.LogFileFilename[num][0]!=0)
-				DLT_UNREGISTER_CONTEXT(logFileContext[num]);
-		}
-	}
-	
-	if(options.LogProcessesEnable)
-		DLT_UNREGISTER_CONTEXT(processesContext);
-
-	DLT_UNREGISTER_CONTEXT(shellContext);	
-		
-    DLT_UNREGISTER_APP();
-}
-
-void dlt_system_signal_handler(int sig)
-{
-    switch (sig)
-    {
-    case SIGHUP:
-    case SIGTERM:
-    case SIGINT:
-    case SIGQUIT:
-    {
-		dlt_system_cleanup();
-
-		printf("dlt-system stopped!\n");
-
-		/* Terminate program */
-        exit(0);
-        break;
-    }
-    default:
-    {
-	/* This case should never occur */
-	break;
-    }
-    } /* switch */
-} /* dlt_system_signal_handler() */
-
-int dlt_user_injection_callback(uint32_t service_id, void *data, uint32_t length)
-{
-    char text[1024];
-    int syserr = 0;
-
-	strncpy(text,data,length);
-
-	switch(service_id)
-	{
-		case 0x1001:
-			/* Execute shell command */
-			DLT_LOG(shellContext, DLT_LOG_INFO, DLT_STRING("Execute command:"), DLT_STRING(text));
-			printf("Execute command: %s\n",text);
-			if((syserr = system(text)) != 0)
-			{
-				printf("Abnormal exit status from %s: %d\n",text,syserr);
-			}
-			break;
-		default:
-			DLT_LOG(shellContext, DLT_LOG_WARN, DLT_STRING("Unknown command received! Service ID:"), DLT_UINT32(service_id),DLT_STRING("Command:"),DLT_STRING(text));
-			printf("Unknown command received! Service ID: %u Command: %s\n",service_id,text);
-			break;
-	}
-
-    printf("Injection %d, Length=%d \n",service_id,length);
-    if (length>0)
-    {
-    }
-
-    return 0;
-}
-
-int main(int argc, char* argv[])
-{
-    int sock = -1;
-    int bytes_read;
-    socklen_t addr_len;
-    char recv_data[MAXSTRLEN];
-    struct sockaddr_in client_addr, server_addr;
-    fd_set master_rfds;
-    fd_set read_rfds;
-    int fdmax;
-    struct timeval tv;
-    int retval;
-    uint32_t lasttime;
-    int firsttime = 1;
-    int num;
-
-	/* init options */
-	dlt_system_init_options(&options);
-
-	/* parse command line options */
-	if(dlt_system_parse_options(&options,argc,argv)) {
-        return -1;
 	}
 
-	if(options.daemonise)
+	if(read_configuration_file(&config, options.ConfigurationFileName) < 0)
 	{
-		dlt_system_daemonize();
-	}
-
-	/* set signal handler */
-    signal(SIGTERM, dlt_system_signal_handler); /* software termination signal from kill */
-    signal(SIGHUP,  dlt_system_signal_handler); /* hangup signal */
-    signal(SIGQUIT, dlt_system_signal_handler);
-    signal(SIGINT,  dlt_system_signal_handler);
-
-	/* parse configuration file */
-	if(dlt_system_parse_configuration(&options)) {
-        return -1;
-	}	
-	
-	/* register application and contexts */
-    DLT_REGISTER_APP(options.ApplicationId,"DLT System Manager");
-	if(options.SyslogEnable)
-		DLT_REGISTER_CONTEXT(syslogContext,options.SyslogContextId,"SYSLOG Adapter");
-	if(options.FiletransferEnable)
-		DLT_REGISTER_CONTEXT(filetransferContext,options.FiletransferContextId,"Filetransfer");
-	if(options.LogFileEnable) {
-		for(num=0;num<options.LogFileNumber;num++) {
-			if(options.LogFileFilename[num][0]!=0)
-				DLT_REGISTER_CONTEXT(logFileContext[num],options.LogFileContextId[num],options.LogFileFilename[num]);
-			runtime.timeLogFileDelay[num]=0;
-		}
-	}
-	if(options.LogProcessesEnable) {
-		DLT_REGISTER_CONTEXT(processesContext,options.LogProcessesContextId,"Log Processes");	
-		for(num=0;num<options.LogProcessNumber;num++) {
-			runtime.timeLogProcessDelay[num]=0;
-		}
-	}
-	DLT_REGISTER_CONTEXT(shellContext,"CMD","Execute Shell commands");	
-    DLT_REGISTER_INJECTION_CALLBACK(shellContext, 0x1001, dlt_user_injection_callback);
-
-	/* create systemd socket */
-	if(options.SyslogEnable) {
-		if ((sock = socket(AF_INET, SOCK_DGRAM, 0)) == -1)
-		{
-			perror("Socket");
-			exit(1);
-		}
-		server_addr.sin_family = AF_INET;
-		server_addr.sin_port = htons(options.SyslogPort);
-		server_addr.sin_addr.s_addr = INADDR_ANY;
-		bzero(&(server_addr.sin_zero), 8);
-		if (bind(sock, (struct sockaddr *)&server_addr,
-				 sizeof(struct sockaddr)) == -1)
-		{
-			perror("Bind");
-			return -1;
-		}
-		addr_len = sizeof(struct sockaddr);
-	}
-
-   /* Watch sockets to see when it has input. */
-	FD_ZERO(&read_rfds);
-	FD_ZERO(&master_rfds);
-	fdmax = 0;
-	if(options.SyslogEnable) {
-		FD_SET(sock, &master_rfds);
-		if(sock>fdmax)
-			fdmax=sock;
+		fprintf(stderr, "Failed to read configuration file!\n");
+		return -1;
 	}
+	DLT_REGISTER_APP(config.ApplicationId, "DLT System Manager");
+	DLT_REGISTER_CONTEXT(dltsystem,"MGR", "Context of main dlt system manager");
+	sleep(1);
+	DLT_LOG(dltsystem, DLT_LOG_DEBUG, DLT_STRING("Configuration loaded."));
 
-	/* init timers */
-	lasttime = dlt_uptime();
-	runtime.timeStartup = 0;
-	runtime.timeFiletransferDelay = 0;
-
-	/* initialise filetransfer manager */
-	if(options.FiletransferEnable)
+	if(options.Daemonize > 0)
 	{
-		if(dlt_system_filetransfer_init(&options,&runtime) < 0)
+		if(daemonize() < 0)
 		{
-			fprintf(stderr, "Error initializing filetransfer:\n%s\n", strerror(errno));
+			DLT_LOG(dltsystem, DLT_LOG_FATAL, DLT_STRING("Daemonization failed!"));
 			return -1;
 		}
+		DLT_LOG(dltsystem, DLT_LOG_DEBUG, DLT_STRING("dlt-system daemonized."));
 	}
 
+	DLT_LOG(dltsystem, DLT_LOG_DEBUG, DLT_STRING("Setting signal handlers for abnormal exit"));
+	signal(SIGTERM, dlt_system_signal_handler);
+	signal(SIGHUP,  dlt_system_signal_handler);
+	signal(SIGQUIT, dlt_system_signal_handler);
+	signal(SIGINT,  dlt_system_signal_handler);
 
-    while (1)
-    {
-	    /* Wait up to one second. */
-		tv.tv_sec = 0;
-		if(runtime.filetransferRunning)
-			tv.tv_usec = 20000;
-		else
-			tv.tv_usec = (dlt_uptime()-lasttime+10000)*100;
-
-		/* wait data to be received, or wait min time */
-		read_rfds = master_rfds;
-		retval = select(fdmax+1, &read_rfds, NULL, NULL, &tv);
+	DLT_LOG(dltsystem, DLT_LOG_DEBUG, DLT_STRING("Launching threads."));
 
-		if (retval == -1)
-			perror("select()");
-		else if (retval)
-			;//printf("Data is available now.\n");
-		else
-			;//printf("No data within one seconds.\n");
-
-		/* call filtransfer even in shorter time schedule */
-		if(options.FiletransferEnable && runtime.filetransferRunning)
-			dlt_system_filetransfer_run(&options,&runtime,&filetransferContext);
-
-		if((dlt_uptime()-lasttime) >= 10000)
-		{
-			/* one second elapsed */
-			lasttime = dlt_uptime();
-			runtime.timeStartup++;
-			
-			/* filetransfer manager */
-			if(options.FiletransferEnable) {
-				if(runtime.timeStartup > options.FiletransferTimeStartup) {
-					if(runtime.timeFiletransferDelay>0) {
-						runtime.timeFiletransferDelay--;
-					}
-					else {
-						dlt_system_filetransfer_run(&options,&runtime,&filetransferContext);
-					}
-				}
-			}
-			
-			/* log files */
-			if(options.LogFileEnable) {
-				for(num=0;num<options.LogFileNumber;num++) {
-					if(((options.LogFileMode[num] == DLT_SYSTEM_MODE_STARTUP) && firsttime) ||
-					   (options.LogFileMode[num] == DLT_SYSTEM_MODE_REGULAR) ) {
-							if(runtime.timeLogFileDelay[num]<=0) {
-								dlt_system_log_file(&options,&logFileContext[num],num);
-								runtime.timeLogFileDelay[num]=options.LogFileTimeDelay[num]-1;
-							}
-							else {
-								runtime.timeLogFileDelay[num]--;
-							}
-					}
-				}
-			}
-			
-			/* log processes information */
-			if(options.LogProcessesEnable) {
-				for(num=0;num<options.LogProcessNumber;num++) {
-					if(((options.LogProcessMode[num] == DLT_SYSTEM_MODE_STARTUP) && firsttime) ||
-					   (options.LogProcessMode[num] == DLT_SYSTEM_MODE_REGULAR) ) {
-							if(runtime.timeLogProcessDelay[num]<=0) {
-								dlt_system_log_process(&options,&processesContext,num);
-								runtime.timeLogProcessDelay[num]=options.LogProcessTimeDelay[num]-1;
-							}
-							else {
-								runtime.timeLogProcessDelay[num]--;
-							}
-					}
-				}
-			}
-			
-			firsttime = 0;
-		}
-
-		/* check syslog adapter socket */
-		if(options.SyslogEnable)
-		{
-			if( FD_ISSET(sock, &read_rfds) )
-			{
-				bytes_read = 0;
-
-				bytes_read = recvfrom(sock, recv_data, MAXSTRLEN, 0,
-									  (struct sockaddr *)&client_addr, &addr_len);
-									  
-				if (bytes_read == -1)
-				{
-					if (errno == EINTR)
-					{
-						continue;
-					}
-					else
-					{
-						exit(1);
-					}
-				}
-
-				recv_data[bytes_read] = '\0';
-
-				if (bytes_read != 0)
-				{
-					DLT_LOG(syslogContext, DLT_LOG_INFO, DLT_STRING(recv_data));
-				}
-			}
-		}
-    }
+	start_threads(&config);
+	join_threads();
+	return 0;
+}
 
-	dlt_system_cleanup();
 
-    return 0;
-}