Centralised send function to client. Introduced connection state to dlt daemon.

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

9 files changed, 2041 insertions, 1980 deletions

diff --git a/src/daemon/CMakeLists.txt b/src/daemon/CMakeLists.txt
index 84f0550..2153fd1 100755
--- a/src/daemon/CMakeLists.txt
+++ b/src/daemon/CMakeLists.txt
@@ -19,7 +19,7 @@ if(WITH_SYSTEMD_WATCHDOG OR WITH_SYSTEMD)
     message( STATUS "Added ${systemd_SRCS} to dlt-daemon")
 endif(WITH_SYSTEMD_WATCHDOG OR WITH_SYSTEMD)
 
-set(dlt_daemon_SRCS dlt-daemon.c dlt_daemon_common.c ${CMAKE_SOURCE_DIR}/src/shared/dlt_user_shared.c ${CMAKE_SOURCE_DIR}/src/shared/dlt_common.c ${CMAKE_SOURCE_DIR}/src/shared/dlt_shm.c ${CMAKE_SOURCE_DIR}/src/shared/dlt_offline_trace.c)
+set(dlt_daemon_SRCS dlt-daemon.c dlt_daemon_common.c dlt_daemon_socket.c dlt_daemon_serial.c ${CMAKE_SOURCE_DIR}/src/shared/dlt_user_shared.c ${CMAKE_SOURCE_DIR}/src/shared/dlt_common.c ${CMAKE_SOURCE_DIR}/src/shared/dlt_shm.c ${CMAKE_SOURCE_DIR}/src/shared/dlt_offline_trace.c)
 add_executable(dlt-daemon ${dlt_daemon_SRCS} ${systemd_SRCS})
 target_link_libraries(dlt-daemon rt ${CMAKE_THREAD_LIBS_INIT})
 
diff --git a/src/daemon/dlt-daemon.c b/src/daemon/dlt-daemon.c
index 78d232f..8fc71e6 100644
--- a/src/daemon/dlt-daemon.c
+++ b/src/daemon/dlt-daemon.c
@@ -85,6 +85,10 @@
 #include "dlt_types.h"
 #include "dlt-daemon.h"
 #include "dlt-daemon_cfg.h"
+#include "dlt_daemon_common_cfg.h"
+
+#include "dlt_daemon_socket.h"
+#include "dlt_daemon_serial.h"
 
 #if defined(DLT_SYSTEMD_WATCHDOG_ENABLE) || defined(DLT_SYSTEMD_ENABLE)
 #include "sd-daemon.h"
@@ -482,6 +486,11 @@ int main(int argc, char* argv[])
         create_timer_fd(&daemon_local, 60, 60, &daemon_local.timer_ecuversion, "ECU version");
     }
 
