summaryrefslogtreecommitdiff
path: root/src/daemon/dlt_daemon_client.c
diff options
context:
space:
mode:
authorSascha Philipp <sascha.philipp@continental-corporation.com>2014-10-06 13:07:48 +0200
committerAlexander Wenzel <Alexander.AW.Wenzel@bmw.de>2015-03-25 17:12:14 +0100
commit3c89cdf9ca2aae9e0a602997ed0245692ddf976a (patch)
tree07fc261d9af3fce4bfc186369fd37e3e09bd3520 /src/daemon/dlt_daemon_client.c
parent5dd64263c2dc518aaf1d80f3521fa2cc452f6c8d (diff)
downloadDLT-daemon-3c89cdf9ca2aae9e0a602997ed0245692ddf976a.tar.gz
Change daemon state handling to have all traces in online trace even when offline trace is active
Change-Id: Ic212c4956582b18e05739d593bf5c792d60d9c00 Signed-off-by: Sascha Philipp <sascha.philipp@continental-corporation.com>
Diffstat (limited to 'src/daemon/dlt_daemon_client.c')
-rw-r--r--src/daemon/dlt_daemon_client.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/daemon/dlt_daemon_client.c b/src/daemon/dlt_daemon_client.c
index fe75d90..00ad5b9 100644
--- a/src/daemon/dlt_daemon_client.c
+++ b/src/daemon/dlt_daemon_client.c
@@ -96,7 +96,10 @@ int dlt_daemon_client_send(int sock,DltDaemon *daemon,DltDaemonLocal *daemon_loc
}
/* write message to offline trace */
- if ((sock!=DLT_DAEMON_SEND_FORCE) && (daemon->state == DLT_DAEMON_STATE_SEND_DIRECT) && !control)
+ // In the SEND_BUFFER state we must skip offline tracing because the offline traces
+ // are going without buffering directly to the offline trace. Thus we have to filter out
+ // the traces that are coming from the buffer.
+ if ((sock!=DLT_DAEMON_SEND_FORCE) && (daemon->state != DLT_DAEMON_STATE_SEND_BUFFER))
{
if(((daemon->mode == DLT_USER_MODE_INTERNAL) || (daemon->mode == DLT_USER_MODE_BOTH))
&& daemon_local->flags.offlineTraceDirectory[0])