diff options
| author | Alexander Wenzel <Alexander.AW.Wenzel@bmw.de> | 2014-03-18 11:29:08 +0100 |
|---|---|---|
| committer | Alexander Wenzel <Alexander.AW.Wenzel@bmw.de> | 2014-04-01 09:45:45 +0200 |
| commit | 2f105312020b9afd8364df2addab1096e2bf061e (patch) | |
| tree | 143a7d24734513355425f68f84af60ba934abdd8 /src/daemon/dlt-daemon.c | |
| parent | ac1798cbe37c2fdd4f42f05d5e38618372575e82 (diff) | |
| download | DLT-daemon-2f105312020b9afd8364df2addab1096e2bf061e.tar.gz | |
Fixed: Fixed offline trace and new send functions issues
Signed-off-by: Alexander Wenzel <Alexander.AW.Wenzel@bmw.de>
Diffstat (limited to 'src/daemon/dlt-daemon.c')
| -rw-r--r-- | src/daemon/dlt-daemon.c | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/src/daemon/dlt-daemon.c b/src/daemon/dlt-daemon.c index 80cd38e..2fb9f2f 100644 --- a/src/daemon/dlt-daemon.c +++ b/src/daemon/dlt-daemon.c @@ -488,7 +488,7 @@ int main(int argc, char* argv[]) create_timer_fd(&daemon_local, 60, 60, &daemon_local.timer_sixty_s, "ECU version"); } - if(daemon_local.flags.yvalue[0]) + if(daemon_local.flags.yvalue[0] || (daemon_local.flags.offlineTraceDirectory[0])) dlt_daemon_change_state(&daemon,DLT_DAEMON_STATE_SEND_DIRECT); else dlt_daemon_change_state(&daemon,DLT_DAEMON_STATE_BUFFER); @@ -2021,17 +2021,13 @@ int dlt_daemon_process_user_message_log(DltDaemon *daemon, DltDaemonLocal *daemo } } - /* look if TCP connection to client is available */ - if((daemon->mode == DLT_USER_MODE_EXTERNAL) || (daemon->mode == DLT_USER_MODE_BOTH)) + /* send message to client or write to log file */ + if((ret = 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,verbose))) { - - if((ret = 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,verbose))) + if(ret == DLT_DAEMON_ERROR_BUFFER_FULL) { - if(ret == DLT_DAEMON_ERROR_BUFFER_FULL) - { - daemon->overflow_counter++; - } + daemon->overflow_counter++; } } @@ -2321,7 +2317,7 @@ int dlt_daemon_process_user_message_log_mode(DltDaemon *daemon, DltDaemonLocal * return -1; } - if (daemon_local->receiver.bytesRcvd < (int32_t)(sizeof(DltUserHeader)+sizeof(DltUserControlMsgUnregisterContext))) + if (daemon_local->receiver.bytesRcvd < (int32_t)(sizeof(DltUserHeader)+sizeof(DltUserControlMsgLogMode))) { /* Not enough bytes received */ return -1; |