+    if(daemon_local.flags.yvalue[0])
+    		dlt_daemon_change_state(&daemon,DLT_DAEMON_STATE_SEND_DIRECT);
+    else
+		dlt_daemon_change_state(&daemon,DLT_DAEMON_STATE_BUFFER);
+
     while (1)
     {
 
@@ -1196,7 +1205,7 @@ int dlt_daemon_process_client_connect(DltDaemon *daemon, DltDaemonLocal *daemon_
     }
 
     // send connection info about connected
-    dlt_daemon_control_message_connection_info(in_sock,daemon,DLT_CONNECTION_STATUS_CONNECTED,"",verbose);
+    dlt_daemon_control_message_connection_info(in_sock,daemon,daemon_local,DLT_CONNECTION_STATUS_CONNECTED,"",verbose);
 
     // send ecu version string
     if(daemon_local->flags.sendECUSoftwareVersion > 0)
@@ -1206,6 +1215,8 @@ int dlt_daemon_process_client_connect(DltDaemon *daemon, DltDaemonLocal *daemon_
 
     if (daemon_local->client_connections==1)
     {
+    	dlt_daemon_change_state(daemon,DLT_DAEMON_STATE_SEND_BUFFER);
+
         if (daemon_local->flags.vflag)
         {
             dlt_log(LOG_INFO, "Send ring-buffer to client\n");
@@ -1217,7 +1228,7 @@ int dlt_daemon_process_client_connect(DltDaemon *daemon, DltDaemonLocal *daemon_
         }
 		
 		/* send new log state to all applications */
-		daemon->state = 1;		
+		daemon->connectionState = 1;
 		dlt_daemon_user_send_all_log_state(daemon,verbose);
     }
 
@@ -1249,7 +1260,7 @@ int dlt_daemon_process_client_messages(DltDaemon *daemon, DltDaemonLocal *daemon
         /* Check for control message */
         if ( 0 < daemon_local->receiverSock.fd && DLT_MSG_IS_CONTROL_REQUEST(&(daemon_local->msg)) )
         {
-            dlt_daemon_control_process_control(daemon_local->receiverSock.fd, daemon, &(daemon_local->msg), daemon_local->flags.vflag);
+            dlt_daemon_control_process_control(daemon_local->receiverSock.fd, daemon,daemon_local, &(daemon_local->msg), daemon_local->flags.vflag);
         }
 
         bytes_to_be_removed = daemon_local->msg.headersize+daemon_local->msg.datasize-sizeof(DltStorageHeader);
@@ -1304,7 +1315,7 @@ int dlt_daemon_process_client_messages_serial(DltDaemon *daemon, DltDaemonLocal
         /* Check for control message */
         if (DLT_MSG_IS_CONTROL_REQUEST(&(daemon_local->msg)))
         {
-            if (dlt_daemon_control_process_control(daemon_local->receiverSerial.fd, daemon, &(daemon_local->msg), daemon_local->flags.vflag)==-1)
+            if (dlt_daemon_control_process_control(daemon_local->receiverSerial.fd, daemon,daemon_local, &(daemon_local->msg), daemon_local->flags.vflag)==-1)
             {
 				dlt_log(LOG_ERR,"Can't process control messages\n");
 				return -1;
@@ -1507,8 +1518,7 @@ int dlt_daemon_process_user_messages(DltDaemon *daemon, DltDaemonLocal *daemon_l
 
 int dlt_daemon_process_user_message_overflow(DltDaemon *daemon, DltDaemonLocal *daemon_local, int verbose)
 {
-    int j, sent;
-    DltUserControlMsgBufferOverflow *userpayload;
+     DltUserControlMsgBufferOverflow *userpayload;
 
     PRINT_FUNCTION_VERBOSE(verbose);
 
@@ -1531,38 +1541,16 @@ int dlt_daemon_process_user_message_overflow(DltDaemon *daemon, DltDaemonLocal *
     daemon->message_buffer_overflow = DLT_MESSAGE_BUFFER_OVERFLOW;
 
     /* look if TCP connection to client is available */
-    sent = 0;
+	dlt_daemon_control_message_buffer_overflow(DLT_DAEMON_SEND_TO_ALL, daemon,daemon_local, userpayload->overflow_counter,userpayload->apid,verbose);
 
-    for (j = 0; j <= daemon_local->fdmax; j++)
-    {
-        /* send to everyone! */
-        if (FD_ISSET(j, &(daemon_local->master)))
-        {
-            /* except the listener and ourselves */
-            if ((j != daemon_local->fp) && (j != daemon_local->sock)
-#ifdef DLT_SYSTEMD_WATCHDOG_ENABLE
-                        && (j!=daemon_local->timer_wd)
-#endif
-			&& (j!=daemon_local->timer_timingpacket) && (j!=daemon_local->timer_ecuversion))
-            {
-                dlt_daemon_control_message_buffer_overflow(j, daemon, userpayload->overflow_counter,userpayload->apid,verbose);
-                sent=1;
-                /* Reset overflow state */
-                daemon->message_buffer_overflow = DLT_MESSAGE_BUFFER_NO_OVERFLOW;
-            } /* if */
-        } /* if */
-    } /* for */
+	/* Reset overflow state */
+	daemon->message_buffer_overflow = DLT_MESSAGE_BUFFER_NO_OVERFLOW;
 
-    /* message was not sent, so store it in ringbuffer */
-    if (sent==0)
-    {
-        if(dlt_daemon_control_message_buffer_overflow(DLT_DAEMON_STORE_TO_BUFFER, daemon, userpayload->overflow_counter,
-        		                                      userpayload->apid,verbose))
-        {
+	if(0)
+	{
         	/* there was an error when storing message */
         	/* add the counter of lost messages to the daemon counter */
         	daemon->overflow_counter+=userpayload->overflow_counter;
-        }
     }
 
     /* keep not read data in buffer */
@@ -1577,8 +1565,6 @@ int dlt_daemon_process_user_message_overflow(DltDaemon *daemon, DltDaemonLocal *
 
 int dlt_daemon_send_message_overflow(DltDaemon *daemon, DltDaemonLocal *daemon_local, int verbose)
 {
-    int j, sent;
-
     PRINT_FUNCTION_VERBOSE(verbose);
 
     if ((daemon==0)  || (daemon_local==0))
@@ -1590,31 +1576,13 @@ int dlt_daemon_send_message_overflow(DltDaemon *daemon, DltDaemonLocal *daemon_l
     /* Store in daemon, that a message buffer overflow has occured */
     daemon->message_buffer_overflow = DLT_MESSAGE_BUFFER_OVERFLOW;
 
-    /* look if TCP connection to client is available */
-    sent = 0;
+	dlt_daemon_control_message_buffer_overflow(DLT_DAEMON_SEND_TO_ALL, daemon,daemon_local,daemon->overflow_counter,"", verbose);
 
-    for (j = 0; j <= daemon_local->fdmax; j++)
-    {
-        /* send to everyone! */
-        if (FD_ISSET(j, &(daemon_local->master)))
-        {
-            /* except the listener and ourselves */
-            if ((j != daemon_local->fp) && (j != daemon_local->sock)
-#ifdef DLT_SYSTEMD_WATCHDOG_ENABLE
-                        && (j!=daemon_local->timer_wd)
-#endif
-			&& (j!=daemon_local->timer_timingpacket) && (j!=daemon_local->timer_ecuversion))
-            {
-                dlt_daemon_control_message_buffer_overflow(j, daemon,daemon->overflow_counter,"", verbose);
-                sent=1;
-                /* Reset overflow state */
-                daemon->message_buffer_overflow = DLT_MESSAGE_BUFFER_NO_OVERFLOW;
-            } /* if */
-        } /* if */
-    } /* for */
+	/* Reset overflow state */
+	daemon->message_buffer_overflow = DLT_MESSAGE_BUFFER_NO_OVERFLOW;
 
     /* message was not sent, so report to caller that sending failed */
-    if (sent==0)
+    if (0)
     {
         return -1;
     }
@@ -1686,8 +1654,6 @@ int dlt_daemon_process_user_message_register_context(DltDaemon *daemon, DltDaemo
 	DltServiceGetLogInfoRequest *req;
 
 	DltMessage msg;
-	int j;
-	int sent;
 
     PRINT_FUNCTION_VERBOSE(verbose);
 
@@ -1812,32 +1778,7 @@ int dlt_daemon_process_user_message_register_context(DltDaemon *daemon, DltDaemo
         dlt_set_id(req->ctid, usercontext->ctid);
         dlt_set_id(req->com,"remo");
 
-        sent=0;
-
-        /* Send response to get log info request to DLT clients */
-        for (j = 0; j <= daemon_local->fdmax; j++)
-        {
-            /* send to everyone! */
-            if (FD_ISSET(j, &(daemon_local->master)))
-            {
-                /* except the listener and ourselves */
-                if ((j != daemon_local->fp) && (j != daemon_local->sock)
-    #ifdef DLT_SYSTEMD_WATCHDOG_ENABLE
-                            && (j!=daemon_local->timer_wd)
-    #endif
-    			&& (j!=daemon_local->timer_timingpacket) && (j!=daemon_local->timer_ecuversion))
-                {
-                    dlt_daemon_control_get_log_info(j , daemon, &msg, verbose);
-                    sent=1;
-                }
-            }
-        }
-
-        if (sent==0)
-        {
-            /* Store to buffer */
-            dlt_daemon_control_get_log_info(DLT_DAEMON_STORE_TO_BUFFER , daemon, &msg, verbose);
-        }
+        dlt_daemon_control_get_log_info(DLT_DAEMON_SEND_TO_ALL , daemon,daemon_local, &msg, verbose);
 
         dlt_message_free(&msg, verbose);
     }
@@ -1967,33 +1908,7 @@ int dlt_daemon_process_user_message_unregister_context(DltDaemon *daemon, DltDae
     /* Create automatic unregister context response for unregistered context */
     if (daemon_local->flags.rflag)
     {
-        int sent=0;
-        int j;
-
-        /* Send response to get log info request to DLT clients */
-        for (j = 0; j <= daemon_local->fdmax; j++)
-        {
-            /* send to everyone! */
-            if (FD_ISSET(j, &(daemon_local->master)))
-            {
-                /* except the listener and ourselves */
-                if ((j != daemon_local->fp) && (j != daemon_local->sock)
-    #ifdef DLT_SYSTEMD_WATCHDOG_ENABLE
-                            && (j!=daemon_local->timer_wd)
-    #endif
-    			&& (j!=daemon_local->timer_timingpacket) && (j!=daemon_local->timer_ecuversion))
-                {
-                	dlt_daemon_control_message_unregister_context(j,daemon,usercontext->apid, usercontext->ctid, "remo",verbose);
-                    sent=1;
-                }
-            }
-        }
-
-        if (sent==0)
-        {
-            /* Store to buffer */
-        	dlt_daemon_control_message_unregister_context(DLT_DAEMON_STORE_TO_BUFFER,daemon,usercontext->apid, usercontext->ctid, "remo",verbose);
-        }
+		dlt_daemon_control_message_unregister_context(DLT_DAEMON_SEND_TO_ALL,daemon,daemon_local,usercontext->apid, usercontext->ctid, "remo",verbose);
     }
 
     /* keep not read data in buffer */
@@ -2009,8 +1924,6 @@ int dlt_daemon_process_user_message_unregister_context(DltDaemon *daemon, DltDae
 int dlt_daemon_process_user_message_log(DltDaemon *daemon, DltDaemonLocal *daemon_local, int verbose)
 {
     int bytes_to_be_removed;
-    int j,sent,third_value;
-    ssize_t ret;
 
     static char text[DLT_DAEMON_TEXTSIZE];
 
@@ -2083,15 +1996,6 @@ int dlt_daemon_process_user_message_log(DltDaemon *daemon, DltDaemonLocal *daemo
                 /* print message header only */
             } /* if */
 
-            sent=0;
-
-			/* write message to offline trace */
-			if(((daemon->mode == DLT_USER_MODE_INTERNAL) || (daemon->mode == DLT_USER_MODE_BOTH)) && daemon_local->flags.offlineTraceDirectory[0])
-			{
-				dlt_offline_trace_write(&(daemon_local->offlineTrace),daemon_local->msg.headerbuffer,daemon_local->msg.headersize,
-										daemon_local->msg.databuffer,daemon_local->msg.datasize,0,0);
-				sent = 1;
-			}
 
 			/* check if overflow occurred */
 			if(daemon->overflow_counter)
@@ -2105,105 +2009,12 @@ int dlt_daemon_process_user_message_log(DltDaemon *daemon, DltDaemonLocal *daemo
 			}
 
             /* look if TCP connection to client is available */
-            for (j = 0;((daemon->mode == DLT_USER_MODE_EXTERNAL) || (daemon->mode == DLT_USER_MODE_BOTH)) &&  (j <= daemon_local->fdmax); j++)
+            if((daemon->mode == DLT_USER_MODE_EXTERNAL) || (daemon->mode == DLT_USER_MODE_BOTH))
             {
-                /* send to everyone! */
-                if (FD_ISSET(j, &(daemon_local->master)))
-                {
-                    /* except the listener and ourselves */
-                    if (daemon_local->flags.yvalue[0])
-                    {
-                        third_value = daemon_local->fdserial;
-                    }
-                    else
-                    {
-                        third_value = daemon_local->sock;
-                    }
-
-					if ((j != daemon_local->fp) && (j != daemon_local->sock) && (j != third_value)
-		#ifdef DLT_SYSTEMD_WATCHDOG_ENABLE
-								&& (j!=daemon_local->timer_wd)
-		#endif
-					&& (j!=daemon_local->timer_timingpacket) && (j!=daemon_local->timer_ecuversion))
-                    {
-						int failed = 0;
-
-                        DLT_DAEMON_SEM_LOCK();
 
-                        if (daemon_local->flags.lflag)
-                        {
-                            if(0 > send(j,dltSerialHeader,sizeof(dltSerialHeader),0))
-                            {
-                            	dlt_daemon_close_socket(j, daemon, daemon_local, verbose);
-                            	failed = 1;
-                            }
-                        }
-
-                        if(!failed && 0 > send(j,daemon_local->msg.headerbuffer+sizeof(DltStorageHeader),daemon_local->msg.headersize-sizeof(DltStorageHeader),0))
-                        {
-                        	dlt_daemon_close_socket(j, daemon, daemon_local, verbose);
-                        	failed = 1;
-                        }
-
-                        if(!failed && 0 > send(j,daemon_local->msg.databuffer,daemon_local->msg.datasize,0))
-                        {
-                        	dlt_daemon_close_socket(j, daemon, daemon_local, verbose);
-                        	failed = 1;
-                        }
-
-                        DLT_DAEMON_SEM_FREE();
-
-                        sent=1;
-                    } /* if */
-                    else if ((j == daemon_local->fdserial) && (daemon_local->flags.yvalue!=0))
-                    {
-                        DLT_DAEMON_SEM_LOCK();
-
-                        if (daemon_local->flags.lflag)
-                        {
-                            ret=write(j,dltSerialHeader,sizeof(dltSerialHeader));
-					        if (0 > ret)
-                            {
-                    	          dlt_log(LOG_ERR,"write(j,dltSerialHeader failed\n");
-                            }
-                        }
-                        int32_t diff = daemon_local->msg.headersize-sizeof(DltStorageHeader);
-                        //extra calculation for coverity
-                        if ( 0 <= diff ){
-                                ret=write(j,daemon_local->msg.headerbuffer+sizeof(DltStorageHeader),diff);
-								if (0 > ret)
-		                        {
-        		                	dlt_log(LOG_ERR,"write(j,daemon_local->msg.headerbuffer failed\n");
-        		                }
-                                ret=write(j,daemon_local->msg.databuffer,daemon_local->msg.datasize);
-								if (0 > ret)
-		                        {
-									dlt_log(LOG_ERR,"write(j,daemon_local->msg.databuffer failed\n");
-        		                }
-                        }
-
-                        DLT_DAEMON_SEM_FREE();
-
-                        sent=1;
-                    }
-                } /* if */
-            } /* for */
-
-            /* Message was not sent to client, so store it in client ringbuffer */
-            if (sent==0)
-            {
-            	DLT_DAEMON_SEM_LOCK();
-                if (dlt_buffer_push3(&(daemon->client_ringbuffer),
-                                    daemon_local->msg.headerbuffer+sizeof(DltStorageHeader),daemon_local->msg.headersize-sizeof(DltStorageHeader),
-                                    daemon_local->msg.databuffer,daemon_local->msg.datasize,
-                                    0, 0
-                                   )<0)
-				{
-                	if(daemon->overflow_counter==0)
-    					dlt_log(LOG_ERR,"Buffer full! Messages will be discarded.\n");
-                	daemon->overflow_counter+=1;
-				}
-                DLT_DAEMON_SEM_FREE();
+            	dlt_daemon_client_send(DLT_DAEMON_SEND_TO_ALL,daemon,daemon_local,daemon_local->msg.headerbuffer+sizeof(DltStorageHeader),daemon_local->msg.headersize-sizeof(DltStorageHeader),
+            		                daemon_local->msg.databuffer,daemon_local->msg.datasize,
+            		                0/* no ringbuffer operation */,verbose);
             }
 
         }
@@ -2526,8 +2337,6 @@ int dlt_daemon_send_ringbuffer_to_client(DltDaemon *daemon, DltDaemonLocal *daem
 {
     static uint8_t data[DLT_DAEMON_RCVBUFSIZE];
     int length;
-    int j, third_value;
-    ssize_t ret;
 
     PRINT_FUNCTION_VERBOSE(verbose);
 
@@ -2537,78 +2346,22 @@ int dlt_daemon_send_ringbuffer_to_client(DltDaemon *daemon, DltDaemonLocal *daem
         return -1;
     }
 
-	/* Attention: If the message can't be send at this time, it will be silently discarded. */
-    while ((length = dlt_buffer_pull(&(daemon->client_ringbuffer), data, sizeof(data) )) > 0)
+    if(dlt_buffer_get_message_count(&(daemon->client_ringbuffer)) <= 0)
     {
-        /* look if TCP connection to client is available */
-        for (j = 0; j <= daemon_local->fdmax; j++)
-        {
-            /* send to everyone! */
-            if (FD_ISSET(j, &(daemon_local->master)))
-            {
-                /* except the listener and ourselves */
-                if (daemon_local->flags.yvalue[0])
-                {
-                    third_value = daemon_local->fdserial;
-                }
-                else
-                {
-                    third_value = daemon_local->sock;
-                }
-
-				if ((j != daemon_local->fp) && (j != daemon_local->sock) && (j != third_value)
-	#ifdef DLT_SYSTEMD_WATCHDOG_ENABLE
-							&& (j!=daemon_local->timer_wd)
-	#endif
-				&& (j!=daemon_local->timer_timingpacket) && (j!=daemon_local->timer_ecuversion))
-                {
-					int failed = 0;
-                    DLT_DAEMON_SEM_LOCK();
-
-                    if (daemon_local->flags.lflag)
-                    {
-                    	if(!failed && 0 > send(j,dltSerialHeader,sizeof(dltSerialHeader),0))
-                        {
-                        	dlt_daemon_close_socket(j, daemon, daemon_local, verbose);
-                        	failed = 1;
-                        }
-                    }
-                    if(!failed && 0 > send(j,data,length,0))
-                    {
-                    	dlt_daemon_close_socket(j, daemon, daemon_local, verbose);
-                    	failed = 1;
-                    }
-
-                    DLT_DAEMON_SEM_FREE();
-
-                } /* if */
-                else if ((j == daemon_local->fdserial) && (daemon_local->flags.yvalue[0]))
-                {
-                    DLT_DAEMON_SEM_LOCK();
+    	dlt_daemon_change_state(daemon, DLT_DAEMON_STATE_SEND_DIRECT);
+    	return 0;
+    }
 
-                    if (daemon_local->flags.lflag)
-                    {
-                        ret=write(j,dltSerialHeader,sizeof(dltSerialHeader));
-                        if (0 > ret)
-                        {
-                                dlt_log(LOG_ERR, "dlt_daemon_send_ringbuffer_to_client: write(j,dltSerialHeader,sizeof(dltSerialHeader)) failed!\n");
-                                DLT_DAEMON_SEM_FREE();
-                                return -1;
-                        }
-                    }
-                    ret=write(j,data,length);
-                    if (0 > ret)
-                    {
-                            dlt_log(LOG_ERR, "dlt_daemon_send_ringbuffer_to_client: write(j,data,length) failed!\n");
-                            DLT_DAEMON_SEM_FREE();
-                            return -1;
-                    }
-                    DLT_DAEMON_SEM_FREE();
+	/* Attention: If the message can't be send at this time, it will be silently discarded. */
+    while ( (length = dlt_buffer_pull(&(daemon->client_ringbuffer), data, sizeof(data)) ) > 0)
+    {
+    	dlt_daemon_client_send(DLT_DAEMON_SEND_TO_ALL,daemon,daemon_local,data,length,0,0,1/* ringbuffer operation */,verbose);
 
-                }
-            } /* if */
-        } /* for */
-        length = sizeof(data);
+        if(dlt_buffer_get_message_count(&(daemon->client_ringbuffer)) <= 0)
+        {
+        	dlt_daemon_change_state(daemon,DLT_DAEMON_STATE_SEND_DIRECT);
+        	return 0;
+        }
     }
 
     return 0;
@@ -2738,62 +2491,27 @@ int create_timer_fd(DltDaemonLocal *daemon_local, int period_sec, int starts_in,
 
 void dlt_daemon_send_timingpacket(DltDaemon *daemon, DltDaemonLocal *daemon_local)
 {
-    int j;
-
-    if (daemon->timingpackets)
+   if (daemon->timingpackets)
     {
-        for (j = 0; j <= daemon_local->fdmax; j++)
-        {
-            /* send to everyone! */
-            if (FD_ISSET(j, &(daemon_local->master)))
-            {
-                /* except the listener and ourselves */
-                if ((j != daemon_local->fp) && (j != daemon_local->sock)
-#ifdef DLT_SYSTEMD_WATCHDOG_ENABLE
-                        && (j!=daemon_local->timer_wd)
-#endif
-			&& (j!=daemon_local->timer_timingpacket) && (j!=daemon_local->timer_ecuversion) )
-                {
-                    dlt_log(LOG_DEBUG, "timingpacket\n");
-                    dlt_daemon_control_message_time(j, daemon, daemon_local->flags.vflag);
-
-                }
-            }
-        }
+		 dlt_log(LOG_DEBUG, "timingpacket\n");
+		 dlt_daemon_control_message_time(DLT_DAEMON_SEND_TO_ALL, daemon, daemon_local, daemon_local->flags.vflag);
     }
 }
 
 void dlt_daemon_send_ecuversion(DltDaemon *daemon, DltDaemonLocal *daemon_local)
 {
-    int j;
-
-    for (j = 0; j <= daemon_local->fdmax; j++)
-    {
-        /* send to everyone! */
-        if (FD_ISSET(j, &(daemon_local->master)))
-        {
-            /* except the listener and ourselves */
-            if ((j != daemon_local->fp) && (j != daemon_local->sock)
-#ifdef DLT_SYSTEMD_WATCHDOG_ENABLE
-                        && (j!=daemon_local->timer_wd)
-#endif
-			&& (j!=daemon_local->timer_timingpacket) && (j!=daemon_local->timer_ecuversion))
-            {
-                dlt_log(LOG_DEBUG, "ecu_version\n");
-                if(daemon_local->flags.sendECUSoftwareVersion > 0)
-                	dlt_daemon_control_get_software_version(j, daemon, daemon_local->flags.vflag);
+	dlt_log(LOG_DEBUG, "ecu_version\n");
+	if(daemon_local->flags.sendECUSoftwareVersion > 0)
+		dlt_daemon_control_get_software_version(DLT_DAEMON_SEND_TO_ALL, daemon,daemon_local, daemon_local->flags.vflag);
 
-                if(daemon_local->flags.sendTimezone > 0)
-                {
-					// send timezone information
-					time_t t = time(NULL);
-					struct tm lt = {0};
-					localtime_r(&t, &lt);
-					dlt_daemon_control_message_timezone(j,daemon,(int32_t) lt.tm_gmtoff,(uint8_t) lt.tm_isdst,daemon_local->flags.vflag);
-                }
-            }
-        }
-    }
+	if(daemon_local->flags.sendTimezone > 0)
+	{
+		// send timezone information
+		time_t t = time(NULL);
+		struct tm lt = {0};
+		localtime_r(&t, &lt);
+		dlt_daemon_control_message_timezone(DLT_DAEMON_SEND_TO_ALL,daemon,daemon_local,(int32_t) lt.tm_gmtoff,(uint8_t) lt.tm_isdst,daemon_local->flags.vflag);
+	}
 }
 
 /* Close connection function */
@@ -2810,8 +2528,9 @@ int dlt_daemon_close_socket(int sock, DltDaemon *daemon, DltDaemonLocal *daemon_
 	if(daemon_local->client_connections==0)
 	{
 		/* send new log state to all applications */
-		daemon->state = 0;
+		daemon->connectionState = 0;
 		dlt_daemon_user_send_all_log_state(daemon,verbose);
+    	dlt_daemon_change_state(daemon,DLT_DAEMON_STATE_BUFFER);
 	}
 
 	if (daemon_local->flags.vflag)
@@ -2820,7 +2539,1492 @@ int dlt_daemon_close_socket(int sock, DltDaemon *daemon, DltDaemonLocal *daemon_
 		dlt_log(LOG_INFO, str);
 	}
 
-	dlt_daemon_control_message_connection_info(DLT_DAEMON_STORE_TO_BUFFER,daemon,DLT_CONNECTION_STATUS_DISCONNECTED,"",verbose);
+	dlt_daemon_control_message_connection_info(DLT_DAEMON_SEND_TO_ALL,daemon,daemon_local,DLT_CONNECTION_STATUS_DISCONNECTED,"",verbose);
+
+	return 0;
+}
+
+int dlt_daemon_client_send(int sock,DltDaemon *daemon,DltDaemonLocal *daemon_local,void* data1,int size1,void* data2,int size2,char ringbuffer,int verbose)
+{
+	int j,third_value;
+
+    if (sock!=DLT_DAEMON_SEND_TO_ALL)
+    {
+        /* Send message to specific socket */
+        if (isatty(sock))
+        {
+            DLT_DAEMON_SEM_LOCK();
+
+            if(dlt_daemon_serial_send(sock,data1,size1,data2,size2,daemon->sendserialheader))
+            {
+                dlt_log(LOG_WARNING,"dlt_daemon_control_send_control_message: serial send dlt message failed\n");
+                DLT_DAEMON_SEM_FREE();
+                return -1;
+           }
+
+            DLT_DAEMON_SEM_FREE();
+        }
+        else
+        {
+            DLT_DAEMON_SEM_LOCK();
+
+            if(dlt_daemon_socket_send(sock,data1,size1,data2,size2,daemon->sendserialheader))
+            {
+                dlt_log(LOG_WARNING,"dlt_daemon_control_send_control_message: socket send dlt message failed\n");
+                DLT_DAEMON_SEM_FREE();
+                return -1;
+            }
+
+            DLT_DAEMON_SEM_FREE();
+        }
+        return 0;
+    }
+
+	/* write message to offline trace */
+    if (!ringbuffer && (daemon->state == DLT_DAEMON_STATE_SEND_DIRECT))
+    {
+		if(((daemon->mode == DLT_USER_MODE_INTERNAL) || (daemon->mode == DLT_USER_MODE_BOTH))
+							&& daemon_local->flags.offlineTraceDirectory[0])
+		{
+			dlt_offline_trace_write(&(daemon_local->offlineTrace),daemon_local->msg.headerbuffer,daemon_local->msg.headersize,
+									daemon_local->msg.databuffer,daemon_local->msg.datasize,0,0);
+		}
+    }
+
+    /* send messages to daemon socket */
+    if (ringbuffer || (daemon->state == DLT_DAEMON_STATE_SEND_DIRECT))
+    {
+		/* look if TCP connection to client is available */
+		for (j = 0; j <= daemon_local->fdmax; j++)
+		{
+			/* send to everyone! */
+			if (FD_ISSET(j, &(daemon_local->master)))
+			{
+				/* except the listener and ourselves */
+				if (daemon_local->flags.yvalue[0])
+				{
+					third_value = daemon_local->fdserial;
+				}
+				else
+				{
+					third_value = daemon_local->sock;
+				}
+				if ((j != daemon_local->fp) && (j != daemon_local->sock) && (j != third_value)
+	#ifdef DLT_SYSTEMD_WATCHDOG_ENABLE
+							&& (j!=daemon_local->timer_wd)
+	#endif
+				&& (j!=daemon_local->timer_timingpacket) && (j!=daemon_local->timer_ecuversion))
+				{
+					/* Send message */
+					if (isatty(j))
+					{
+						DLT_DAEMON_SEM_LOCK();
+
+						if(dlt_daemon_serial_send(j,data1,size1,data2,size2,daemon->sendserialheader))
+						{
+							dlt_log(LOG_WARNING,"dlt_daemon_send_all: serial send dlt message failed\n");
+						}
+
+						DLT_DAEMON_SEM_FREE();
+					}
+					else
+					{
+						DLT_DAEMON_SEM_LOCK();
+
+						if(dlt_daemon_socket_send(j,data1,size1,data2,size2,daemon->sendserialheader))
+						{
+							dlt_log(LOG_WARNING,"dlt_daemon_send_all: socket send dlt message failed\n");
+							dlt_daemon_close_socket(j, daemon, daemon_local, verbose);
+						}
+
+						DLT_DAEMON_SEM_FREE();
+					}
+
+				}
+			}
+		}
+    }
+
+    /* Message was not sent to client, so store it in client ringbuffer */
+    if (!ringbuffer && (daemon->state == DLT_DAEMON_STATE_BUFFER || daemon->state == DLT_DAEMON_STATE_SEND_BUFFER))
+    {
+        DLT_DAEMON_SEM_LOCK();
+        /* Store message in history buffer */
+        if (dlt_buffer_push3(&(daemon->client_ringbuffer),data1,size1,data2,size2,0, 0)<0)
+		{
+        	DLT_DAEMON_SEM_FREE();
+			dlt_log(LOG_ERR,"dlt_daemon_send_all: Buffer is full! Message discarded.\n");
+		}
+        DLT_DAEMON_SEM_FREE();
+    }
+
+    return 0;
+
+}
+
+void dlt_daemon_control_get_software_version(int sock, DltDaemon *daemon, DltDaemonLocal *daemon_local, int verbose)
+{
+    DltMessage msg;
+    uint32_t len;
+	DltServiceGetSoftwareVersionResponse *resp;
+
+    PRINT_FUNCTION_VERBOSE(verbose);
+
+    if (daemon==0)
+    {
+        return;
+    }
+
+    /* initialise new message */
+    if (dlt_message_init(&msg,0)==-1)
+    {
+    	dlt_daemon_control_service_response(sock, daemon,daemon_local, DLT_SERVICE_ID_GET_SOFTWARE_VERSION, DLT_SERVICE_RESPONSE_ERROR,  verbose);
+		return;
+    }
+
+    /* prepare payload of data */
+    len = strlen(daemon->ECUVersionString);
+
+    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,daemon_local, 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),daemon->ECUVersionString,len);
+
+    /* send message */
+    dlt_daemon_control_send_control_message(sock, daemon,daemon_local, &msg,"","",  verbose);
+
+    /* free message */
+    dlt_message_free(&msg,0);
+}
+
+void dlt_daemon_control_get_default_log_level(int sock, DltDaemon *daemon, DltDaemonLocal *daemon_local, int verbose)
+{
+    DltMessage msg;
+	DltServiceGetDefaultLogLevelResponse *resp;
+
+    PRINT_FUNCTION_VERBOSE(verbose);
+
+    if (daemon==0)
+    {
+        return;
+    }
+
+    /* initialise new message */
+    if (dlt_message_init(&msg,0)==-1)
+    {
+    	dlt_daemon_control_service_response(sock, daemon,daemon_local, DLT_SERVICE_ID_GET_DEFAULT_LOG_LEVEL, DLT_SERVICE_RESPONSE_ERROR,  verbose);
+        return;
+    }
+
+    msg.datasize = sizeof(DltServiceGetDefaultLogLevelResponse);
+    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,daemon_local, DLT_SERVICE_ID_GET_DEFAULT_LOG_LEVEL, DLT_SERVICE_RESPONSE_ERROR,  verbose);
+        return;
+    }
+
+    resp = (DltServiceGetDefaultLogLevelResponse*) msg.databuffer;
+    resp->service_id = DLT_SERVICE_ID_GET_DEFAULT_LOG_LEVEL;
+    resp->status = DLT_SERVICE_RESPONSE_OK;
+    resp->log_level = daemon->default_log_level;
+
+    /* send message */
+    dlt_daemon_control_send_control_message(sock,daemon,daemon_local,&msg,"","",  verbose);
+
+    /* free message */
+    dlt_message_free(&msg,0);
+}
+
+void dlt_daemon_control_get_log_info(int sock, DltDaemon *daemon, DltDaemonLocal *daemon_local, DltMessage *msg, int verbose)
+{
+    DltServiceGetLogInfoRequest *req;
+    DltMessage resp;
+    DltDaemonContext *context=0;
+    DltDaemonApplication *application=0;
+
+    int num_applications=0, num_contexts=0;
+    uint16_t count_app_ids=0, count_con_ids=0;
+
+#if (DLT_DEBUG_GETLOGINFO==1)
+    char buf[255];
+#endif
+
+    int32_t i,j,offset=0;
+    char *apid=0;
+    int8_t ll,ts;
+    uint16_t len;
+    int8_t value;
+    int32_t sizecont=0;
+    int offset_base;
+
+    uint32_t sid;
+
+    PRINT_FUNCTION_VERBOSE(verbose);
+
+    if ((daemon==0) || (msg==0))
+    {
+        return;
+    }
+
+    /* prepare pointer to message request */
+    req = (DltServiceGetLogInfoRequest*) (msg->databuffer);
+
+    /* initialise new message */
+    if (dlt_message_init(&resp,0)==-1)
+    {
+		dlt_daemon_control_service_response(sock, daemon,daemon_local, DLT_SERVICE_ID_GET_LOG_INFO, DLT_SERVICE_RESPONSE_ERROR,  verbose);
+        return;
+    }
+
+    /* check request */
+    if ((req->options < 3 ) || (req->options>7))
+    {
+        dlt_daemon_control_service_response(sock, daemon,daemon_local, DLT_SERVICE_ID_GET_LOG_INFO, DLT_SERVICE_RESPONSE_ERROR,  verbose);
+        return;
+    }
+
+    if (req->apid[0]!='\0')
+    {
+        application = dlt_daemon_application_find(daemon, req->apid, verbose);
+        if (application)
+        {
+            num_applications = 1;
+            if (req->ctid[0]!='\0')
+            {
+                context = dlt_daemon_context_find(daemon, req->apid, req->ctid, verbose);
+
+                num_contexts = ((context)?1:0);
+            }
+            else
+            {
+                num_contexts = application->num_contexts;
+            }
+        }
+        else
+        {
+            num_applications = 0;
+            num_contexts = 0;
+        }
+    }
+    else
+    {
+        /* Request all applications and contexts */
+        num_applications = daemon->num_applications;
+        num_contexts = daemon->num_contexts;
+    }
+
+    /* prepare payload of data */
+
+    /* Calculate maximum size for a response */
+    resp.datasize = sizeof(uint32_t) /* SID */ + sizeof(int8_t) /* status*/ + sizeof(ID4) /* DLT_DAEMON_REMO_STRING */;
+
+    sizecont = sizeof(uint32_t) /* context_id */;
+
+    /* Add additional size for response of Mode 4, 6, 7 */
+    if ((req->options==4) || (req->options==6) || (req->options==7))
+    {
+        sizecont += sizeof(int8_t); /* log level */
+    }
+
+    /* Add additional size for response of Mode 5, 6, 7 */
+    if ((req->options==5) || (req->options==6) || (req->options==7))
+    {
+        sizecont+= sizeof(int8_t); /* trace status */
+    }
+
+    resp.datasize+= (num_applications * (sizeof(uint32_t) /* app_id */  + sizeof(uint16_t) /* count_con_ids */)) +
+                    (num_contexts * sizecont);
+
+    resp.datasize+= sizeof(uint16_t) /* count_app_ids */;
+
+    /* Add additional size for response of Mode 7 */
+    if (req->options==7)
+    {
+        if (req->apid[0]!='\0')
+        {
+            if (req->ctid[0]!='\0')
+            {
+                /* One application, one context */
+                // context = dlt_daemon_context_find(daemon, req->apid, req->ctid, verbose);
+                if (context)
+                {
+                    resp.datasize+=sizeof(uint16_t) /* len_context_description */;
+                    if (context->context_description!=0)
+                    {
+                        resp.datasize+=strlen(context->context_description); /* context_description */
+                    }
+                }
+            }
+            else
+            {
+                /* One application, all contexts */
+                if ((daemon->applications) && (application))
+                {
+                    /* Calculate start offset within contexts[] */
+                    offset_base=0;
+                    for (i=0; i<(application-(daemon->applications)); i++)
+                    {
+                        offset_base+=daemon->applications[i].num_contexts;
+                    }
+
+                    /* Iterate over all contexts belonging to this application */
+                    for (j=0;j<application->num_contexts;j++)
+                    {
+
+                        context = &(daemon->contexts[offset_base+j]);
+                        if (context)
+                        {
+                            resp.datasize+=sizeof(uint16_t) /* len_context_description */;
+                            if (context->context_description!=0)
+                            {
+                                resp.datasize+=strlen(context->context_description); /* context_description */
+                            }
+                        }
+                    }
+                }
+            }
+
+            /* Space for application description */
+            if (application)
+            {
+                resp.datasize+=sizeof(uint16_t) /* len_app_description */;
+                if (application->application_description!=0)
+                {
+                    resp.datasize+=strlen(application->application_description); /* app_description */
+                }
+            }
+        }
+        else
+        {
+            /* All applications, all contexts */
+            for (i=0;i<daemon->num_contexts;i++)
+            {
+                resp.datasize+=sizeof(uint16_t) /* len_context_description */;
+                if (daemon->contexts[i].context_description!=0)
+                {
+                    resp.datasize+=strlen(daemon->contexts[i].context_description); /* context_description */
+                }
+            }
+
+            for (i=0;i<daemon->num_applications;i++)
+            {
+                resp.datasize+=sizeof(uint16_t) /* len_app_description */;
+                if (daemon->applications[i].application_description!=0)
+                {
+                    resp.datasize+=strlen(daemon->applications[i].application_description); /* app_description */
+                }
+            }
+        }
+    }
+
+    if (verbose)
+    {
+        sprintf(str,"Allocate %d bytes for response msg databuffer\n", resp.datasize);
+        dlt_log(LOG_INFO, str);
+    }
+
+    /* Allocate buffer for response message */
+    resp.databuffer = (uint8_t *) malloc(resp.datasize);
+    resp.databuffersize = resp.datasize;
+
+    if (resp.databuffer==0)
+    {
+        dlt_daemon_control_service_response(sock, daemon,daemon_local, DLT_SERVICE_ID_GET_LOG_INFO, DLT_SERVICE_RESPONSE_ERROR,  verbose);
+        return;
+    }
+    memset(resp.databuffer,0,resp.datasize);
+    /* Preparation finished */
+
+    /* Prepare response */
+    sid = DLT_SERVICE_ID_GET_LOG_INFO;
+    memcpy(resp.databuffer,&sid,sizeof(uint32_t));
+    offset+=sizeof(uint32_t);
+
+    value = (((num_applications!=0)&&(num_contexts!=0))?req->options:8); /* 8 = no matching context found */
+
+    memcpy(resp.databuffer+offset,&value,sizeof(int8_t));
+    offset+=sizeof(int8_t);
+
+    count_app_ids = num_applications;
+
+    if (count_app_ids!=0)
+    {
+        memcpy(resp.databuffer+offset,&count_app_ids,sizeof(uint16_t));
+        offset+=sizeof(uint16_t);
+
+#if (DLT_DEBUG_GETLOGINFO==1)
+        sprintf(str,"#apid: %d \n", count_app_ids);
+        dlt_log(LOG_DEBUG, str);
+#endif
+
+        for (i=0;i<count_app_ids;i++)
+        {
+            if (req->apid[0]!='\0')
+            {
+                apid = req->apid;
+            }
+            else
+            {
+                if (daemon->applications)
+                {
+                    apid = daemon->applications[i].apid;
+                }
+                else
+                {
+                    /* This should never occur! */
+                    apid=0;
+                }
+            }
+
+            application = dlt_daemon_application_find(daemon, apid, verbose);
+
+            if (application)
+            {
+                /* Calculate start offset within contexts[] */
+                offset_base=0;
+                for (j=0; j<(application-(daemon->applications)); j++)
+                {
+                    offset_base+=daemon->applications[j].num_contexts;
+                }
+
+                dlt_set_id((char*)(resp.databuffer+offset),apid);
+                offset+=sizeof(ID4);
+
+#if (DLT_DEBUG_GETLOGINFO==1)
+                dlt_print_id(buf, apid);
+                sprintf(str,"apid: %s\n",buf);
+                dlt_log(LOG_DEBUG, str);
+#endif
+
+                if (req->apid[0]!='\0')
+                {
+                    count_con_ids = num_contexts;
+                }
+                else
+                {
+                    count_con_ids = application->num_contexts;
+                }
+
+                memcpy(resp.databuffer+offset,&count_con_ids,sizeof(uint16_t));
+                offset+=sizeof(uint16_t);
+
+#if (DLT_DEBUG_GETLOGINFO==1)
+                sprintf(str,"#ctid: %d \n", count_con_ids);
+                dlt_log(LOG_DEBUG, str);
+#endif
+
+                for (j=0;j<count_con_ids;j++)
+                {
+#if (DLT_DEBUG_GETLOGINFO==1)
+                    sprintf(str,"j: %d \n",j);
+                    dlt_log(LOG_DEBUG, str);
+#endif
+                    if (!((count_con_ids==1) && (req->apid[0]!='\0') && (req->ctid[0]!='\0')))
+                    {
+                        context = &(daemon->contexts[offset_base+j]);
+                    }
+                    /* else: context was already searched and found
+                             (one application (found) with one context (found))*/
+
+                    if ((context) &&
+                            ((req->ctid[0]=='\0') ||
+                             ((req->ctid[0]!='\0') && (memcmp(context->ctid,req->ctid,DLT_ID_SIZE)==0)))
+                       )
+                    {
+                        dlt_set_id((char*)(resp.databuffer+offset),context->ctid);
+                        offset+=sizeof(ID4);
+
+#if (DLT_DEBUG_GETLOGINFO==1)
+                        dlt_print_id(buf, context->ctid);
+                        sprintf(str,"ctid: %s \n",buf);
+                        dlt_log(LOG_DEBUG, str);
+#endif
+
+                        /* Mode 4, 6, 7 */
+                        if ((req->options==4) || (req->options==6) || (req->options==7))
+                        {
+                            ll=context->log_level;
+                            memcpy(resp.databuffer+offset,&ll,sizeof(int8_t));
+                            offset+=sizeof(int8_t);
+                        }
+
+                        /* Mode 5, 6, 7 */
+                        if ((req->options==5) || (req->options==6) || (req->options==7))
+                        {
+                            ts=context->trace_status;
+                            memcpy(resp.databuffer+offset,&ts,sizeof(int8_t));
+                            offset+=sizeof(int8_t);
+                        }
+
+                        /* Mode 7 */
+                        if (req->options==7)
+                        {
+                            if (context->context_description)
+                            {
+                                len = strlen(context->context_description);
+                                memcpy(resp.databuffer+offset,&len,sizeof(uint16_t));
+                                offset+=sizeof(uint16_t);
+                                memcpy(resp.databuffer+offset,context->context_description,strlen(context->context_description));
+                                offset+=strlen(context->context_description);
+                            }
+                            else
+                            {
+                                len = 0;
+                                memcpy(resp.databuffer+offset,&len,sizeof(uint16_t));
+                                offset+=sizeof(uint16_t);
+                            }
+                        }
+
+#if (DLT_DEBUG_GETLOGINFO==1)
+                        sprintf(str,"ll=%d ts=%d \n",(int32_t)ll,(int32_t)ts);
+                        dlt_log(LOG_DEBUG, str);
+#endif
+                    }
+
+#if (DLT_DEBUG_GETLOGINFO==1)
+                    dlt_log(LOG_DEBUG,"\n");
+#endif
+                }
+
+                /* Mode 7 */
+                if (req->options==7)
+                {
+                    if (application->application_description)
+                    {
+                        len = strlen(application->application_description);
+                        memcpy(resp.databuffer+offset,&len,sizeof(uint16_t));
+                        offset+=sizeof(uint16_t);
+                        memcpy(resp.databuffer+offset,application->application_description,strlen(application->application_description));
+                        offset+=strlen(application->application_description);
+                    }
+                    else
+                    {
+                        len = 0;
+                        memcpy(resp.databuffer+offset,&len,sizeof(uint16_t));
+                        offset+=sizeof(uint16_t);
+                    }
+                }
+            } /* if (application) */
+        } /* for (i=0;i<count_app_ids;i++) */
+    } /* if (count_app_ids!=0) */
+
+    dlt_set_id((char*)(resp.databuffer+offset),DLT_DAEMON_REMO_STRING);
+
+    /* send message */
+    dlt_daemon_control_send_control_message(sock,daemon,daemon_local,&resp,"","",  verbose);
+
+    /* free message */
+    dlt_message_free(&resp,0);
+}
+
+int dlt_daemon_control_message_buffer_overflow(int sock, DltDaemon *daemon, DltDaemonLocal *daemon_local, unsigned int overflow_counter,char* apid, int verbose)
+{
+    DltMessage msg;
+	DltServiceMessageBufferOverflowResponse *resp;
+
+    PRINT_FUNCTION_VERBOSE(verbose);
+
+    if (daemon==0)
+    {
+        return -1;
+    }
+
+    /* initialise new message */
+    if (dlt_message_init(&msg,0)==-1)
+    {
+    	dlt_daemon_control_service_response(sock, daemon,daemon_local, DLT_SERVICE_ID_MESSAGE_BUFFER_OVERFLOW, DLT_SERVICE_RESPONSE_ERROR,  verbose);
+    	return -1;
+    }
+
+    /* prepare payload of data */
+    msg.datasize = sizeof(DltServiceMessageBufferOverflowResponse);
+    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)
+    {
+        return -1;
+    }
+
+    resp = (DltServiceMessageBufferOverflowResponse*) msg.databuffer;
+    resp->service_id = DLT_SERVICE_ID_MESSAGE_BUFFER_OVERFLOW;
+    resp->status = DLT_SERVICE_RESPONSE_OK;
+    resp->overflow = daemon->message_buffer_overflow;
+   	resp->overflow_counter = overflow_counter;
+
+    /* send message */
+    if(dlt_daemon_control_send_control_message(sock,daemon,daemon_local,&msg,apid,"",  verbose))
+    {
+        dlt_message_free(&msg,0);
+    	return -1;
+    }
+
+    /* free message */
+    dlt_message_free(&msg,0);
+
+    return 0;
+}
+
+void dlt_daemon_control_service_response( int sock, DltDaemon *daemon, DltDaemonLocal *daemon_local, uint32_t service_id, int8_t status , int verbose)
+{
+    DltMessage msg;
+    DltServiceResponse *resp;
+
+    PRINT_FUNCTION_VERBOSE(verbose);
+
+    if (daemon==0)
+    {
+        return;
+    }
+
+    /* initialise new message */
+    if (dlt_message_init(&msg,0)==-1)
+    {
+		return;
+    }
+
+    /* prepare payload of data */
+    msg.datasize = sizeof(DltServiceResponse);
+    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)
+    {
+        return;
+    }
+
+    resp = (DltServiceResponse*) msg.databuffer;
+    resp->service_id = service_id;
+    resp->status = status;
+
+    /* send message */
+    dlt_daemon_control_send_control_message(sock,daemon,daemon_local,&msg,"","",  verbose);
+
+    /* free message */
+    dlt_message_free(&msg,0);
+}
+
+int dlt_daemon_control_message_unregister_context(int sock, DltDaemon *daemon, DltDaemonLocal *daemon_local, char* apid, char* ctid, char* comid, int verbose)
+{
+    DltMessage msg;
+    DltServiceUnregisterContext *resp;
+
+    PRINT_FUNCTION_VERBOSE(verbose);
+
+    if (daemon==0)
+    {
+        return -1;
+    }
+
+    /* initialise new message */
+    if (dlt_message_init(&msg,0)==-1)
+    {
+    	dlt_daemon_control_service_response(sock, daemon,daemon_local, DLT_SERVICE_ID_MESSAGE_BUFFER_OVERFLOW, DLT_SERVICE_RESPONSE_ERROR,  verbose);
+    	return -1;
+    }
+
+    /* prepare payload of data */
+    msg.datasize = sizeof(DltServiceUnregisterContext);
+    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)
+    {
+        return -1;
+    }
+
+    resp = (DltServiceUnregisterContext*) msg.databuffer;
+    resp->service_id = DLT_SERVICE_ID_UNREGISTER_CONTEXT;
+    resp->status = DLT_SERVICE_RESPONSE_OK;
+   	dlt_set_id(resp->apid, apid);
+   	dlt_set_id(resp->ctid, ctid);
+   	dlt_set_id(resp->comid, comid);
+
+    /* send message */
+    if(dlt_daemon_control_send_control_message(sock,daemon,daemon_local,&msg,"","",  verbose))
+    {
+        dlt_message_free(&msg,0);
+    	return -1;
+    }
+
+    /* free message */
+    dlt_message_free(&msg,0);
+
+    return 0;
+}
+
+int dlt_daemon_control_message_connection_info(int sock, DltDaemon *daemon, DltDaemonLocal *daemon_local, uint8_t state, char* comid, int verbose)
+{
+    DltMessage msg;
+    DltServiceConnectionInfo *resp;
+
+    PRINT_FUNCTION_VERBOSE(verbose);
+
+    if (daemon==0)
+    {
+        return -1;
+    }
+
+    /* initialise new message */
+    if (dlt_message_init(&msg,0)==-1)
+    {
+    	dlt_daemon_control_service_response(sock, daemon,daemon_local, DLT_SERVICE_ID_MESSAGE_BUFFER_OVERFLOW, DLT_SERVICE_RESPONSE_ERROR,  verbose);
+    	return -1;
+    }
+
+    /* prepare payload of data */
+    msg.datasize = sizeof(DltServiceConnectionInfo);
+    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)
+    {
+        return -1;
+    }
+
+    resp = (DltServiceConnectionInfo*) msg.databuffer;
+    resp->service_id = DLT_SERVICE_ID_CONNECTION_INFO;
+    resp->status = DLT_SERVICE_RESPONSE_OK;
+    resp->state = state;
+    dlt_set_id(resp->comid, comid);
+
+    /* send message */
+    if(dlt_daemon_control_send_control_message(sock,daemon,daemon_local,&msg,"","",  verbose))
+    {
+        dlt_message_free(&msg,0);
+    	return -1;
+    }
+
+    /* free message */
+    dlt_message_free(&msg,0);
+
+    return 0;
+}
+
+int dlt_daemon_control_message_timezone(int sock, DltDaemon *daemon, DltDaemonLocal *daemon_local, int32_t timezone, uint8_t isdst, int verbose)
+{
+    DltMessage msg;
+    DltServiceTimezone *resp;
+
+    PRINT_FUNCTION_VERBOSE(verbose);
+
+    if (daemon==0)
+    {
+        return -1;
+    }
+
+    /* initialise new message */
+    if (dlt_message_init(&msg,0)==-1)
+    {
+    	dlt_daemon_control_service_response(sock, daemon,daemon_local, DLT_SERVICE_ID_MESSAGE_BUFFER_OVERFLOW, DLT_SERVICE_RESPONSE_ERROR,  verbose);
+    	return -1;
+    }
+
+    /* prepare payload of data */
+    msg.datasize = sizeof(DltServiceTimezone);
+    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)
+    {
+        return -1;
+    }
+
+    resp = (DltServiceTimezone*) msg.databuffer;
+    resp->service_id = DLT_SERVICE_ID_TIMEZONE;
+    resp->status = DLT_SERVICE_RESPONSE_OK;
+    resp->timezone = timezone;
+    resp->isdst = isdst;
+
+    /* send message */
+    if(dlt_daemon_control_send_control_message(sock,daemon,daemon_local,&msg,"","",  verbose))
+    {
+        dlt_message_free(&msg,0);
+    	return -1;
+    }
+
+    /* free message */
+    dlt_message_free(&msg,0);
+
+    return 0;
+}
+
+int dlt_daemon_control_send_control_message( int sock, DltDaemon *daemon, DltDaemonLocal *daemon_local, DltMessage *msg, char* appid, char* ctid, int verbose)
+{
+    int32_t len;
+
+    PRINT_FUNCTION_VERBOSE(verbose);
+
+    if ((daemon==0) || (msg==0) || (appid==0) || (ctid==0))
+    {
+        return -1;
+    }
+
+    /* prepare storage header */
+    msg->storageheader = (DltStorageHeader*)msg->headerbuffer;
+
+    if (dlt_set_storageheader(msg->storageheader,daemon->ecuid)==-1)
+    {
+		return -1;
+    }
+
+    /* prepare standard header */
+    msg->standardheader = (DltStandardHeader*)(msg->headerbuffer + sizeof(DltStorageHeader));
+    msg->standardheader->htyp = DLT_HTYP_WEID | DLT_HTYP_WTMS | DLT_HTYP_UEH | DLT_HTYP_PROTOCOL_VERSION1 ;
+
+#if (BYTE_ORDER==BIG_ENDIAN)
+    msg->standardheader->htyp = ( msg->standardheader->htyp | DLT_HTYP_MSBF);
+#endif
+
+    msg->standardheader->mcnt = 0;
+
+    /* Set header extra parameters */
+    dlt_set_id(msg->headerextra.ecu,daemon->ecuid);
+
+    //msg->headerextra.seid = 0;
+
+    msg->headerextra.tmsp = dlt_uptime();
+
+    dlt_message_set_extraparameters(msg, verbose);
+
+    /* prepare extended header */
+    msg->extendedheader = (DltExtendedHeader*)(msg->headerbuffer + sizeof(DltStorageHeader) + sizeof(DltStandardHeader) + DLT_STANDARD_HEADER_EXTRA_SIZE(msg->standardheader->htyp));
+    msg->extendedheader->msin = DLT_MSIN_CONTROL_RESPONSE;
+
+    msg->extendedheader->noar = 1; /* number of arguments */
+    if (strcmp(appid,"")==0)
+    {
+        dlt_set_id(msg->extendedheader->apid,DLT_DAEMON_CTRL_APID);       /* application id */
+    }
+    else
+    {
+        dlt_set_id(msg->extendedheader->apid, appid);
+    }
+    if (strcmp(ctid,"")==0)
+    {
+        dlt_set_id(msg->extendedheader->ctid,DLT_DAEMON_CTRL_CTID);       /* context id */
+    }
+    else
+    {
+        dlt_set_id(msg->extendedheader->ctid, ctid);
+    }
+
+    /* prepare length information */
+    msg->headersize = sizeof(DltStorageHeader) + sizeof(DltStandardHeader) + sizeof(DltExtendedHeader) + DLT_STANDARD_HEADER_EXTRA_SIZE(msg->standardheader->htyp);
+
+    len=msg->headersize - sizeof(DltStorageHeader) + msg->datasize;
+    if (len>UINT16_MAX)
+    {
+        dlt_log(LOG_CRIT,"Huge control message discarded!\n");
+        return -1;
+    }
+
+    msg->standardheader->len = DLT_HTOBE_16(((uint16_t)len));
+
+	if(dlt_daemon_client_send(sock,daemon,daemon_local,msg->headerbuffer+sizeof(DltStorageHeader),msg->headersize-sizeof(DltStorageHeader),
+						msg->databuffer,msg->datasize,0/* no ringbuffer operation */,verbose))
+	{
+		DLT_DAEMON_SEM_FREE();
+		dlt_log(LOG_ERR,"dlt_daemon_control_send_control_message: DLT message send to all failed!.\n");
+		return -1;
+	}
+
+    return 0;
+}
+
+int dlt_daemon_control_process_control(int sock, DltDaemon *daemon, DltDaemonLocal *daemon_local, DltMessage *msg, int verbose)
+{
+    uint32_t id,id_tmp=0;
+
+    PRINT_FUNCTION_VERBOSE(verbose);
+
+    if ((daemon==0) || (msg==0))
+    {
+        return -1;
+    }
+
+    if (msg->datasize < (int32_t)sizeof(uint32_t))
+    {
+        return -1;
+    }
+
+    id_tmp = *((uint32_t*)(msg->databuffer));
+    id=DLT_ENDIAN_GET_32(msg->standardheader->htyp ,id_tmp);
+
+    if ((id > 0) && (id <= DLT_SERVICE_ID_MESSAGE_BUFFER_OVERFLOW))
+    {
+        /* Control message handling */
+        switch (id)
+        {
+        case DLT_SERVICE_ID_SET_LOG_LEVEL:
+        {
+            dlt_daemon_control_set_log_level(sock, daemon, daemon_local, msg,  verbose);
+            break;
+        }
+        case DLT_SERVICE_ID_SET_TRACE_STATUS:
+        {
+            dlt_daemon_control_set_trace_status(sock, daemon, daemon_local, msg,  verbose);
+            break;
+        }
+        case DLT_SERVICE_ID_GET_LOG_INFO:
+        {
+            dlt_daemon_control_get_log_info(sock, daemon, daemon_local, msg, verbose);
+            break;
+        }
+        case DLT_SERVICE_ID_GET_DEFAULT_LOG_LEVEL:
+        {
+            dlt_daemon_control_get_default_log_level(sock, daemon, daemon_local, verbose);
+            break;
+        }
+        case DLT_SERVICE_ID_STORE_CONFIG:
+        {
+            if (dlt_daemon_applications_save(daemon, daemon->runtime_application_cfg, verbose)==0)
+            {
+				if (dlt_daemon_contexts_save(daemon, daemon->runtime_context_cfg, verbose)==0)
+				{
+					dlt_daemon_control_service_response(sock, daemon, daemon_local, id, DLT_SERVICE_RESPONSE_OK,  verbose);
+				}
+				else
+				{
+					/* Delete saved files */
+					dlt_daemon_control_reset_to_factory_default(daemon, daemon->runtime_application_cfg, daemon->runtime_context_cfg, verbose);
+					dlt_daemon_control_service_response(sock, daemon, daemon_local, id, DLT_SERVICE_RESPONSE_ERROR,  verbose);
+				}
+            }
+            else
+            {
+            	dlt_daemon_control_service_response(sock, daemon, daemon_local, id, DLT_SERVICE_RESPONSE_ERROR,  verbose);
+            }
+            break;
+        }
+        case DLT_SERVICE_ID_RESET_TO_FACTORY_DEFAULT:
+        {
+            dlt_daemon_control_reset_to_factory_default(daemon, daemon->runtime_application_cfg, daemon->runtime_context_cfg, verbose);
+            dlt_daemon_control_service_response(sock, daemon, daemon_local, id, DLT_SERVICE_RESPONSE_OK,  verbose);
+            break;
+        }
+        case DLT_SERVICE_ID_SET_COM_INTERFACE_STATUS:
+        {
+            dlt_daemon_control_service_response(sock, daemon, daemon_local, id, DLT_SERVICE_RESPONSE_NOT_SUPPORTED,  verbose);
+            break;
+        }
+        case DLT_SERVICE_ID_SET_COM_INTERFACE_MAX_BANDWIDTH:
+        {
+            dlt_daemon_control_service_response(sock, daemon, daemon_local, id, DLT_SERVICE_RESPONSE_NOT_SUPPORTED,  verbose);
+            break;
+        }
+        case DLT_SERVICE_ID_SET_VERBOSE_MODE:
+        {
+            dlt_daemon_control_service_response(sock, daemon, daemon_local, id, DLT_SERVICE_RESPONSE_NOT_SUPPORTED,  verbose);
+            break;
+        }
+        case DLT_SERVICE_ID_SET_MESSAGE_FILTERING:
+        {
+            dlt_daemon_control_service_response(sock, daemon, daemon_local, id, DLT_SERVICE_RESPONSE_NOT_SUPPORTED,  verbose);
+            break;
+        }
+        case DLT_SERVICE_ID_SET_TIMING_PACKETS:
+        {
+            dlt_daemon_control_set_timing_packets(sock, daemon, daemon_local, msg,  verbose);
+            break;
+        }
+        case DLT_SERVICE_ID_GET_LOCAL_TIME:
+        {
+            /* Send response with valid timestamp (TMSP) field */
+            dlt_daemon_control_service_response(sock, daemon, daemon_local, id, DLT_SERVICE_RESPONSE_OK,  verbose);
+            break;
+        }
+        case DLT_SERVICE_ID_USE_ECU_ID:
+        {
+            dlt_daemon_control_service_response(sock, daemon, daemon_local, id, DLT_SERVICE_RESPONSE_NOT_SUPPORTED,  verbose);
+            break;
+        }
+        case DLT_SERVICE_ID_USE_SESSION_ID:
+        {
+            dlt_daemon_control_service_response(sock, daemon, daemon_local, id, DLT_SERVICE_RESPONSE_NOT_SUPPORTED,  verbose);
+            break;
+        }
+        case DLT_SERVICE_ID_USE_TIMESTAMP:
+        {
+            dlt_daemon_control_service_response(sock, daemon, daemon_local, id, DLT_SERVICE_RESPONSE_NOT_SUPPORTED,  verbose);
+            break;
+        }
+        case DLT_SERVICE_ID_USE_EXTENDED_HEADER:
+        {
+            dlt_daemon_control_service_response(sock, daemon, daemon_local, id, DLT_SERVICE_RESPONSE_NOT_SUPPORTED,  verbose);
+            break;
+        }
+        case DLT_SERVICE_ID_SET_DEFAULT_LOG_LEVEL:
+        {
+            dlt_daemon_control_set_default_log_level(sock, daemon, daemon_local, msg,  verbose);
+            break;
+        }
+        case DLT_SERVICE_ID_SET_DEFAULT_TRACE_STATUS:
+        {
+            dlt_daemon_control_set_default_trace_status(sock, daemon, daemon_local, msg,  verbose);
+            break;
+        }
+        case DLT_SERVICE_ID_GET_SOFTWARE_VERSION:
+        {
+            dlt_daemon_control_get_software_version(sock, daemon, daemon_local,  verbose);
+            break;
+        }
+        case DLT_SERVICE_ID_MESSAGE_BUFFER_OVERFLOW:
+        {
+            dlt_daemon_control_message_buffer_overflow(sock, daemon, daemon_local, daemon->overflow_counter,"",verbose);
+            break;
+        }
+        default:
+        {
+            dlt_daemon_control_service_response(sock, daemon, daemon_local, id, DLT_SERVICE_RESPONSE_NOT_SUPPORTED,  verbose);
+            break;
+        }
+        }
+    }
+    else
+    {
+        /* Injection handling */
+        dlt_daemon_control_callsw_cinjection(sock, daemon, daemon_local, msg,  verbose);
+    }
+
+    return 0;
+}
+
+void dlt_daemon_control_callsw_cinjection(int sock, DltDaemon *daemon, DltDaemonLocal *daemon_local, DltMessage *msg, int verbose)
+{
+    char apid[DLT_ID_SIZE],ctid[DLT_ID_SIZE];
+    uint32_t id=0,id_tmp=0;
+    uint8_t *ptr;
+    DltDaemonContext *context;
+	int32_t data_length_inject=0;
+	uint32_t data_length_inject_tmp=0;
+
+	int32_t datalength;
+
+	DltUserHeader userheader;
+	DltUserControlMsgInjection usercontext;
+	uint8_t *userbuffer;
+
+    PRINT_FUNCTION_VERBOSE(verbose);
+
+    if ((daemon==0) || (msg==0))
+    {
+        return;
+    }
+
+    datalength = msg->datasize;
+    ptr = msg->databuffer;
+
+    if (ptr==0)
+    {
+        return;
+    }
+
+    DLT_MSG_READ_VALUE(id_tmp,ptr,datalength,uint32_t); /* Get service id */
+    id=DLT_ENDIAN_GET_32(msg->standardheader->htyp, id_tmp);
+
+    if ((id>=DLT_DAEMON_INJECTION_MIN) && (id<=DLT_DAEMON_INJECTION_MAX))
+    {
+        /* This a a real SW-C injection call */
+        data_length_inject=0;
+        data_length_inject_tmp=0;
+
+        DLT_MSG_READ_VALUE(data_length_inject_tmp,ptr,datalength,uint32_t); /* Get data length */
+        data_length_inject=DLT_ENDIAN_GET_32(msg->standardheader->htyp, data_length_inject_tmp);
+
+        /* Get context handle for apid, ctid (and seid) */
+        /* Warning: seid is ignored in this implementation! */
+        if (DLT_IS_HTYP_UEH(msg->standardheader->htyp))
+        {
+            dlt_set_id(apid, msg->extendedheader->apid);
+            dlt_set_id(ctid, msg->extendedheader->ctid);
+        }
+        else
+        {
+            /* No extended header, and therefore no apid and ctid available */
+            dlt_daemon_control_service_response(sock, daemon, daemon_local, id, DLT_SERVICE_RESPONSE_ERROR,  verbose);
+            return;
+        }
+
+        /* At this point, apid and ctid is available */
+        context=dlt_daemon_context_find(daemon, apid, ctid, verbose);
+
+        if (context==0)
+        {
+            // dlt_log(LOG_INFO,"No context found!\n");
+            dlt_daemon_control_service_response(sock, daemon, daemon_local, id, DLT_SERVICE_RESPONSE_ERROR,  verbose);
+            return;
+        }
+
+        /* Send user message to handle, specified in context */
+		if (dlt_user_set_userheader(&userheader, DLT_USER_MESSAGE_INJECTION)==-1)
+		{
+			dlt_daemon_control_service_response(sock, daemon, daemon_local, id, DLT_SERVICE_RESPONSE_ERROR,  verbose);
+			return;
+		}
+
+		usercontext.log_level_pos = context->log_level_pos;
+
+		if(data_length_inject > msg->databuffersize)
+		{
+			dlt_daemon_control_service_response(sock, daemon, daemon_local, id, DLT_SERVICE_RESPONSE_ERROR,  verbose);
+			return;
+		}
+
+		userbuffer = malloc(data_length_inject);
+
+		if (userbuffer==0)
+		{
+			dlt_daemon_control_service_response(sock, daemon, daemon_local, id, DLT_SERVICE_RESPONSE_ERROR,  verbose);
+			return;
+		}
+
+		usercontext.data_length_inject = data_length_inject;
+		usercontext.service_id = id;
+
+		memcpy(userbuffer,ptr,data_length_inject);  /* Copy received injection to send buffer */
+
+		/* write to FIFO */
+		DltReturnValue ret =
+				dlt_user_log_out3(context->user_handle, &(userheader), sizeof(DltUserHeader),
+				  &(usercontext), sizeof(DltUserControlMsgInjection),
+				  userbuffer, data_length_inject);
+		if (ret != DLT_RETURN_OK)
+		{
+			if (ret == DLT_RETURN_PIPE_ERROR)
+			{
+				/* Close connection */
+				close(context->user_handle);
+				context->user_handle=DLT_FD_INIT;
+			}
+			dlt_daemon_control_service_response(sock, daemon, daemon_local, id, DLT_SERVICE_RESPONSE_ERROR,  verbose);
+		}
+		else
+		{
+			dlt_daemon_control_service_response(sock, daemon, daemon_local, id, DLT_SERVICE_RESPONSE_OK,  verbose);
+		}
+
+		free(userbuffer);
+		userbuffer=0;
+
+    }
+    else
+    {
+        /* Invalid ID */
+        dlt_daemon_control_service_response(sock, daemon, daemon_local, id, DLT_SERVICE_RESPONSE_NOT_SUPPORTED,  verbose);
+    }
+}
+
+void dlt_daemon_control_set_log_level(int sock, DltDaemon *daemon, DltDaemonLocal *daemon_local, DltMessage *msg, int verbose)
+{
+    PRINT_FUNCTION_VERBOSE(verbose);
+
+    char apid[DLT_ID_SIZE],ctid[DLT_ID_SIZE];
+    DltServiceSetLogLevel *req;
+    DltDaemonContext *context;
+    int32_t id=DLT_SERVICE_ID_SET_LOG_LEVEL;
+
+	int8_t old_log_level;
+
+    if ((daemon==0) || (msg==0))
+    {
+        return;
+    }
+
+    req = (DltServiceSetLogLevel*) (msg->databuffer);
+
+    dlt_set_id(apid, req->apid);
+    dlt_set_id(ctid, req->ctid);
+
+    context=dlt_daemon_context_find(daemon, apid, ctid, verbose);
+
+    /* Set log level */
+    if (context!=0)
+    {
+        old_log_level = context->log_level;
+        context->log_level = req->log_level; /* No endianess conversion necessary*/
+
+        if ((context->user_handle >= DLT_FD_MINIMUM) &&
+                (dlt_daemon_user_send_log_level(daemon, context, verbose)==0))
+        {
+            dlt_daemon_control_service_response(sock, daemon, daemon_local, id, DLT_SERVICE_RESPONSE_OK,  verbose);
+        }
+        else
+        {
+            //dlt_log(LOG_ERR, "Log level could not be sent!\n");
+            context->log_level = old_log_level;
+            dlt_daemon_control_service_response(sock, daemon, daemon_local, id, DLT_SERVICE_RESPONSE_ERROR,  verbose);
+        }
+    }
+    else
+    {
+        //dlt_log(LOG_ERR, "Context not found!\n");
+        dlt_daemon_control_service_response(sock, daemon, daemon_local, id, DLT_SERVICE_RESPONSE_ERROR,  verbose);
+    }
+}
+
+void dlt_daemon_control_set_trace_status(int sock, DltDaemon *daemon, DltDaemonLocal *daemon_local, DltMessage *msg, int verbose)
+{
+    PRINT_FUNCTION_VERBOSE(verbose);
+
+    char apid[DLT_ID_SIZE],ctid[DLT_ID_SIZE];
+    DltServiceSetLogLevel *req;             /* request uses same struct as set log level */
+    DltDaemonContext *context;
+    int32_t id=DLT_SERVICE_ID_SET_TRACE_STATUS;
+
+	int8_t old_trace_status;
+
+    if ((daemon==0) || (msg==0))
+    {
+        return;
+    }
+
+    req = (DltServiceSetLogLevel*) (msg->databuffer);
+
+    dlt_set_id(apid, req->apid);
+    dlt_set_id(ctid, req->ctid);
+
+    context=dlt_daemon_context_find(daemon, apid, ctid, verbose);
+
+    /* Set log level */
+    if (context!=0)
+    {
+        old_trace_status = context->trace_status;
+        context->trace_status = req->log_level;   /* No endianess conversion necessary */
+
+        if ((context->user_handle >= DLT_FD_MINIMUM ) &&
+                (dlt_daemon_user_send_log_level(daemon, context, verbose)==0))
+        {
+            dlt_daemon_control_service_response(sock, daemon, daemon_local, id, DLT_SERVICE_RESPONSE_OK,  verbose);
+        }
+        else
+        {
+            //dlt_log(LOG_ERR, "Trace Status could not be sent!\n");
+            context->trace_status = old_trace_status;
+            dlt_daemon_control_service_response(sock, daemon, daemon_local, id, DLT_SERVICE_RESPONSE_ERROR,  verbose);
+        }
+    }
+    else
+    {
+        //dlt_log(LOG_ERR, "Context not found!\n");
+        dlt_daemon_control_service_response(sock, daemon, daemon_local, id, DLT_SERVICE_RESPONSE_ERROR,  verbose);
+    }
+}
+
+void dlt_daemon_control_set_default_log_level(int sock, DltDaemon *daemon, DltDaemonLocal *daemon_local, DltMessage *msg, int verbose)
+{
+    PRINT_FUNCTION_VERBOSE(verbose);
+
+    DltServiceSetDefaultLogLevel *req;
+    int32_t id=DLT_SERVICE_ID_SET_DEFAULT_LOG_LEVEL;
+
+    if ((daemon==0) || (msg==0))
+    {
+        return;
+    }
+
+    req = (DltServiceSetDefaultLogLevel*) (msg->databuffer);
+
+    /* No endianess conversion necessary */
+    if (/*(req->log_level>=0) &&*/
+            (req->log_level<=DLT_LOG_VERBOSE))
+    {
+        daemon->default_log_level = req->log_level; /* No endianess conversion necessary */
+
+        /* Send Update to all contexts using the default log level */
+        dlt_daemon_user_send_default_update(daemon, verbose);
+
+        dlt_daemon_control_service_response(sock, daemon, daemon_local, id, DLT_SERVICE_RESPONSE_OK,  verbose);
+    }
+    else
+    {
+        dlt_daemon_control_service_response(sock, daemon, daemon_local, id, DLT_SERVICE_RESPONSE_ERROR,  verbose);
+    }
+}
+
+void dlt_daemon_control_set_default_trace_status(int sock, DltDaemon *daemon, DltDaemonLocal *daemon_local, DltMessage *msg, int verbose)
+{
+    PRINT_FUNCTION_VERBOSE(verbose);
+
+    /* Payload of request message */
+    DltServiceSetDefaultLogLevel *req;
+    int32_t id=DLT_SERVICE_ID_SET_DEFAULT_TRACE_STATUS;
+
+    if ((daemon==0) || (msg==0))
+    {
+        return;
+    }
+
+    req = (DltServiceSetDefaultLogLevel*) (msg->databuffer);
+
+    /* No endianess conversion necessary */
+    if ((req->log_level==DLT_TRACE_STATUS_OFF) ||
+            (req->log_level==DLT_TRACE_STATUS_ON))
+    {
+        daemon->default_trace_status = req->log_level; /* No endianess conversion necessary*/
+
+        /* Send Update to all contexts using the default trace status */
+        dlt_daemon_user_send_default_update(daemon, verbose);
+
+        dlt_daemon_control_service_response(sock, daemon, daemon_local, id, DLT_SERVICE_RESPONSE_OK,  verbose);
+    }
+    else
+    {
+        dlt_daemon_control_service_response(sock, daemon, daemon_local, id, DLT_SERVICE_RESPONSE_ERROR,  verbose);
+    }
+}
+
+void dlt_daemon_control_set_timing_packets(int sock, DltDaemon *daemon, DltDaemonLocal *daemon_local, DltMessage *msg, int verbose)
+{
+    PRINT_FUNCTION_VERBOSE(verbose);
+
+    DltServiceSetVerboseMode *req;  /* request uses same struct as set verbose mode */
+    int32_t id=DLT_SERVICE_ID_SET_TIMING_PACKETS;
+
+    if ((daemon==0) || (msg==0))
+    {
+        return;
+    }
+
+    req = (DltServiceSetVerboseMode*) (msg->databuffer);
+    if ((req->new_status==0) || (req->new_status==1))
+    {
+        daemon->timingpackets = req->new_status;
+
+        dlt_daemon_control_service_response(sock, daemon, daemon_local, id, DLT_SERVICE_RESPONSE_OK,  verbose);
+    }
+    else
+    {
+        dlt_daemon_control_service_response(sock, daemon, daemon_local, id, DLT_SERVICE_RESPONSE_ERROR,  verbose);
+    }
+}
+
+void dlt_daemon_control_message_time(int sock, DltDaemon *daemon, DltDaemonLocal *daemon_local, int verbose)
+{
+    DltMessage msg;
+    int32_t len;
+
+    PRINT_FUNCTION_VERBOSE(verbose);
+
+    if (daemon==0)
+    {
+        return;
+    }
+
+    /* initialise new message */
+    if (dlt_message_init(&msg,0)==-1)
+    {
+        return;
+    }
+
+    /* send message */
+
+    /* prepare storage header */
+    msg.storageheader = (DltStorageHeader*)msg.headerbuffer;
+    dlt_set_storageheader(msg.storageheader,daemon->ecuid);
+
+    /* prepare standard header */
+    msg.standardheader = (DltStandardHeader*)(msg.headerbuffer + sizeof(DltStorageHeader));
+    msg.standardheader->htyp = DLT_HTYP_WEID | DLT_HTYP_WTMS | DLT_HTYP_UEH | DLT_HTYP_PROTOCOL_VERSION1 ;
+
+#if (BYTE_ORDER==BIG_ENDIAN)
+    msg.standardheader->htyp = ( msg.standardheader->htyp | DLT_HTYP_MSBF);
+#endif
+
+    msg.standardheader->mcnt = 0;
+
+    /* Set header extra parameters */
+    dlt_set_id(msg.headerextra.ecu,daemon->ecuid);
+    msg.headerextra.tmsp = dlt_uptime();
+
+    dlt_message_set_extraparameters(&msg, verbose);
+
+    /* prepare extended header */
+    msg.extendedheader = (DltExtendedHeader*)(msg.headerbuffer + sizeof(DltStorageHeader) + sizeof(DltStandardHeader) + DLT_STANDARD_HEADER_EXTRA_SIZE(msg.standardheader->htyp));
+    msg.extendedheader->msin = DLT_MSIN_CONTROL_TIME;
+
+    msg.extendedheader->noar = 0;                  /* number of arguments */
+    dlt_set_id(msg.extendedheader->apid,"");       /* application id */
+    dlt_set_id(msg.extendedheader->ctid,"");       /* context id */
+
+    /* prepare length information */
+    msg.headersize = sizeof(DltStorageHeader) + sizeof(DltStandardHeader) + sizeof(DltExtendedHeader) + DLT_STANDARD_HEADER_EXTRA_SIZE(msg.standardheader->htyp);
+
+    len=msg.headersize - sizeof(DltStorageHeader) + msg.datasize;
+    if (len>UINT16_MAX)
+    {
+        dlt_log(LOG_CRIT,"Huge control message discarded!\n");
+
+        /* free message */
+        dlt_message_free(&msg,0);
+
+        return;
+    }
+
+    msg.standardheader->len = DLT_HTOBE_16(((uint16_t)len));
+
+    /* Send message */
+    dlt_daemon_client_send(sock,daemon,daemon_local,msg.headerbuffer+sizeof(DltStorageHeader),msg.headersize-sizeof(DltStorageHeader),
+			   msg.databuffer,msg.datasize,0 /* no ringbuffer only */,verbose);
+
+    /* free message */
+    dlt_message_free(&msg,0);
 }
 
 /**
diff --git a/src/daemon/dlt-daemon.h b/src/daemon/dlt-daemon.h
index b7ffb55..6d4df31 100755
--- a/src/daemon/dlt-daemon.h
+++ b/src/daemon/dlt-daemon.h
@@ -197,6 +197,148 @@ void dlt_daemon_send_timingpacket(DltDaemon *daemon, DltDaemonLocal *daemon_loca
 void dlt_daemon_send_ecuversion(DltDaemon *daemon, DltDaemonLocal *daemon_local);

 

 int dlt_daemon_close_socket(int sock, DltDaemon *daemon, DltDaemonLocal *daemon_local, int verbose);

+int dlt_daemon_client_send(int sock,DltDaemon *daemon,DltDaemonLocal *daemon_local,void* data1,int size1,void* data2,int size2,char ringbuffer,int verbose);

+

+/**

+ * Send out response message to dlt client

+ * @param sock connection handle used for sending response

+ * @param daemon pointer to dlt daemon structure

+ * @param msg pointer to response message

+ * @param appid pointer to application id to be used in response message

+ * @param contid pointer to context id to be used in response message

+ * @param verbose if set to true verbose information is printed out.

+ * @return -1 if there is an error or buffer is full

+ */

+int dlt_daemon_control_send_control_message(int sock, DltDaemon *daemon, DltDaemonLocal *daemon_local, DltMessage *msg, char* appid, char* contid, int verbose);

+/**

+ * Process and generate response to received get log info control message

+ * @param sock connection handle used for sending response

+ * @param daemon pointer to dlt daemon structure

+ * @param msg pointer to received control message

+ * @param verbose if set to true verbose information is printed out.

+ */

+void dlt_daemon_control_get_log_info(int sock, DltDaemon *daemon,DltDaemonLocal *daemon_local, DltMessage *msg, int verbose);

+/**

+ * Process and generate response to received get software version control message

+ * @param sock connection handle used for sending response

+ * @param daemon pointer to dlt daemon structure

+ * @param verbose if set to true verbose information is printed out.

+ */

+void dlt_daemon_control_get_software_version(int sock, DltDaemon *daemon, DltDaemonLocal *daemon_local, int verbose);

+/**

+ * Process and generate response to received get default log level control message

+ * @param sock connection handle used for sending response

+ * @param daemon pointer to dlt daemon structure

+ * @param verbose if set to true verbose information is printed out.

+ */

+void dlt_daemon_control_get_default_log_level(int sock, DltDaemon *daemon, DltDaemonLocal *daemon_local, int verbose);

+/**

+ * Process and generate response to message buffer overflow control message

+ * @param sock connection handle used for sending response

+ * @param daemon pointer to dlt daemon structure

+ * @param verbose if set to true verbose information is printed out.

+ * @return -1 if there is an error or buffer overflow, else 0

+ */

+int dlt_daemon_control_message_buffer_overflow(int sock, DltDaemon *daemon, DltDaemonLocal *daemon_local, unsigned int overflow_counter,char* apid, int verbose);

+/**

+ * Generate response to control message from dlt client

+ * @param sock connection handle used for sending response

+ * @param daemon pointer to dlt daemon structure

+ * @param service_id service id of control message

+ * @param status status of response (e.g. ok, not supported, error)

+ * @param verbose if set to true verbose information is printed out.

+ */

+void dlt_daemon_control_service_response(int sock, DltDaemon *daemon, DltDaemonLocal *daemon_local, uint32_t service_id, int8_t status, int verbose);

+/**

+ * Send control message unregister context (add on to AUTOSAR standard)

+ * @param sock connection handle used for sending response

+ * @param daemon pointer to dlt daemon structure

+ * @param apid application id to be unregisteres

+ * @param ctid context id to be unregistered

+ * @param comid Communication id where apid is unregistered

+ * @param verbose if set to true verbose information is printed out.

+ */

+int dlt_daemon_control_message_unregister_context(int sock, DltDaemon *daemon, DltDaemonLocal *daemon_local, char* apid, char* ctid, char* comid, int verbose);

+/**

+ * Send control message connection info (add on to AUTOSAR standard)

+ * @param sock connection handle used for sending response

+ * @param daemon pointer to dlt daemon structure

+ * @param state state of connection

+ * @param comid Communication id where connection state changed

+ * @param verbose if set to true verbose information is printed out.

+ */

+int dlt_daemon_control_message_connection_info(int sock, DltDaemon *daemon, DltDaemonLocal *daemon_local, uint8_t state, char* comid, int verbose);

+/**

+ * Send control message connection info (add on to AUTOSAR standard)

+ * @param sock connection handle used for sending response

+ * @param daemon pointer to dlt daemon structure

+ * @param timezone timezone on target

+ * @param verbose if set to true verbose information is printed out.

+ */

+int dlt_daemon_control_message_timezone(int sock, DltDaemon *daemon, DltDaemonLocal *daemon_local, int32_t timezone, uint8_t isdst, int verbose);

+/**

+ * Process received control message from dlt client

+ * @param sock connection handle used for sending response

+ * @param daemon pointer to dlt daemon structure

+ * @param msg pointer to received control message

+ * @param verbose if set to true verbose information is printed out.

+ */

+int dlt_daemon_control_process_control(int sock, DltDaemon *daemon, DltDaemonLocal *daemon_local, DltMessage *msg, int verbose);

+/**

+ * Process and generate response to received sw injection control message

+ * @param sock connection handle used for sending response

+ * @param daemon pointer to dlt daemon structure

+ * @param msg pointer to received sw injection control message

+ * @param verbose if set to true verbose information is printed out.

+ */

+void dlt_daemon_control_callsw_cinjection(int sock, DltDaemon *daemon, DltDaemonLocal *daemon_local, DltMessage *msg, int verbose);

+/**

+ * Process and generate response to received set log level control message

+ * @param sock connection handle used for sending response

+ * @param daemon pointer to dlt daemon structure

+ * @param msg pointer to received control message

+ * @param verbose if set to true verbose information is printed out.

+ */

+void dlt_daemon_control_set_log_level(int sock, DltDaemon *daemon, DltDaemonLocal *daemon_local, DltMessage *msg, int verbose);

+/**

+ * Process and generate response to received set trace status control message

+ * @param sock connection handle used for sending response

+ * @param daemon pointer to dlt daemon structure

+ * @param msg pointer to received control message

+ * @param verbose if set to true verbose information is printed out.

+ */

+void dlt_daemon_control_set_trace_status(int sock, DltDaemon *daemon, DltDaemonLocal *daemon_local, DltMessage *msg, int verbose);

+/**

+ * Process and generate response to received set default log level control message

+ * @param sock connection handle used for sending response

+ * @param daemon pointer to dlt daemon structure

+ * @param msg pointer to received control message

+ * @param verbose if set to true verbose information is printed out.

+ */

+void dlt_daemon_control_set_default_log_level(int sock, DltDaemon *daemon, DltDaemonLocal *daemon_local, DltMessage *msg, int verbose);

+/**

+ * Process and generate response to received set default trace status control message

+ * @param sock connection handle used for sending response

+ * @param daemon pointer to dlt daemon structure

+ * @param msg pointer to received control message

+ * @param verbose if set to true verbose information is printed out.

+ */

+void dlt_daemon_control_set_default_trace_status(int sock, DltDaemon *daemon, DltDaemonLocal *daemon_local, DltMessage *msg, int verbose);

+/**

+ * Process and generate response to set timing packets control message

+ * @param sock connection handle used for sending response

+ * @param daemon pointer to dlt daemon structure

+ * @param msg pointer to received control message

+ * @param verbose if set to true verbose information is printed out.

+ */

+void dlt_daemon_control_set_timing_packets(int sock, DltDaemon *daemon, DltDaemonLocal *daemon_local, DltMessage *msg, int verbose);

+/**

+ * Send time control message

+ * @param sock connection handle used for sending response

+ * @param daemon pointer to dlt daemon structure

+ * @param verbose if set to true verbose information is printed out.

+ */

+void dlt_daemon_control_message_time(int sock, DltDaemon *daemon, DltDaemonLocal *daemon_local, int verbose);

 

 #endif /* DLT_DAEMON_H */

 

diff --git a/src/daemon/dlt_daemon_common.c b/src/daemon/dlt_daemon_common.c
index df9ccbe..fa6959c 100644
--- a/src/daemon/dlt_daemon_common.c
+++ b/src/daemon/dlt_daemon_common.c
@@ -79,6 +79,10 @@
 #include "dlt_daemon_common_cfg.h"
 #include "dlt_user_shared.h"
 #include "dlt_user_shared_cfg.h"
+#include "dlt-daemon.h"
+
+#include "dlt_daemon_socket.h"
+#include "dlt_daemon_serial.h"
 
 static char str[DLT_DAEMON_COMMON_TEXTBUFSIZE];
 
@@ -142,6 +146,10 @@ int dlt_daemon_init(DltDaemon *daemon,const char *runtime_directory, int verbose
     
     daemon->mode = DLT_USER_MODE_EXTERNAL;
 
+    daemon->connectionState = 0; /* no logger connected */
+
+    daemon->state = DLT_DAEMON_STATE_INIT; /* initial logging state */
+
     /* prepare filenames for configuration */
 
     append_length = PATH_MAX - sizeof(DLT_RUNTIME_APPLICATION_CFG);
@@ -1138,7 +1146,7 @@ int dlt_daemon_user_send_log_state(DltDaemon *daemon,DltDaemonApplication *app,i
     	return -1;
     }
 
-    logstate.log_state = daemon->state;
+    logstate.log_state = daemon->connectionState;
 
     /* log to FIFO */
     ret = dlt_user_log_out2(app->user_handle, &(userheader), sizeof(DltUserHeader),  &(logstate), sizeof(DltUserControlMsgLogState));
@@ -1156,1209 +1164,6 @@ int dlt_daemon_user_send_log_state(DltDaemon *daemon,DltDaemonApplication *app,i
     return ((ret==DLT_RETURN_OK)?0:-1);
 }
 
-int dlt_daemon_control_process_control(int sock, DltDaemon *daemon, DltMessage *msg, int verbose)
-{
-    uint32_t id,id_tmp=0;
-
-    PRINT_FUNCTION_VERBOSE(verbose);
-
-    if ((daemon==0) || (msg==0))
-    {
-        return -1;
-    }
-
-    if (msg->datasize < (int32_t)sizeof(uint32_t))
-    {
-        return -1;
-    }
-
-    id_tmp = *((uint32_t*)(msg->databuffer));
-    id=DLT_ENDIAN_GET_32(msg->standardheader->htyp ,id_tmp);
-
-    if ((id > 0) && (id <= DLT_SERVICE_ID_MESSAGE_BUFFER_OVERFLOW))
-    {
-        /* Control message handling */
-        switch (id)
-        {
-        case DLT_SERVICE_ID_SET_LOG_LEVEL:
-        {
-            dlt_daemon_control_set_log_level(sock, daemon, msg,  verbose);
-            break;
-        }
-        case DLT_SERVICE_ID_SET_TRACE_STATUS:
-        {
-            dlt_daemon_control_set_trace_status(sock, daemon, msg,  verbose);
-            break;
-        }
-        case DLT_SERVICE_ID_GET_LOG_INFO:
-        {
-            dlt_daemon_control_get_log_info(sock, daemon, msg, verbose);
-            break;
-        }
-        case DLT_SERVICE_ID_GET_DEFAULT_LOG_LEVEL:
-        {
-            dlt_daemon_control_get_default_log_level(sock, daemon,  verbose);
-            break;
-        }
-        case DLT_SERVICE_ID_STORE_CONFIG:
-        {
-            if (dlt_daemon_applications_save(daemon, daemon->runtime_application_cfg, verbose)==0)
-            {
-				if (dlt_daemon_contexts_save(daemon, daemon->runtime_context_cfg, verbose)==0)
-				{
-					dlt_daemon_control_service_response(sock, daemon, id, DLT_SERVICE_RESPONSE_OK,  verbose);
-				}
-				else
-				{
-					/* Delete saved files */
-					dlt_daemon_control_reset_to_factory_default(daemon, daemon->runtime_application_cfg, daemon->runtime_context_cfg, verbose);
-					dlt_daemon_control_service_response(sock, daemon, id, DLT_SERVICE_RESPONSE_ERROR,  verbose);
-				}
-            }
-            else
-            {
-            	dlt_daemon_control_service_response(sock, daemon, id, DLT_SERVICE_RESPONSE_ERROR,  verbose);
-            }
-            break;
-        }
-        case DLT_SERVICE_ID_RESET_TO_FACTORY_DEFAULT:
-        {
-            dlt_daemon_control_reset_to_factory_default(daemon, daemon->runtime_application_cfg, daemon->runtime_context_cfg, verbose);
-            dlt_daemon_control_service_response(sock, daemon, id, DLT_SERVICE_RESPONSE_OK,  verbose);
-            break;
-        }
-        case DLT_SERVICE_ID_SET_COM_INTERFACE_STATUS:
-        {
-            dlt_daemon_control_service_response(sock, daemon, id, DLT_SERVICE_RESPONSE_NOT_SUPPORTED,  verbose);
-            break;
-        }
-        case DLT_SERVICE_ID_SET_COM_INTERFACE_MAX_BANDWIDTH:
-        {
-            dlt_daemon_control_service_response(sock, daemon, id, DLT_SERVICE_RESPONSE_NOT_SUPPORTED,  verbose);
-            break;
-        }
-        case DLT_SERVICE_ID_SET_VERBOSE_MODE:
-        {
-            dlt_daemon_control_service_response(sock, daemon, id, DLT_SERVICE_RESPONSE_NOT_SUPPORTED,  verbose);
-            break;
-        }
-        case DLT_SERVICE_ID_SET_MESSAGE_FILTERING:
-        {
-            dlt_daemon_control_service_response(sock, daemon, id, DLT_SERVICE_RESPONSE_NOT_SUPPORTED,  verbose);
-            break;
-        }
-        case DLT_SERVICE_ID_SET_TIMING_PACKETS:
-        {
-            dlt_daemon_control_set_timing_packets(sock, daemon, msg,  verbose);
-            break;
-        }
-        case DLT_SERVICE_ID_GET_LOCAL_TIME:
-        {
-            /* Send response with valid timestamp (TMSP) field */
-            dlt_daemon_control_service_response(sock, daemon, id, DLT_SERVICE_RESPONSE_OK,  verbose);
-            break;
-        }
-        case DLT_SERVICE_ID_USE_ECU_ID:
-        {
-            dlt_daemon_control_service_response(sock, daemon, id, DLT_SERVICE_RESPONSE_NOT_SUPPORTED,  verbose);
-            break;
-        }
-        case DLT_SERVICE_ID_USE_SESSION_ID:
-        {
-            dlt_daemon_control_service_response(sock, daemon, id, DLT_SERVICE_RESPONSE_NOT_SUPPORTED,  verbose);
-            break;
-        }
-        case DLT_SERVICE_ID_USE_TIMESTAMP:
-        {
-            dlt_daemon_control_service_response(sock, daemon, id, DLT_SERVICE_RESPONSE_NOT_SUPPORTED,  verbose);
-            break;
-        }
-        case DLT_SERVICE_ID_USE_EXTENDED_HEADER:
-        {
-            dlt_daemon_control_service_response(sock, daemon, id, DLT_SERVICE_RESPONSE_NOT_SUPPORTED,  verbose);
-            break;
-        }
-        case DLT_SERVICE_ID_SET_DEFAULT_LOG_LEVEL:
-        {
-            dlt_daemon_control_set_default_log_level(sock, daemon, msg,  verbose);
-            break;
-        }
-        case DLT_SERVICE_ID_SET_DEFAULT_TRACE_STATUS:
-        {
-            dlt_daemon_control_set_default_trace_status(sock, daemon, msg,  verbose);
-            break;
-        }
-        case DLT_SERVICE_ID_GET_SOFTWARE_VERSION:
-        {
-            dlt_daemon_control_get_software_version(sock, daemon,  verbose);
-            break;
-        }
-        case DLT_SERVICE_ID_MESSAGE_BUFFER_OVERFLOW:
-        {
-            dlt_daemon_control_message_buffer_overflow(sock, daemon, daemon->overflow_counter,"",verbose);
-            break;
-        }
-        default:
-        {
-            dlt_daemon_control_service_response(sock, daemon, id, DLT_SERVICE_RESPONSE_NOT_SUPPORTED,  verbose);
-            break;
-        }
-        }
-    }
-    else
-    {
-        /* Injection handling */
-        dlt_daemon_control_callsw_cinjection(sock, daemon, msg,  verbose);
-    }
-
-    return 0;
-}
-
-void dlt_daemon_control_callsw_cinjection(int sock, DltDaemon *daemon, DltMessage *msg, int verbose)
-{
-    char apid[DLT_ID_SIZE],ctid[DLT_ID_SIZE];
-    uint32_t id=0,id_tmp=0;
-    uint8_t *ptr;
-    DltDaemonContext *context;
-	int32_t data_length_inject=0;
-	uint32_t data_length_inject_tmp=0;
-
-	int32_t datalength;
-
-	DltUserHeader userheader;
-	DltUserControlMsgInjection usercontext;
-	uint8_t *userbuffer;
-
-    PRINT_FUNCTION_VERBOSE(verbose);
-
-    if ((daemon==0) || (msg==0))
-    {
-        return;
-    }
-
-    datalength = msg->datasize;
-    ptr = msg->databuffer;
-
-    if (ptr==0)
-    {
-        return;
-    }
-
-    DLT_MSG_READ_VALUE(id_tmp,ptr,datalength,uint32_t); /* Get service id */
-    id=DLT_ENDIAN_GET_32(msg->standardheader->htyp, id_tmp);
-
-    if ((id>=DLT_DAEMON_INJECTION_MIN) && (id<=DLT_DAEMON_INJECTION_MAX))
-    {
-        /* This a a real SW-C injection call */
-        data_length_inject=0;
-        data_length_inject_tmp=0;
-
-        DLT_MSG_READ_VALUE(data_length_inject_tmp,ptr,datalength,uint32_t); /* Get data length */
-        data_length_inject=DLT_ENDIAN_GET_32(msg->standardheader->htyp, data_length_inject_tmp);
-
-        /* Get context handle for apid, ctid (and seid) */
-        /* Warning: seid is ignored in this implementation! */
-        if (DLT_IS_HTYP_UEH(msg->standardheader->htyp))
-        {
-            dlt_set_id(apid, msg->extendedheader->apid);
-            dlt_set_id(ctid, msg->extendedheader->ctid);
-        }
-        else
-        {
-            /* No extended header, and therefore no apid and ctid available */
-            dlt_daemon_control_service_response(sock, daemon, id, DLT_SERVICE_RESPONSE_ERROR,  verbose);
-            return;
-        }
-
-        /* At this point, apid and ctid is available */
-        context=dlt_daemon_context_find(daemon, apid, ctid, verbose);
-
-        if (context==0)
-        {
-            // dlt_log(LOG_INFO,"No context found!\n");
-            dlt_daemon_control_service_response(sock, daemon, id, DLT_SERVICE_RESPONSE_ERROR,  verbose);
-            return;
-        }
-
-        /* Send user message to handle, specified in context */
-		if (dlt_user_set_userheader(&userheader, DLT_USER_MESSAGE_INJECTION)==-1)
-		{
-			dlt_daemon_control_service_response(sock, daemon, id, DLT_SERVICE_RESPONSE_ERROR,  verbose);
-			return;
-		}
-
-		usercontext.log_level_pos = context->log_level_pos;
-
-		if(data_length_inject > msg->databuffersize)
-		{
-			dlt_daemon_control_service_response(sock, daemon, id, DLT_SERVICE_RESPONSE_ERROR,  verbose);
-			return;
-		}
-
-		userbuffer = malloc(data_length_inject);
-
-		if (userbuffer==0)
-		{
-			dlt_daemon_control_service_response(sock, daemon, id, DLT_SERVICE_RESPONSE_ERROR,  verbose);
-			return;
-		}
-
-		usercontext.data_length_inject = data_length_inject;
-		usercontext.service_id = id;
-
-		memcpy(userbuffer,ptr,data_length_inject);  /* Copy received injection to send buffer */
-
-		/* write to FIFO */
-		DltReturnValue ret =
-				dlt_user_log_out3(context->user_handle, &(userheader), sizeof(DltUserHeader),
-				  &(usercontext), sizeof(DltUserControlMsgInjection),
-				  userbuffer, data_length_inject);
-		if (ret != DLT_RETURN_OK)
-		{
-			if (ret == DLT_RETURN_PIPE_ERROR)
-			{
-				/* Close connection */
-				close(context->user_handle);
-				context->user_handle=DLT_FD_INIT;
-			}
-			dlt_daemon_control_service_response(sock, daemon, id, DLT_SERVICE_RESPONSE_ERROR,  verbose);
-		}
-		else
-		{
-			dlt_daemon_control_service_response(sock, daemon, id, DLT_SERVICE_RESPONSE_OK,  verbose);
-		}
-
-		free(userbuffer);
-		userbuffer=0;
-
-    }
-    else
-    {
-        /* Invalid ID */
-        dlt_daemon_control_service_response(sock, daemon, id, DLT_SERVICE_RESPONSE_NOT_SUPPORTED,  verbose);
-    }
-}
-
-void dlt_daemon_control_set_log_level(int sock, DltDaemon *daemon, DltMessage *msg, int verbose)
-{
-    PRINT_FUNCTION_VERBOSE(verbose);
-
-    char apid[DLT_ID_SIZE],ctid[DLT_ID_SIZE];
-    DltServiceSetLogLevel *req;
-    DltDaemonContext *context;
-    int32_t id=DLT_SERVICE_ID_SET_LOG_LEVEL;
-
-	int8_t old_log_level;
-
-    if ((daemon==0) || (msg==0))
-    {
-        return;
-    }
-
-    req = (DltServiceSetLogLevel*) (msg->databuffer);
-
-    dlt_set_id(apid, req->apid);
-    dlt_set_id(ctid, req->ctid);
-
-    context=dlt_daemon_context_find(daemon, apid, ctid, verbose);
-
-    /* Set log level */
-    if (context!=0)
-    {
-        old_log_level = context->log_level;
-        context->log_level = req->log_level; /* No endianess conversion necessary*/
-
-        if ((context->user_handle >= DLT_FD_MINIMUM) &&
-                (dlt_daemon_user_send_log_level(daemon, context, verbose)==0))
-        {
-            dlt_daemon_control_service_response(sock, daemon, id, DLT_SERVICE_RESPONSE_OK,  verbose);
-        }
-        else
-        {
-            //dlt_log(LOG_ERR, "Log level could not be sent!\n");
-            context->log_level = old_log_level;
-            dlt_daemon_control_service_response(sock, daemon, id, DLT_SERVICE_RESPONSE_ERROR,  verbose);
-        }
-    }
-    else
-    {
-        //dlt_log(LOG_ERR, "Context not found!\n");
-        dlt_daemon_control_service_response(sock, daemon, id, DLT_SERVICE_RESPONSE_ERROR,  verbose);
-    }
-}
-
-void dlt_daemon_control_set_trace_status(int sock, DltDaemon *daemon, DltMessage *msg, int verbose)
-{
-    PRINT_FUNCTION_VERBOSE(verbose);
-
-    char apid[DLT_ID_SIZE],ctid[DLT_ID_SIZE];
-    DltServiceSetLogLevel *req;             /* request uses same struct as set log level */
-    DltDaemonContext *context;
-    int32_t id=DLT_SERVICE_ID_SET_TRACE_STATUS;
-
-	int8_t old_trace_status;
-
-    if ((daemon==0) || (msg==0))
-    {
-        return;
-    }
-
-    req = (DltServiceSetLogLevel*) (msg->databuffer);
-
-    dlt_set_id(apid, req->apid);
-    dlt_set_id(ctid, req->ctid);
-
-    context=dlt_daemon_context_find(daemon, apid, ctid, verbose);
-
-    /* Set log level */
-    if (context!=0)
-    {
-        old_trace_status = context->trace_status;
-        context->trace_status = req->log_level;   /* No endianess conversion necessary */
-
-        if ((context->user_handle >= DLT_FD_MINIMUM ) &&
-                (dlt_daemon_user_send_log_level(daemon, context, verbose)==0))
-        {
-            dlt_daemon_control_service_response(sock, daemon, id, DLT_SERVICE_RESPONSE_OK,  verbose);
-        }
-        else
-        {
-            //dlt_log(LOG_ERR, "Trace Status could not be sent!\n");
-            context->trace_status = old_trace_status;
-            dlt_daemon_control_service_response(sock, daemon, id, DLT_SERVICE_RESPONSE_ERROR,  verbose);
-        }
-    }
-    else
-    {
-        //dlt_log(LOG_ERR, "Context not found!\n");
-        dlt_daemon_control_service_response(sock, daemon, id, DLT_SERVICE_RESPONSE_ERROR,  verbose);
-    }
-}
-
-void dlt_daemon_control_set_default_log_level(int sock, DltDaemon *daemon, DltMessage *msg, int verbose)
-{
-    PRINT_FUNCTION_VERBOSE(verbose);
-
-    DltServiceSetDefaultLogLevel *req;
-    int32_t id=DLT_SERVICE_ID_SET_DEFAULT_LOG_LEVEL;
-
-    if ((daemon==0) || (msg==0))
-    {
-        return;
-    }
-
-    req = (DltServiceSetDefaultLogLevel*) (msg->databuffer);
-
-    /* No endianess conversion necessary */
-    if (/*(req->log_level>=0) &&*/
-            (req->log_level<=DLT_LOG_VERBOSE))
-    {
-        daemon->default_log_level = req->log_level; /* No endianess conversion necessary */
-
-        /* Send Update to all contexts using the default log level */
-        dlt_daemon_user_send_default_update(daemon, verbose);
-
-        dlt_daemon_control_service_response(sock, daemon, id, DLT_SERVICE_RESPONSE_OK,  verbose);
-    }
-    else
-    {
-        dlt_daemon_control_service_response(sock, daemon, id, DLT_SERVICE_RESPONSE_ERROR,  verbose);
-    }
-}
-
-void dlt_daemon_control_set_default_trace_status(int sock, DltDaemon *daemon, DltMessage *msg, int verbose)
-{
-    PRINT_FUNCTION_VERBOSE(verbose);
-
-    /* Payload of request message */
-    DltServiceSetDefaultLogLevel *req;
-    int32_t id=DLT_SERVICE_ID_SET_DEFAULT_TRACE_STATUS;
-
-    if ((daemon==0) || (msg==0))
-    {
-        return;
-    }
-
-    req = (DltServiceSetDefaultLogLevel*) (msg->databuffer);
-
-    /* No endianess conversion necessary */
-    if ((req->log_level==DLT_TRACE_STATUS_OFF) ||
-            (req->log_level==DLT_TRACE_STATUS_ON))
-    {
-        daemon->default_trace_status = req->log_level; /* No endianess conversion necessary*/
-
-        /* Send Update to all contexts using the default trace status */
-        dlt_daemon_user_send_default_update(daemon, verbose);
-
-        dlt_daemon_control_service_response(sock, daemon, id, DLT_SERVICE_RESPONSE_OK,  verbose);
-    }
-    else
-    {
-        dlt_daemon_control_service_response(sock, daemon, id, DLT_SERVICE_RESPONSE_ERROR,  verbose);
-    }
-}
-
-void dlt_daemon_control_set_timing_packets(int sock, DltDaemon *daemon, DltMessage *msg, int verbose)
-{
-    PRINT_FUNCTION_VERBOSE(verbose);
-
-    DltServiceSetVerboseMode *req;  /* request uses same struct as set verbose mode */
-    int32_t id=DLT_SERVICE_ID_SET_TIMING_PACKETS;
-
-    if ((daemon==0) || (msg==0))
-    {
-        return;
-    }
-
-    req = (DltServiceSetVerboseMode*) (msg->databuffer);
-    if ((req->new_status==0) || (req->new_status==1))
-    {
-        daemon->timingpackets = req->new_status;
-
-        dlt_daemon_control_service_response(sock, daemon, id, DLT_SERVICE_RESPONSE_OK,  verbose);
-    }
-    else
-    {
-        dlt_daemon_control_service_response(sock, daemon, id, DLT_SERVICE_RESPONSE_ERROR,  verbose);
-    }
-}
-
-void dlt_daemon_control_get_software_version(int sock, DltDaemon *daemon, int verbose)
-{
-    DltMessage msg;
-    uint32_t len;
-	DltServiceGetSoftwareVersionResponse *resp;
-
-    PRINT_FUNCTION_VERBOSE(verbose);
-
-    if (daemon==0)
-    {
-        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(daemon->ECUVersionString);
-
-    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),daemon->ECUVersionString,len);
-
-    /* send message */
-    dlt_daemon_control_send_control_message(sock, daemon, &msg,"","",  verbose);
-
-    /* free message */
-    dlt_message_free(&msg,0);
-}
-
-void dlt_daemon_control_get_default_log_level(int sock, DltDaemon *daemon, int verbose)
-{
-    DltMessage msg;
-	DltServiceGetDefaultLogLevelResponse *resp;
-
-    PRINT_FUNCTION_VERBOSE(verbose);
-
-    if (daemon==0)
-    {
-        return;
-    }
-
-    /* initialise new message */
-    if (dlt_message_init(&msg,0)==-1)
-    {
-    	dlt_daemon_control_service_response(sock, daemon, DLT_SERVICE_ID_GET_DEFAULT_LOG_LEVEL, DLT_SERVICE_RESPONSE_ERROR,  verbose);
-        return;
-    }
-
-    msg.datasize = sizeof(DltServiceGetDefaultLogLevelResponse);
-    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_DEFAULT_LOG_LEVEL, DLT_SERVICE_RESPONSE_ERROR,  verbose);
-        return;
-    }
-
-    resp = (DltServiceGetDefaultLogLevelResponse*) msg.databuffer;
-    resp->service_id = DLT_SERVICE_ID_GET_DEFAULT_LOG_LEVEL;
-    resp->status = DLT_SERVICE_RESPONSE_OK;
-    resp->log_level = daemon->default_log_level;
-
-    /* send message */
-    dlt_daemon_control_send_control_message(sock,daemon,&msg,"","",  verbose);
-
-    /* free message */
-    dlt_message_free(&msg,0);
-}
-
-void dlt_daemon_control_get_log_info(int sock, DltDaemon *daemon, DltMessage *msg, int verbose)
-{
-    DltServiceGetLogInfoRequest *req;
-    DltMessage resp;
-    DltDaemonContext *context=0;
-    DltDaemonApplication *application=0;
-
-    int num_applications=0, num_contexts=0;
-    uint16_t count_app_ids=0, count_con_ids=0;
-
-#if (DLT_DEBUG_GETLOGINFO==1)
-    char buf[255];
-#endif
-
-    int32_t i,j,offset=0;
-    char *apid=0;
-    int8_t ll,ts;
-    uint16_t len;
-    int8_t value;
-    int32_t sizecont=0;
-    int offset_base;
-
-    uint32_t sid;
-
-    PRINT_FUNCTION_VERBOSE(verbose);
-
-    if ((daemon==0) || (msg==0))
-    {
-        return;
-    }
-
-    /* prepare pointer to message request */
-    req = (DltServiceGetLogInfoRequest*) (msg->databuffer);
-
-    /* initialise new message */
-    if (dlt_message_init(&resp,0)==-1)
-    {
-		dlt_daemon_control_service_response(sock, daemon, DLT_SERVICE_ID_GET_LOG_INFO, DLT_SERVICE_RESPONSE_ERROR,  verbose);
-        return;
-    }
-
-    /* check request */
-    if ((req->options < 3 ) || (req->options>7))
-    {
-        dlt_daemon_control_service_response(sock, daemon, DLT_SERVICE_ID_GET_LOG_INFO, DLT_SERVICE_RESPONSE_ERROR,  verbose);
-        return;
-    }
-
-    if (req->apid[0]!='\0')
-    {
-        application = dlt_daemon_application_find(daemon, req->apid, verbose);
-        if (application)
-        {
-            num_applications = 1;
-            if (req->ctid[0]!='\0')
-            {
-                context = dlt_daemon_context_find(daemon, req->apid, req->ctid, verbose);
-
-                num_contexts = ((context)?1:0);
-            }
-            else
-            {
-                num_contexts = application->num_contexts;
-            }
-        }
-        else
-        {
-            num_applications = 0;
-            num_contexts = 0;
-        }
-    }
-    else
-    {
-        /* Request all applications and contexts */
-        num_applications = daemon->num_applications;
-        num_contexts = daemon->num_contexts;
-    }
-
-    /* prepare payload of data */
-
-    /* Calculate maximum size for a response */
-    resp.datasize = sizeof(uint32_t) /* SID */ + sizeof(int8_t) /* status*/ + sizeof(ID4) /* DLT_DAEMON_REMO_STRING */;
-
-    sizecont = sizeof(uint32_t) /* context_id */;
-
-    /* Add additional size for response of Mode 4, 6, 7 */
-    if ((req->options==4) || (req->options==6) || (req->options==7))
-    {
-        sizecont += sizeof(int8_t); /* log level */
-    }
-
-    /* Add additional size for response of Mode 5, 6, 7 */
-    if ((req->options==5) || (req->options==6) || (req->options==7))
-    {
-        sizecont+= sizeof(int8_t); /* trace status */
-    }
-
-    resp.datasize+= (num_applications * (sizeof(uint32_t) /* app_id */  + sizeof(uint16_t) /* count_con_ids */)) +
-                    (num_contexts * sizecont);
-
-    resp.datasize+= sizeof(uint16_t) /* count_app_ids */;
-
-    /* Add additional size for response of Mode 7 */
-    if (req->options==7)
-    {
-        if (req->apid[0]!='\0')
-        {
-            if (req->ctid[0]!='\0')
-            {
-                /* One application, one context */
-                // context = dlt_daemon_context_find(daemon, req->apid, req->ctid, verbose);
-                if (context)
-                {
-                    resp.datasize+=sizeof(uint16_t) /* len_context_description */;
-                    if (context->context_description!=0)
-                    {
-                        resp.datasize+=strlen(context->context_description); /* context_description */
-                    }
-                }
-            }
-            else
-            {
-                /* One application, all contexts */
-                if ((daemon->applications) && (application))
-                {
-                    /* Calculate start offset within contexts[] */
-                    offset_base=0;
-                    for (i=0; i<(application-(daemon->applications)); i++)
-                    {
-                        offset_base+=daemon->applications[i].num_contexts;
-                    }
-
-                    /* Iterate over all contexts belonging to this application */
-                    for (j=0;j<application->num_contexts;j++)
-                    {
-
-                        context = &(daemon->contexts[offset_base+j]);
-                        if (context)
-                        {
-                            resp.datasize+=sizeof(uint16_t) /* len_context_description */;
-                            if (context->context_description!=0)
-                            {
-                                resp.datasize+=strlen(context->context_description); /* context_description */
-                            }
-                        }
-                    }
-                }
-            }
-
-            /* Space for application description */
-            if (application)
-            {
-                resp.datasize+=sizeof(uint16_t) /* len_app_description */;
-                if (application->application_description!=0)
-                {
-                    resp.datasize+=strlen(application->application_description); /* app_description */
-                }
-            }
-        }
-        else
-        {
-            /* All applications, all contexts */
-            for (i=0;i<daemon->num_contexts;i++)
-            {
-                resp.datasize+=sizeof(uint16_t) /* len_context_description */;
-                if (daemon->contexts[i].context_description!=0)
-                {
-                    resp.datasize+=strlen(daemon->contexts[i].context_description); /* context_description */
-                }
-            }
-
-            for (i=0;i<daemon->num_applications;i++)
-            {
-                resp.datasize+=sizeof(uint16_t) /* len_app_description */;
-                if (daemon->applications[i].application_description!=0)
-                {
-                    resp.datasize+=strlen(daemon->applications[i].application_description); /* app_description */
-                }
-            }
-        }
-    }
-
-    if (verbose)
-    {
-        sprintf(str,"Allocate %d bytes for response msg databuffer\n", resp.datasize);
-        dlt_log(LOG_INFO, str);
-    }
-
-    /* Allocate buffer for response message */
-    resp.databuffer = (uint8_t *) malloc(resp.datasize);
-    resp.databuffersize = resp.datasize;
-
-    if (resp.databuffer==0)
-    {
-        dlt_daemon_control_service_response(sock, daemon, DLT_SERVICE_ID_GET_LOG_INFO, DLT_SERVICE_RESPONSE_ERROR,  verbose);
-        return;
-    }
-    memset(resp.databuffer,0,resp.datasize);
-    /* Preparation finished */
-
-    /* Prepare response */
-    sid = DLT_SERVICE_ID_GET_LOG_INFO;
-    memcpy(resp.databuffer,&sid,sizeof(uint32_t));
-    offset+=sizeof(uint32_t);
-
-    value = (((num_applications!=0)&&(num_contexts!=0))?req->options:8); /* 8 = no matching context found */
-
-    memcpy(resp.databuffer+offset,&value,sizeof(int8_t));
-    offset+=sizeof(int8_t);
-
-    count_app_ids = num_applications;
-
-    if (count_app_ids!=0)
-    {
-        memcpy(resp.databuffer+offset,&count_app_ids,sizeof(uint16_t));
-        offset+=sizeof(uint16_t);
-
-#if (DLT_DEBUG_GETLOGINFO==1)
-        sprintf(str,"#apid: %d \n", count_app_ids);
-        dlt_log(LOG_DEBUG, str);
-#endif
-
-        for (i=0;i<count_app_ids;i++)
-        {
-            if (req->apid[0]!='\0')
-            {
-                apid = req->apid;
-            }
-            else
-            {
-                if (daemon->applications)
-                {
-                    apid = daemon->applications[i].apid;
-                }
-                else
-                {
-                    /* This should never occur! */
-                    apid=0;
-                }
-            }
-
-            application = dlt_daemon_application_find(daemon, apid, verbose);
-
-            if (application)
-            {
-                /* Calculate start offset within contexts[] */
-                offset_base=0;
-                for (j=0; j<(application-(daemon->applications)); j++)
-                {
-                    offset_base+=daemon->applications[j].num_contexts;
-                }
-
-                dlt_set_id((char*)(resp.databuffer+offset),apid);
-                offset+=sizeof(ID4);
-
-#if (DLT_DEBUG_GETLOGINFO==1)
-                dlt_print_id(buf, apid);
-                sprintf(str,"apid: %s\n",buf);
-                dlt_log(LOG_DEBUG, str);
-#endif
-
-                if (req->apid[0]!='\0')
-                {
-                    count_con_ids = num_contexts;
-                }
-                else
-                {
-                    count_con_ids = application->num_contexts;
-                }
-
-                memcpy(resp.databuffer+offset,&count_con_ids,sizeof(uint16_t));
-                offset+=sizeof(uint16_t);
-
-#if (DLT_DEBUG_GETLOGINFO==1)
-                sprintf(str,"#ctid: %d \n", count_con_ids);
-                dlt_log(LOG_DEBUG, str);
-#endif
-
-                for (j=0;j<count_con_ids;j++)
-                {
-#if (DLT_DEBUG_GETLOGINFO==1)
-                    sprintf(str,"j: %d \n",j);
-                    dlt_log(LOG_DEBUG, str);
-#endif
-                    if (!((count_con_ids==1) && (req->apid[0]!='\0') && (req->ctid[0]!='\0')))
-                    {
-                        context = &(daemon->contexts[offset_base+j]);
-                    }
-                    /* else: context was already searched and found
-                             (one application (found) with one context (found))*/
-
-                    if ((context) &&
-                            ((req->ctid[0]=='\0') ||
-                             ((req->ctid[0]!='\0') && (memcmp(context->ctid,req->ctid,DLT_ID_SIZE)==0)))
-                       )
-                    {
-                        dlt_set_id((char*)(resp.databuffer+offset),context->ctid);
-                        offset+=sizeof(ID4);
-
-#if (DLT_DEBUG_GETLOGINFO==1)
-                        dlt_print_id(buf, context->ctid);
-                        sprintf(str,"ctid: %s \n",buf);
-                        dlt_log(LOG_DEBUG, str);
-#endif
-
-                        /* Mode 4, 6, 7 */
-                        if ((req->options==4) || (req->options==6) || (req->options==7))
-                        {
-                            ll=context->log_level;
-                            memcpy(resp.databuffer+offset,&ll,sizeof(int8_t));
-                            offset+=sizeof(int8_t);
-                        }
-
-                        /* Mode 5, 6, 7 */
-                        if ((req->options==5) || (req->options==6) || (req->options==7))
-                        {
-                            ts=context->trace_status;
-                            memcpy(resp.databuffer+offset,&ts,sizeof(int8_t));
-                            offset+=sizeof(int8_t);
-                        }
-
-                        /* Mode 7 */
-                        if (req->options==7)
-                        {
-                            if (context->context_description)
-                            {
-                                len = strlen(context->context_description);
-                                memcpy(resp.databuffer+offset,&len,sizeof(uint16_t));
-                                offset+=sizeof(uint16_t);
-                                memcpy(resp.databuffer+offset,context->context_description,strlen(context->context_description));
-                                offset+=strlen(context->context_description);
-                            }
-                            else
-                            {
-                                len = 0;
-                                memcpy(resp.databuffer+offset,&len,sizeof(uint16_t));
-                                offset+=sizeof(uint16_t);
-                            }
-                        }
-
-#if (DLT_DEBUG_GETLOGINFO==1)
-                        sprintf(str,"ll=%d ts=%d \n",(int32_t)ll,(int32_t)ts);
-                        dlt_log(LOG_DEBUG, str);
-#endif
-                    }
-
-#if (DLT_DEBUG_GETLOGINFO==1)
-                    dlt_log(LOG_DEBUG,"\n");
-#endif
-                }
-
-                /* Mode 7 */
-                if (req->options==7)
-                {
-                    if (application->application_description)
-                    {
-                        len = strlen(application->application_description);
-                        memcpy(resp.databuffer+offset,&len,sizeof(uint16_t));
-                        offset+=sizeof(uint16_t);
-                        memcpy(resp.databuffer+offset,application->application_description,strlen(application->application_description));
-                        offset+=strlen(application->application_description);
-                    }
-                    else
-                    {
-                        len = 0;
-                        memcpy(resp.databuffer+offset,&len,sizeof(uint16_t));
-                        offset+=sizeof(uint16_t);
-                    }
-                }
-            } /* if (application) */
-        } /* for (i=0;i<count_app_ids;i++) */
-    } /* if (count_app_ids!=0) */
-
-    dlt_set_id((char*)(resp.databuffer+offset),DLT_DAEMON_REMO_STRING);
-
-    /* send message */
-    dlt_daemon_control_send_control_message(sock,daemon,&resp,"","",  verbose);
-
-    /* free message */
-    dlt_message_free(&resp,0);
-}
-
-int dlt_daemon_control_message_buffer_overflow(int sock, DltDaemon *daemon, unsigned int overflow_counter,char* apid, int verbose)
-{
-    DltMessage msg;
-	DltServiceMessageBufferOverflowResponse *resp;
-
-    PRINT_FUNCTION_VERBOSE(verbose);
-
-    if (daemon==0)
-    {
-        return -1;
-    }
-
-    /* initialise new message */
-    if (dlt_message_init(&msg,0)==-1)
-    {
-    	dlt_daemon_control_service_response(sock, daemon, DLT_SERVICE_ID_MESSAGE_BUFFER_OVERFLOW, DLT_SERVICE_RESPONSE_ERROR,  verbose);
-    	return -1;
-    }
-
-    /* prepare payload of data */
-    msg.datasize = sizeof(DltServiceMessageBufferOverflowResponse);
-    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)
-    {
-        if (sock!=DLT_DAEMON_STORE_TO_BUFFER)
-        {
-            dlt_daemon_control_service_response(sock, daemon, DLT_SERVICE_ID_MESSAGE_BUFFER_OVERFLOW, DLT_SERVICE_RESPONSE_ERROR,  verbose);
-        }
-        return -1;
-    }
-
-    resp = (DltServiceMessageBufferOverflowResponse*) msg.databuffer;
-    resp->service_id = DLT_SERVICE_ID_MESSAGE_BUFFER_OVERFLOW;
-    resp->status = DLT_SERVICE_RESPONSE_OK;
-    resp->overflow = daemon->message_buffer_overflow;
-   	resp->overflow_counter = overflow_counter;
-
-    /* send message */
-    if(dlt_daemon_control_send_control_message(sock,daemon,&msg,apid,"",  verbose))
-    {
-        dlt_message_free(&msg,0);
-    	return -1;
-    }
-
-    /* free message */
-    dlt_message_free(&msg,0);
-
-    return 0;
-}
-
-void dlt_daemon_control_service_response( int sock, DltDaemon *daemon, uint32_t service_id, int8_t status , int verbose)
-{
-    DltMessage msg;
-    DltServiceResponse *resp;
-
-    PRINT_FUNCTION_VERBOSE(verbose);
-
-    if (daemon==0)
-    {
-        return;
-    }
-
-    /* initialise new message */
-    if (dlt_message_init(&msg,0)==-1)
-    {
-		return;
-    }
-
-    /* prepare payload of data */
-    msg.datasize = sizeof(DltServiceResponse);
-    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)
-    {
-        return;
-    }
-
-    resp = (DltServiceResponse*) msg.databuffer;
-    resp->service_id = service_id;
-    resp->status = status;
-
-    /* send message */
-    dlt_daemon_control_send_control_message(sock,daemon,&msg,"","",  verbose);
-
-    /* free message */
-    dlt_message_free(&msg,0);
-}
-
-int dlt_daemon_control_send_control_message( int sock, DltDaemon *daemon, DltMessage *msg, char* appid, char* ctid, int verbose)
-{
-    ssize_t ret;
-    int32_t len;
-
-    PRINT_FUNCTION_VERBOSE(verbose);
-
-    if ((daemon==0) || (msg==0) || (appid==0) || (ctid==0))
-    {
-        return -1;
-    }
-
-    /* prepare storage header */
-    msg->storageheader = (DltStorageHeader*)msg->headerbuffer;
-
-    if (dlt_set_storageheader(msg->storageheader,daemon->ecuid)==-1)
-    {
-		return -1;
-    }
-
-    /* prepare standard header */
-    msg->standardheader = (DltStandardHeader*)(msg->headerbuffer + sizeof(DltStorageHeader));
-    msg->standardheader->htyp = DLT_HTYP_WEID | DLT_HTYP_WTMS | DLT_HTYP_UEH | DLT_HTYP_PROTOCOL_VERSION1 ;
-
-#if (BYTE_ORDER==BIG_ENDIAN)
-    msg->standardheader->htyp = ( msg->standardheader->htyp | DLT_HTYP_MSBF);
-#endif
-
-    msg->standardheader->mcnt = 0;
-
-    /* Set header extra parameters */
-    dlt_set_id(msg->headerextra.ecu,daemon->ecuid);
-
-    //msg->headerextra.seid = 0;
-
-    msg->headerextra.tmsp = dlt_uptime();
-
-    dlt_message_set_extraparameters(msg, verbose);
-
-    /* prepare extended header */
-    msg->extendedheader = (DltExtendedHeader*)(msg->headerbuffer + sizeof(DltStorageHeader) + sizeof(DltStandardHeader) + DLT_STANDARD_HEADER_EXTRA_SIZE(msg->standardheader->htyp));
-    msg->extendedheader->msin = DLT_MSIN_CONTROL_RESPONSE;
-
-    msg->extendedheader->noar = 1; /* number of arguments */
-    if (strcmp(appid,"")==0)
-    {
-        dlt_set_id(msg->extendedheader->apid,DLT_DAEMON_CTRL_APID);       /* application id */
-    }
-    else
-    {
-        dlt_set_id(msg->extendedheader->apid, appid);
-    }
-    if (strcmp(ctid,"")==0)
-    {
-        dlt_set_id(msg->extendedheader->ctid,DLT_DAEMON_CTRL_CTID);       /* context id */
-    }
-    else
-    {
-        dlt_set_id(msg->extendedheader->ctid, ctid);
-    }
-
-    /* prepare length information */
-    msg->headersize = sizeof(DltStorageHeader) + sizeof(DltStandardHeader) + sizeof(DltExtendedHeader) + DLT_STANDARD_HEADER_EXTRA_SIZE(msg->standardheader->htyp);
-
-    len=msg->headersize - sizeof(DltStorageHeader) + msg->datasize;
-    if (len>UINT16_MAX)
-    {
-        dlt_log(LOG_CRIT,"Huge control message discarded!\n");
-        return -1;
-    }
-
-    msg->standardheader->len = DLT_HTOBE_16(((uint16_t)len));
-
-    if (sock!=DLT_DAEMON_STORE_TO_BUFFER)
-    {
-        /* Send message */
-        if (isatty(sock))
-        {
-            DLT_DAEMON_SEM_LOCK();
-
-            /* Optional: Send serial header, if requested */
-            if (daemon->sendserialheader)
-            {
-                ret=write(sock,dltSerialHeader,sizeof(dltSerialHeader));
-                if (0 > ret)
-                {
-                        dlt_log(LOG_CRIT,"dlt_daemon_control_send_control_message: write dltSerialHeader failed\n");
-                        DLT_DAEMON_SEM_FREE();
-                        return -1;
-                }
-            }
-
-            /* Send data */
-            ret=write(sock, msg->headerbuffer+sizeof(DltStorageHeader),msg->headersize-sizeof(DltStorageHeader));
-            if (0 > ret)
-            {
-                    dlt_log(LOG_CRIT,"dlt_daemon_control_send_control_message: write msg->headerbuffer failed\n");
-                    DLT_DAEMON_SEM_FREE();
-                    return -1;
-            }
-            ret=write(sock, msg->databuffer,msg->datasize);
-            if (0 > ret)
-            {
-                    dlt_log(LOG_CRIT,"dlt_daemon_control_send_control_message: write msg->databuffer failed\n");
-                    DLT_DAEMON_SEM_FREE();
-                    return -1;
-            }
-
-            DLT_DAEMON_SEM_FREE();
-        }
-        else
-        {
-            DLT_DAEMON_SEM_LOCK();
-
-            /* Optional: Send serial header, if requested */
-            if (daemon->sendserialheader)
-            {
-                if (0 > send(sock, dltSerialHeader,sizeof(dltSerialHeader),0))
-                    dlt_log(LOG_WARNING,"dlt_daemon_control_send_control_message: send serialheader failed\n");
-
-            }
-
-            /* Send data */
-
-            if ( 0 > send(sock, msg->headerbuffer+sizeof(DltStorageHeader),msg->headersize-sizeof(DltStorageHeader),0))
-                dlt_log(LOG_WARNING,"dlt_daemon_control_send_control_message: send DltStorageHeader failed\n");
-
-            if ( 0 > send(sock, msg->databuffer,msg->datasize,0))
-                dlt_log(LOG_WARNING,"dlt_daemon_control_send_control_message: send databuffer failed\n");
-
-            DLT_DAEMON_SEM_FREE();
-        }
-    }
-    else
-    {
-        DLT_DAEMON_SEM_LOCK();
-        /* Store message in history buffer */
-        if (dlt_buffer_push3(&(daemon->client_ringbuffer),
-                            msg->headerbuffer+sizeof(DltStorageHeader),msg->headersize-sizeof(DltStorageHeader),
-                            msg->databuffer,msg->datasize,
-                            0, 0
-                           )<0)
-		{
-        	DLT_DAEMON_SEM_FREE();
-			dlt_log(LOG_ERR,"Storage of message in history buffer failed! Message discarded.\n");
-			return -1;
-		}
-        DLT_DAEMON_SEM_FREE();
-    }
-    return 0;
-}
-
 void dlt_daemon_control_reset_to_factory_default(DltDaemon *daemon,const char *filename, const char *filename1, int verbose)
 {
     FILE *fd;
@@ -2463,302 +1268,29 @@ void dlt_daemon_user_send_all_log_state(DltDaemon *daemon, int verbose)
     }
 }
 
-void dlt_daemon_control_message_time(int sock, DltDaemon *daemon, int verbose)
-{
-    DltMessage msg;
-    ssize_t ret;
-    int32_t len;
-
-    PRINT_FUNCTION_VERBOSE(verbose);
-
-    if (daemon==0)
-    {
-        return;
-    }
-
-    if (sock==DLT_DAEMON_STORE_TO_BUFFER)
-    {
-        return;
-    }
-
-    /* initialise new message */
-    if (dlt_message_init(&msg,0)==-1)
-    {
-        return;
-    }
-
-    /* send message */
-
-    /* prepare storage header */
-    msg.storageheader = (DltStorageHeader*)msg.headerbuffer;
-    dlt_set_storageheader(msg.storageheader,daemon->ecuid);
-
-    /* prepare standard header */
-    msg.standardheader = (DltStandardHeader*)(msg.headerbuffer + sizeof(DltStorageHeader));
-    msg.standardheader->htyp = DLT_HTYP_WEID | DLT_HTYP_WTMS | DLT_HTYP_UEH | DLT_HTYP_PROTOCOL_VERSION1 ;
-
-#if (BYTE_ORDER==BIG_ENDIAN)
-    msg.standardheader->htyp = ( msg.standardheader->htyp | DLT_HTYP_MSBF);
-#endif
-
-    msg.standardheader->mcnt = 0;
-
-    /* Set header extra parameters */
-    dlt_set_id(msg.headerextra.ecu,daemon->ecuid);
-    msg.headerextra.tmsp = dlt_uptime();
-
-    dlt_message_set_extraparameters(&msg, verbose);
-
-    /* prepare extended header */
-    msg.extendedheader = (DltExtendedHeader*)(msg.headerbuffer + sizeof(DltStorageHeader) + sizeof(DltStandardHeader) + DLT_STANDARD_HEADER_EXTRA_SIZE(msg.standardheader->htyp));
-    msg.extendedheader->msin = DLT_MSIN_CONTROL_TIME;
-
-    msg.extendedheader->noar = 0;                  /* number of arguments */
-    dlt_set_id(msg.extendedheader->apid,"");       /* application id */
-    dlt_set_id(msg.extendedheader->ctid,"");       /* context id */
-
-    /* prepare length information */
-    msg.headersize = sizeof(DltStorageHeader) + sizeof(DltStandardHeader) + sizeof(DltExtendedHeader) + DLT_STANDARD_HEADER_EXTRA_SIZE(msg.standardheader->htyp);
-
-    len=msg.headersize - sizeof(DltStorageHeader) + msg.datasize;
-    if (len>UINT16_MAX)
-    {
-        dlt_log(LOG_CRIT,"Huge control message discarded!\n");
-
-        /* free message */
-        dlt_message_free(&msg,0);
-
-        return;
-    }
-
-    msg.standardheader->len = DLT_HTOBE_16(((uint16_t)len));
-
-    /* Send message */
-    if (isatty(sock))
-    {
-        DLT_DAEMON_SEM_LOCK();
-
-        /* Optional: Send serial header, if requested */
-        if (daemon->sendserialheader)
-        {
-            ret=write(sock,dltSerialHeader,sizeof(dltSerialHeader));
-        }
-
-        /* Send data */
-        ret=write(sock, msg.headerbuffer+sizeof(DltStorageHeader),msg.headersize-sizeof(DltStorageHeader));
-        if(msg.datasize > 0)
-        {
-                ret=write(sock, msg.databuffer,msg.datasize);
-                if (0 > ret){
-                        dlt_log(LOG_CRIT,"dlt_daemon_control_message_time: Failed to write databuffer\n");
-                        dlt_message_free(&msg,0);
-                        DLT_DAEMON_SEM_FREE();
-                        return;
-                }
-        }
-
-        DLT_DAEMON_SEM_FREE();
-    }
-    else
-    {
-        DLT_DAEMON_SEM_LOCK();
-
-        /* Optional: Send serial header, if requested */
-        if (daemon->sendserialheader)
-        {
-            if ( 0 > send(sock, dltSerialHeader,sizeof(dltSerialHeader),0) )
-                dlt_log(LOG_ERR,"dlt_daemon_control_message_time: Failed to send dltSerialHeader");
-
-        }
-
-        /* Send data */
-        if (0 > send(sock, msg.headerbuffer+sizeof(DltStorageHeader),msg.headersize-sizeof(DltStorageHeader),0))
-            dlt_log(LOG_ERR,"dlt_daemon_control_message_time: Failed to send DltStorageHeader");
-
-        if(msg.datasize > 0)
-        {
-            if (0 > send(sock, msg.databuffer,msg.datasize,0) )
-                dlt_log(LOG_ERR,"dlt_daemon_control_message_time: Failed to send databuffer");
-        }
-
-        DLT_DAEMON_SEM_FREE();
-    }
-
-    /* free message */
-    dlt_message_free(&msg,0);
-}
-
-int dlt_daemon_control_message_unregister_context(int sock, DltDaemon *daemon, char* apid, char* ctid, char* comid, int verbose)
+void dlt_daemon_change_state(DltDaemon *daemon, DltDaemonState newState)
 {
-    DltMessage msg;
-    DltServiceUnregisterContext *resp;
-
-    PRINT_FUNCTION_VERBOSE(verbose);
-
-    if (daemon==0)
-    {
-        return -1;
-    }
-
-    /* initialise new message */
-    if (dlt_message_init(&msg,0)==-1)
-    {
-    	dlt_daemon_control_service_response(sock, daemon, DLT_SERVICE_ID_MESSAGE_BUFFER_OVERFLOW, DLT_SERVICE_RESPONSE_ERROR,  verbose);
-    	return -1;
-    }
-
-    /* prepare payload of data */
-    msg.datasize = sizeof(DltServiceUnregisterContext);
-    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)
-    {
-        if (sock!=DLT_DAEMON_STORE_TO_BUFFER)
-        {
-            dlt_daemon_control_service_response(sock, daemon, DLT_SERVICE_ID_MESSAGE_BUFFER_OVERFLOW, DLT_SERVICE_RESPONSE_ERROR,  verbose);
-        }
-        return -1;
-    }
-
-    resp = (DltServiceUnregisterContext*) msg.databuffer;
-    resp->service_id = DLT_SERVICE_ID_UNREGISTER_CONTEXT;
-    resp->status = DLT_SERVICE_RESPONSE_OK;
-   	dlt_set_id(resp->apid, apid);
-   	dlt_set_id(resp->ctid, ctid);
-   	dlt_set_id(resp->comid, comid);
-
-    /* send message */
-    if(dlt_daemon_control_send_control_message(sock,daemon,&msg,"","",  verbose))
-    {
-        dlt_message_free(&msg,0);
-    	return -1;
-    }
-
-    /* free message */
-    dlt_message_free(&msg,0);
-
-    return 0;
-}
-
-int dlt_daemon_control_message_connection_info(int sock, DltDaemon *daemon, uint8_t state, char* comid, int verbose)
-{
-    DltMessage msg;
-    DltServiceConnectionInfo *resp;
-
-    PRINT_FUNCTION_VERBOSE(verbose);
-
-    if (daemon==0)
-    {
-        return -1;
-    }
-
-    /* initialise new message */
-    if (dlt_message_init(&msg,0)==-1)
-    {
-    	dlt_daemon_control_service_response(sock, daemon, DLT_SERVICE_ID_MESSAGE_BUFFER_OVERFLOW, DLT_SERVICE_RESPONSE_ERROR,  verbose);
-    	return -1;
-    }
-
-    /* prepare payload of data */
-    msg.datasize = sizeof(DltServiceConnectionInfo);
-    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)
-    {
-        if (sock!=DLT_DAEMON_STORE_TO_BUFFER)
-        {
-            dlt_daemon_control_service_response(sock, daemon, DLT_SERVICE_ID_MESSAGE_BUFFER_OVERFLOW, DLT_SERVICE_RESPONSE_ERROR,  verbose);
-        }
-        return -1;
-    }
-
-    resp = (DltServiceConnectionInfo*) msg.databuffer;
-    resp->service_id = DLT_SERVICE_ID_CONNECTION_INFO;
-    resp->status = DLT_SERVICE_RESPONSE_OK;
-    resp->state = state;
-    dlt_set_id(resp->comid, comid);
-
-    /* send message */
-    if(dlt_daemon_control_send_control_message(sock,daemon,&msg,"","",  verbose))
-    {
-        dlt_message_free(&msg,0);
-    	return -1;
-    }
-
-    /* free message */
-    dlt_message_free(&msg,0);
+	switch(newState)
+	{
+		case DLT_DAEMON_STATE_INIT:
+	        dlt_log(LOG_INFO,"Switched to init state.\n");
+			daemon->state = DLT_DAEMON_STATE_INIT;
+			break;
+		case DLT_DAEMON_STATE_BUFFER:
+	        dlt_log(LOG_INFO,"Switched to buffer state.\n");
+			daemon->state = DLT_DAEMON_STATE_BUFFER;
+			break;
+		case DLT_DAEMON_STATE_SEND_BUFFER:
+	        dlt_log(LOG_INFO,"Switched to send buffer state.\n");
+			daemon->state = DLT_DAEMON_STATE_SEND_BUFFER;
+			break;
+		case DLT_DAEMON_STATE_SEND_DIRECT:
+	        dlt_log(LOG_INFO,"Switched to send direct state.\n");
+			daemon->state = DLT_DAEMON_STATE_SEND_DIRECT;
+			break;
+	}
 
-    return 0;
 }
 
-int dlt_daemon_control_message_timezone(int sock, DltDaemon *daemon, int32_t timezone, uint8_t isdst, int verbose)
-{
-    DltMessage msg;
-    DltServiceTimezone *resp;
 
-    PRINT_FUNCTION_VERBOSE(verbose);
-
-    if (daemon==0)
-    {
-        return -1;
-    }
 
-    /* initialise new message */
-    if (dlt_message_init(&msg,0)==-1)
-    {
-    	dlt_daemon_control_service_response(sock, daemon, DLT_SERVICE_ID_MESSAGE_BUFFER_OVERFLOW, DLT_SERVICE_RESPONSE_ERROR,  verbose);
-    	return -1;
-    }
-
-    /* prepare payload of data */
-    msg.datasize = sizeof(DltServiceTimezone);
-    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)
-    {
-        if (sock!=DLT_DAEMON_STORE_TO_BUFFER)
-        {
-            dlt_daemon_control_service_response(sock, daemon, DLT_SERVICE_ID_MESSAGE_BUFFER_OVERFLOW, DLT_SERVICE_RESPONSE_ERROR,  verbose);
-        }
-        return -1;
-    }
-
-    resp = (DltServiceTimezone*) msg.databuffer;
-    resp->service_id = DLT_SERVICE_ID_TIMEZONE;
-    resp->status = DLT_SERVICE_RESPONSE_OK;
-    resp->timezone = timezone;
-    resp->isdst = isdst;
-
-    /* send message */
-    if(dlt_daemon_control_send_control_message(sock,daemon,&msg,"","",  verbose))
-    {
-        dlt_message_free(&msg,0);
-    	return -1;
-    }
-
-    /* free message */
-    dlt_message_free(&msg,0);
-
-    return 0;
-}
diff --git a/src/daemon/dlt_daemon_common.h b/src/daemon/dlt_daemon_common.h
index f0a6be4..41d741b 100644
--- a/src/daemon/dlt_daemon_common.h
+++ b/src/daemon/dlt_daemon_common.h
@@ -86,7 +86,7 @@ extern "C" {
 #define DLT_DAEMON_RINGBUFFER_MAX_SIZE  10000000 /**< Ring buffer size for storing log messages while no client is connected */

 #define DLT_DAEMON_RINGBUFFER_STEP_SIZE   500000 /**< Ring buffer size for storing log messages while no client is connected */

 

-#define DLT_DAEMON_STORE_TO_BUFFER -2   /**< Constant value to identify the command "store to buffer" */

+#define DLT_DAEMON_SEND_TO_ALL     -3   /**< Constant value to identify the command "send to all" */

 

 /* Use a semaphore or mutex from your OS to prevent concurrent access to the DLT buffer. */

 

@@ -94,6 +94,16 @@ extern "C" {
 #define DLT_DAEMON_SEM_FREE() { sem_post(&dlt_daemon_mutex); }

 extern sem_t dlt_daemon_mutex;

 

+/**

+ * Definitions of DLT daemon logging states

+ */

+typedef enum

+{

+	DLT_DAEMON_STATE_INIT =    		  	 0,  /**< Initial state */

+	DLT_DAEMON_STATE_BUFFER =            1,  /**< logging is buffered until external logger is connected or internal logging is activated */

+	DLT_DAEMON_STATE_SEND_BUFFER =       2,  /**< external logger is connected, but buffer is still not empty or external logger queue is full */

+	DLT_DAEMON_STATE_SEND_DIRECT =       3   /**< External logger is connected or internal logging is active, and buffer is empty */

+} DltDaemonState;

 

 /**

  * The parameters of a daemon application.

@@ -143,8 +153,9 @@ typedef struct
     char runtime_context_cfg[PATH_MAX + 1]; /**< Path and filename of persistent context configuration */

     char runtime_configuration[PATH_MAX + 1]; /**< Path and filename of persistent configuration */

     DltUserLogMode mode;	/**< Mode used for tracing: off, external, internal, both */

-    char state;				/**< state for tracing: 0 = no client connected, 1 = client connected */

+    char connectionState;				/**< state for tracing: 0 = no client connected, 1 = client connected */

     char *ECUVersionString; /**< Version string to send to client. Loaded from a file at startup. May be null. */

+    DltDaemonState state;   /**< the current logging state of dlt daemon. */

 } DltDaemon;

 

 /**

@@ -337,113 +348,6 @@ void dlt_daemon_user_send_default_update(DltDaemon *daemon, int verbose);
 void dlt_daemon_user_send_all_log_state(DltDaemon *daemon, int verbose);

 

 /**

- * Process received control message from dlt client

- * @param sock connection handle used for sending response

- * @param daemon pointer to dlt daemon structure

- * @param msg pointer to received control message

- * @param verbose if set to true verbose information is printed out.

- */

-int dlt_daemon_control_process_control(int sock, DltDaemon *daemon, DltMessage *msg, int verbose);

-/**

- * Generate response to control message from dlt client

- * @param sock connection handle used for sending response

- * @param daemon pointer to dlt daemon structure

- * @param service_id service id of control message

- * @param status status of response (e.g. ok, not supported, error)

- * @param verbose if set to true verbose information is printed out.

- */

-void dlt_daemon_control_service_response(int sock, DltDaemon *daemon, uint32_t service_id, int8_t status, int verbose);

-/**

- * Send out response message to dlt client

- * @param sock connection handle used for sending response

- * @param daemon pointer to dlt daemon structure

- * @param msg pointer to response message

- * @param appid pointer to application id to be used in response message

- * @param contid pointer to context id to be used in response message

- * @param verbose if set to true verbose information is printed out.

- * @return -1 if there is an error or buffer is full

- */

-int dlt_daemon_control_send_control_message(int sock, DltDaemon *daemon, DltMessage *msg, char* appid, char* contid, int verbose);

-

-/**

- * Process and generate response to received sw injection control message

- * @param sock connection handle used for sending response

- * @param daemon pointer to dlt daemon structure

- * @param msg pointer to received sw injection control message

- * @param verbose if set to true verbose information is printed out.

- */

-void dlt_daemon_control_callsw_cinjection(int sock, DltDaemon *daemon, DltMessage *msg, int verbose);

-/**

- * Process and generate response to received set log level control message

- * @param sock connection handle used for sending response

- * @param daemon pointer to dlt daemon structure

- * @param msg pointer to received control message

- * @param verbose if set to true verbose information is printed out.

- */

-void dlt_daemon_control_set_log_level(int sock, DltDaemon *daemon, DltMessage *msg, int verbose);

-/**

- * Process and generate response to received set trace status control message

- * @param sock connection handle used for sending response

- * @param daemon pointer to dlt daemon structure

- * @param msg pointer to received control message

- * @param verbose if set to true verbose information is printed out.

- */

-void dlt_daemon_control_set_trace_status(int sock, DltDaemon *daemon, DltMessage *msg, int verbose);

-/**

- * Process and generate response to received set default log level control message

- * @param sock connection handle used for sending response

- * @param daemon pointer to dlt daemon structure

- * @param msg pointer to received control message

- * @param verbose if set to true verbose information is printed out.

- */

-void dlt_daemon_control_set_default_log_level(int sock, DltDaemon *daemon, DltMessage *msg, int verbose);

-/**

- * Process and generate response to received set default trace status control message

- * @param sock connection handle used for sending response

- * @param daemon pointer to dlt daemon structure

- * @param msg pointer to received control message

- * @param verbose if set to true verbose information is printed out.

- */

-void dlt_daemon_control_set_default_trace_status(int sock, DltDaemon *daemon, DltMessage *msg, int verbose);

-/**

- * Process and generate response to set timing packets control message

- * @param sock connection handle used for sending response

- * @param daemon pointer to dlt daemon structure

- * @param msg pointer to received control message

- * @param verbose if set to true verbose information is printed out.

- */

-void dlt_daemon_control_set_timing_packets(int sock, DltDaemon *daemon, DltMessage *msg, int verbose);

-/**

- * Process and generate response to received get software version control message

- * @param sock connection handle used for sending response

- * @param daemon pointer to dlt daemon structure

- * @param verbose if set to true verbose information is printed out.

- */

-void dlt_daemon_control_get_software_version(int sock, DltDaemon *daemon, int verbose);

-/**

- * Process and generate response to received get default log level control message

- * @param sock connection handle used for sending response

- * @param daemon pointer to dlt daemon structure

- * @param verbose if set to true verbose information is printed out.

- */

-void dlt_daemon_control_get_default_log_level(int sock, DltDaemon *daemon, int verbose);

-/**

- * Process and generate response to received get log info control message

- * @param sock connection handle used for sending response

- * @param daemon pointer to dlt daemon structure

- * @param msg pointer to received control message

- * @param verbose if set to true verbose information is printed out.

- */

-void dlt_daemon_control_get_log_info(int sock, DltDaemon *daemon, DltMessage *msg, int verbose);

-/**

- * Process and generate response to message buffer overflow control message

- * @param sock connection handle used for sending response

- * @param daemon pointer to dlt daemon structure

- * @param verbose if set to true verbose information is printed out.

- * @return -1 if there is an error or buffer overflow, else 0

- */

-int dlt_daemon_control_message_buffer_overflow(int sock, DltDaemon *daemon, unsigned int overflow_counter,char* apid, int verbose);

-/**

  * Process reset to factory default control message

  * @param daemon pointer to dlt daemon structure

  * @param filename name of file containing the runtime defaults for applications

@@ -451,40 +355,13 @@ int dlt_daemon_control_message_buffer_overflow(int sock, DltDaemon *daemon, unsi
  * @param verbose if set to true verbose information is printed out.

  */

 void dlt_daemon_control_reset_to_factory_default(DltDaemon *daemon,const char *filename, const char *filename1, int verbose);

+

 /**

- * Send time control message

- * @param sock connection handle used for sending response

- * @param daemon pointer to dlt daemon structure

- * @param verbose if set to true verbose information is printed out.

- */

-void dlt_daemon_control_message_time(int sock, DltDaemon *daemon, int verbose);

-/**

- * Send control message unregister context (add on to AUTOSAR standard)

- * @param sock connection handle used for sending response

- * @param daemon pointer to dlt daemon structure

- * @param apid application id to be unregisteres

- * @param ctid context id to be unregistered

- * @param comid Communication id where apid is unregistered

- * @param verbose if set to true verbose information is printed out.

- */

-int dlt_daemon_control_message_unregister_context(int sock, DltDaemon *daemon, char* apid, char* ctid, char* comid, int verbose);

-/**

- * Send control message connection info (add on to AUTOSAR standard)

- * @param sock connection handle used for sending response

- * @param daemon pointer to dlt daemon structure

- * @param state state of connection

- * @param comid Communication id where connection state changed

- * @param verbose if set to true verbose information is printed out.

- */

-int dlt_daemon_control_message_connection_info(int sock, DltDaemon *daemon, uint8_t state, char* comid, int verbose);

-/**

- * Send control message connection info (add on to AUTOSAR standard)

- * @param sock connection handle used for sending response

+ * Change the logging state of dlt daemon

  * @param daemon pointer to dlt daemon structure

- * @param timezone timezone on target

- * @param verbose if set to true verbose information is printed out.

+ * @param newState the requested new state

  */

-int dlt_daemon_control_message_timezone(int sock, DltDaemon *daemon, int32_t timezone, uint8_t isdst, int verbose);

+void dlt_daemon_change_state(DltDaemon *daemon, DltDaemonState newState);

 

 #ifdef __cplusplus

 }

diff --git a/src/daemon/dlt_daemon_serial.c b/src/daemon/dlt_daemon_serial.c
new file mode 100644
index 0000000..2dce5a8
--- /dev/null
+++ b/src/daemon/dlt_daemon_serial.c
@@ -0,0 +1,90 @@
+/* @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_daemon_serial.c
+ * For further information see http://www.genivi.org/.
+ * @licence end@
+ */
+
+/*******************************************************************************
+**                                                                            **
+**  SRC-MODULE: dlt_daemon_serial.c                                           **
+**                                                                            **
+**  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 <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <syslog.h>
+#include <errno.h>
+#include <unistd.h>
+#include <fcntl.h>
+
+#include <sys/types.h>  /* send() */
+#include <sys/socket.h> /* send() */
+
+#include "dlt_types.h"
+
+#include "dlt_daemon_serial.h"
+
+int dlt_daemon_serial_send(int sock,void* data1,int size1,void* data2,int size2,char serialheader)
+{
+	/* Optional: Send serial header, if requested */
+	if (serialheader)
+	{
+		if ( 0 > write(sock, dltSerialHeader,sizeof(dltSerialHeader)) )
+			return -1;
+
+	}
+
+	/* Send data */
+	if(data1 && size1>0)
+	{
+		if (0 > write(sock, data1,size1))
+			return -1;
+	}
+
+	if(data2 && size2>0)
+	{
+		if (0 > write(sock, data2,size2))
+		return -1;
+	}
+
+	return 0;
+}
diff --git a/src/daemon/dlt_daemon_serial.h b/src/daemon/dlt_daemon_serial.h
new file mode 100644
index 0000000..928abc2
--- /dev/null
+++ b/src/daemon/dlt_daemon_serial.h
@@ -0,0 +1,63 @@
+/**
+ * @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_daemon_serial.h
+ * For further information see http://www.genivi.org/.
+ * @licence end@
+ */
+
+
+/*******************************************************************************
+**                                                                            **
+**  SRC-MODULE: dlt_daemon_serial.h                                           **
+**                                                                            **
+**  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                                **
+*******************************************************************************/
+
+#ifndef DLT_DAEMON_SERIAL_H
+#define DLT_DAEMON_SERIAL_H
+
+#include <limits.h>
+#include <semaphore.h>
+#include "dlt_common.h"
+#include "dlt_user.h"
+
+int dlt_daemon_serial_send(int sock,void* data1,int size1,void* data2,int size2,char serialheader);
+
+#endif /* DLT_DAEMON_SERIAL_H */
diff --git a/src/daemon/dlt_daemon_socket.c b/src/daemon/dlt_daemon_socket.c
new file mode 100644
index 0000000..6bb9236
--- /dev/null
+++ b/src/daemon/dlt_daemon_socket.c
@@ -0,0 +1,90 @@
+/* @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_daemon_socket.c
+ * For further information see http://www.genivi.org/.
+ * @licence end@
+ */
+
+/*******************************************************************************
+**                                                                            **
+**  SRC-MODULE: dlt_daemon_socket.c                                           **
+**                                                                            **
+**  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 <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <syslog.h>
+#include <errno.h>
+#include <unistd.h>
+#include <fcntl.h>
+
+#include <sys/types.h>  /* send() */
+#include <sys/socket.h> /* send() */
+
+#include "dlt_types.h"
+
+#include "dlt_daemon_socket.h"
+
+int dlt_daemon_socket_send(int sock,void* data1,int size1,void* data2,int size2,char serialheader)
+{
+	/* Optional: Send serial header, if requested */
+	if (serialheader)
+	{
+		if ( 0 > send(sock, dltSerialHeader,sizeof(dltSerialHeader),0) )
+			return -1;
+
+	}
+
+	/* Send data */
+	if(data1 && size1>0)
+	{
+		if (0 > send(sock, data1,size1,0))
+			return -1;
+	}
+
+	if(data2 && size2>0)
+	{
+		if (0 > send(sock, data2,size2,0))
+		return -1;
+	}
+
+	return 0;
+}
diff --git a/src/daemon/dlt_daemon_socket.h b/src/daemon/dlt_daemon_socket.h
new file mode 100644
index 0000000..7067a1e
--- /dev/null
+++ b/src/daemon/dlt_daemon_socket.h
@@ -0,0 +1,63 @@
+/**
+ * @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_daemon_socket.h
+ * For further information see http://www.genivi.org/.
+ * @licence end@
+ */
+
+
+/*******************************************************************************
+**                                                                            **
+**  SRC-MODULE: dlt_daemon_socket.h                                           **
+**                                                                            **
+**  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                                **
+*******************************************************************************/
+
+#ifndef DLT_DAEMON_SOCKET_H
+#define DLT_DAEMON_SOCKET_H
+
+#include <limits.h>
+#include <semaphore.h>
+#include "dlt_common.h"
+#include "dlt_user.h"
+
+int dlt_daemon_socket_send(int sock,void* data1,int size1,void* data2,int size2,char serialheader);
+
+#endif /* DLT_DAEMON_SOCKET_H */