summaryrefslogtreecommitdiff
path: root/src/daemon/dlt_daemon_client.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/daemon/dlt_daemon_client.c')
-rw-r--r--src/daemon/dlt_daemon_client.c2017
1 files changed, 1005 insertions, 1012 deletions
diff --git a/src/daemon/dlt_daemon_client.c b/src/daemon/dlt_daemon_client.c
index 55b775b..55afd7c 100644
--- a/src/daemon/dlt_daemon_client.c
+++ b/src/daemon/dlt_daemon_client.c
@@ -25,7 +25,7 @@
* License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/.
*
* \file dlt_daemon_client.c
-*/
+ */
#include <netdb.h>
#include <ctype.h>
@@ -42,16 +42,16 @@
#include <pthread.h>
#ifdef linux
-#include <sys/timerfd.h>
+# include <sys/timerfd.h>
#endif
#include <sys/stat.h>
#include <sys/time.h>
#if defined(linux) && defined(__NR_statx)
-#include <linux/stat.h>
+# include <linux/stat.h>
#endif
#ifdef DLT_SYSTEMD_WATCHDOG_ENABLE
-#include <systemd/sd-daemon.h>
+# include <systemd/sd-daemon.h>
#endif
#include "dlt_types.h"
@@ -79,10 +79,10 @@ static char str[DLT_DAEMON_TEXTBUFSIZE];
* @param context_log The default log level (or) trace status
*
* @return The log level if requested log level is lower or equal to ContextLogLevel
-*/
+ */
static inline int8_t getStatus(uint8_t request_log, int context_log)
{
- return (request_log <= context_log)? request_log : context_log;
+ return (request_log <= context_log) ? request_log : context_log;
}
/** @brief Sends up to 2 messages to all the clients.
@@ -103,9 +103,9 @@ static inline int8_t getStatus(uint8_t request_log, int context_log)
*/
static int dlt_daemon_client_send_all_multiple(DltDaemon *daemon,
DltDaemonLocal *daemon_local,
- void* data1,
+ void *data1,
int size1,
- void* data2,
+ void *data2,
int size2,
int verbose)
{
@@ -115,8 +115,7 @@ static int dlt_daemon_client_send_all_multiple(DltDaemon *daemon,
(DLT_CON_MASK_CLIENT_MSG_TCP | DLT_CON_MASK_CLIENT_MSG_SERIAL);
uint8_t *tmp_buffer = NULL;
- if ((daemon == NULL) || (daemon_local == NULL))
- {
+ if ((daemon == NULL) || (daemon_local == NULL)) {
dlt_vlog(LOG_ERR, "%s: Invalid parameters\n", __func__);
return 0;
}
@@ -128,50 +127,48 @@ static int dlt_daemon_client_send_all_multiple(DltDaemon *daemon,
* can be affect between each iteration, but
* dlt_daemon_close_socket may call us too ...
*/
- for (j = 0; ((j < daemon_local->client_connections) && (temp != NULL)); j++)
- {
+ for (j = 0; ((j < daemon_local->client_connections) && (temp != NULL)); j++) {
int ret = 0;
DLT_DAEMON_SEM_LOCK();
DltConnection *next = dlt_connection_get_next(temp->next, type_mask);
ret = dlt_connection_send_multiple(temp,
- data1,
- size1,
- data2,
- size2,
- daemon->sendserialheader);
+ data1,
+ size1,
+ data2,
+ size2,
+ daemon->sendserialheader);
DLT_DAEMON_SEM_FREE();
if ((ret != DLT_DAEMON_ERROR_OK) &&
- (DLT_CONNECTION_CLIENT_MSG_TCP == temp->type))
- {
- if (daemon->state != DLT_DAEMON_STATE_BUFFER_FULL)
- {
- if (temp->receiver->bytes_sent < (size1 + size2))
- {
- tmp_buffer = (uint8_t*)calloc(size1 + size2, sizeof(uint8_t));
-
- if (tmp_buffer == NULL)
- {
+ (DLT_CONNECTION_CLIENT_MSG_TCP == temp->type)) {
+ if (daemon->state != DLT_DAEMON_STATE_BUFFER_FULL) {
+ if (temp->receiver->bytes_sent < (size1 + size2)) {
+ tmp_buffer = (uint8_t *)calloc(size1 + size2, sizeof(uint8_t));
+
+ if (tmp_buffer == NULL) {
dlt_vlog(LOG_ERR, "%s: Memory allocation failed.\n", __func__);
return 0;
}
+
memcpy(tmp_buffer, data1, size1);
memcpy(tmp_buffer + size1, data2, size2);
DLT_DAEMON_SEM_LOCK();
+
/* Store message in history buffer */
if (dlt_buffer_push3(&(daemon->client_ringbuffer),
tmp_buffer + temp->receiver->bytes_sent,
(size1 + size2 - temp->receiver->bytes_sent),
- 0, 0, 0, 0) < DLT_RETURN_OK)
- {
+ 0, 0, 0, 0) < DLT_RETURN_OK) {
dlt_vlog(LOG_DEBUG, "%s: Buffer is full! Message discarded.\n", __func__);
dlt_daemon_change_state(daemon, DLT_DAEMON_STATE_BUFFER_FULL);
}
+
free(tmp_buffer);
DLT_DAEMON_SEM_FREE();
}
}
+
dlt_daemon_close_socket(temp->receiver->fd,
daemon,
daemon_local,
@@ -179,16 +176,12 @@ static int dlt_daemon_client_send_all_multiple(DltDaemon *daemon,
}
if (ret != DLT_DAEMON_ERROR_OK)
- {
dlt_vlog(LOG_WARNING, "%s: send dlt message failed\n", __func__);
- }
else
- {
/* If sent to at least one client,
* then do not store in ring buffer
*/
sent = 1;
- }
temp = next;
} /* for */
@@ -213,8 +206,7 @@ int dlt_daemon_client_send_all(DltDaemon *daemon,
int ret = 0;
char local_str[DLT_DAEMON_TEXTBUFSIZE];
- if ((daemon == NULL) || (daemon_local == NULL))
- {
+ if ((daemon == NULL) || (daemon_local == NULL)) {
snprintf(local_str,
DLT_DAEMON_TEXTBUFSIZE,
"%s: Invalid parameters\n",
@@ -234,77 +226,81 @@ int dlt_daemon_client_send_all(DltDaemon *daemon,
DLT_DAEMON_SEM_FREE();
ret = dlt_daemon_client_send_all_multiple(daemon,
- daemon_local,
- msg1,
- msg1_sz,
- msg2,
- msg2_sz,
- verbose);
+ daemon_local,
+ msg1,
+ msg1_sz,
+ msg2,
+ msg2_sz,
+ verbose);
return ret;
}
-int dlt_daemon_client_send(int sock,DltDaemon *daemon,DltDaemonLocal *daemon_local,void* storage_header,int storage_header_size,void* data1,int size1,void* data2,int size2,int verbose)
+int dlt_daemon_client_send(int sock,
+ DltDaemon *daemon,
+ DltDaemonLocal *daemon_local,
+ void *storage_header,
+ int storage_header_size,
+ void *data1,
+ int size1,
+ void *data2,
+ int size2,
+ int verbose)
{
- int sent,ret;
+ int sent, ret;
- if (sock!=DLT_DAEMON_SEND_TO_ALL && sock!=DLT_DAEMON_SEND_FORCE)
- {
+ if ((sock != DLT_DAEMON_SEND_TO_ALL) && (sock != DLT_DAEMON_SEND_FORCE)) {
/* Send message to specific socket */
- if (isatty(sock))
- {
+ if (isatty(sock)) {
DLT_DAEMON_SEM_LOCK();
- if((ret=dlt_daemon_serial_send(sock,data1,size1,data2,size2,daemon->sendserialheader)))
- {
+ if ((ret = dlt_daemon_serial_send(sock, data1, size1, data2, size2, daemon->sendserialheader))) {
DLT_DAEMON_SEM_FREE();
- dlt_log(LOG_WARNING,"dlt_daemon_client_send: serial send dlt message failed\n");
+ dlt_log(LOG_WARNING, "dlt_daemon_client_send: serial send dlt message failed\n");
return ret;
- }
+ }
DLT_DAEMON_SEM_FREE();
}
- else
- {
+ else {
DLT_DAEMON_SEM_LOCK();
- if((ret=dlt_daemon_socket_send(sock,data1,size1,data2,size2,daemon->sendserialheader)))
- {
+ if ((ret = dlt_daemon_socket_send(sock, data1, size1, data2, size2, daemon->sendserialheader))) {
DLT_DAEMON_SEM_FREE();
- dlt_log(LOG_WARNING,"dlt_daemon_client_send: socket send dlt message failed\n");
+ dlt_log(LOG_WARNING, "dlt_daemon_client_send: socket send dlt message failed\n");
return ret;
}
DLT_DAEMON_SEM_FREE();
}
+
return DLT_DAEMON_ERROR_OK;
}
- /* write message to offline trace */
- // 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])
- {
- if(dlt_offline_trace_write(&(daemon_local->offlineTrace),storage_header,storage_header_size,data1,size1,data2,size2))
- {
- static int error_dlt_offline_trace_write_failed = 0;
- if(!error_dlt_offline_trace_write_failed)
- {
- dlt_log(LOG_ERR,"dlt_daemon_client_send: dlt_offline_trace_write failed!\n");
- error_dlt_offline_trace_write_failed = 1;
+ /* write message to offline trace */
+ /* 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]) {
+ if (dlt_offline_trace_write(&(daemon_local->offlineTrace), storage_header, storage_header_size, data1,
+ size1, data2, size2)) {
+ static int error_dlt_offline_trace_write_failed = 0;
+
+ if (!error_dlt_offline_trace_write_failed) {
+ dlt_log(LOG_ERR, "dlt_daemon_client_send: dlt_offline_trace_write failed!\n");
+ error_dlt_offline_trace_write_failed = 1;
}
- //return DLT_DAEMON_ERROR_WRITE_FAILED;
- }
- }
+
+ /*return DLT_DAEMON_ERROR_WRITE_FAILED; */
+ }
+ }
+
/* write messages to offline logstorage only if there is an extended header set
* this need to be checked because the function is dlt_daemon_client_send is called by
* newly introduced dlt_daemon_log_internal */
- if(daemon_local->flags.offlineLogstorageMaxDevices > 0)
- {
+ if (daemon_local->flags.offlineLogstorageMaxDevices > 0)
dlt_daemon_logstorage_write(daemon,
&daemon_local->flags,
storage_header,
@@ -313,14 +309,11 @@ int dlt_daemon_client_send(int sock,DltDaemon *daemon,DltDaemonLocal *daemon_loc
size1,
data2,
size2);
- }
- }
+ }
- /* send messages to daemon socket */
- if((daemon->mode == DLT_USER_MODE_EXTERNAL) || (daemon->mode == DLT_USER_MODE_BOTH))
- {
- if ((sock==DLT_DAEMON_SEND_FORCE) || (daemon->state == DLT_DAEMON_STATE_SEND_DIRECT))
- {
+ /* send messages to daemon socket */
+ if ((daemon->mode == DLT_USER_MODE_EXTERNAL) || (daemon->mode == DLT_USER_MODE_BOTH)) {
+ if ((sock == DLT_DAEMON_SEND_FORCE) || (daemon->state == DLT_DAEMON_STATE_SEND_DIRECT)) {
sent = dlt_daemon_client_send_all_multiple(daemon,
daemon_local,
data1,
@@ -329,28 +322,28 @@ int dlt_daemon_client_send(int sock,DltDaemon *daemon,DltDaemonLocal *daemon_loc
size2,
verbose);
- if((sock==DLT_DAEMON_SEND_FORCE) && !sent)
- {
- return DLT_DAEMON_ERROR_SEND_FAILED;
- }
- }
+ if ((sock == DLT_DAEMON_SEND_FORCE) && !sent)
+ return DLT_DAEMON_ERROR_SEND_FAILED;
+ }
}
/* Message was not sent to client, so store it in client ringbuffer */
- if ((sock!=DLT_DAEMON_SEND_FORCE) && (daemon->state == DLT_DAEMON_STATE_BUFFER || daemon->state == DLT_DAEMON_STATE_SEND_BUFFER || daemon->state == DLT_DAEMON_STATE_BUFFER_FULL))
- {
- if(daemon->state == DLT_DAEMON_STATE_BUFFER_FULL)
- return DLT_DAEMON_ERROR_BUFFER_FULL;
+ if ((sock != DLT_DAEMON_SEND_FORCE) &&
+ ((daemon->state == DLT_DAEMON_STATE_BUFFER) || (daemon->state == DLT_DAEMON_STATE_SEND_BUFFER) ||
+ (daemon->state == DLT_DAEMON_STATE_BUFFER_FULL))) {
+ if (daemon->state == DLT_DAEMON_STATE_BUFFER_FULL)
+ return DLT_DAEMON_ERROR_BUFFER_FULL;
DLT_DAEMON_SEM_LOCK();
+
/* Store message in history buffer */
- if (dlt_buffer_push3(&(daemon->client_ringbuffer),data1,size1,data2,size2,0, 0) < DLT_RETURN_OK)
- {
- DLT_DAEMON_SEM_FREE();
- dlt_log(LOG_DEBUG,"dlt_daemon_client_send: Buffer is full! Message discarded.\n");
- dlt_daemon_change_state(daemon,DLT_DAEMON_STATE_BUFFER_FULL);
- return DLT_DAEMON_ERROR_BUFFER_FULL;
- }
+ if (dlt_buffer_push3(&(daemon->client_ringbuffer), data1, size1, data2, size2, 0, 0) < DLT_RETURN_OK) {
+ DLT_DAEMON_SEM_FREE();
+ dlt_log(LOG_DEBUG, "dlt_daemon_client_send: Buffer is full! Message discarded.\n");
+ dlt_daemon_change_state(daemon, DLT_DAEMON_STATE_BUFFER_FULL);
+ return DLT_DAEMON_ERROR_BUFFER_FULL;
+ }
+
DLT_DAEMON_SEM_FREE();
}
@@ -358,136 +351,133 @@ int dlt_daemon_client_send(int sock,DltDaemon *daemon,DltDaemonLocal *daemon_loc
}
-int dlt_daemon_client_send_control_message( int sock, DltDaemon *daemon, DltDaemonLocal *daemon_local, DltMessage *msg, char* appid, char* ctid, int verbose)
+int dlt_daemon_client_send_control_message(int sock,
+ DltDaemon *daemon,
+ DltDaemonLocal *daemon_local,
+ DltMessage *msg,
+ char *appid,
+ char *ctid,
+ int verbose)
{
- int ret;
+ int ret;
int32_t len;
PRINT_FUNCTION_VERBOSE(verbose);
- if ((daemon==0) || (msg==0) || (appid==0) || (ctid==0))
- {
+ if ((daemon == 0) || (msg == 0) || (appid == 0) || (ctid == 0))
return DLT_DAEMON_ERROR_UNKNOWN;
- }
/* prepare storage header */
- msg->storageheader = (DltStorageHeader*)msg->headerbuffer;
+ msg->storageheader = (DltStorageHeader *)msg->headerbuffer;
- if (dlt_set_storageheader(msg->storageheader,daemon->ecuid) == DLT_RETURN_ERROR)
- {
- return DLT_DAEMON_ERROR_UNKNOWN;
- }
+ if (dlt_set_storageheader(msg->storageheader, daemon->ecuid) == DLT_RETURN_ERROR)
+ return DLT_DAEMON_ERROR_UNKNOWN;
/* 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 ;
+ 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);
+#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);
+ dlt_set_id(msg->headerextra.ecu, daemon->ecuid);
- //msg->headerextra.seid = 0;
+ /*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 =
+ (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 */
- }
+
+ 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 */
- }
+
+ 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);
+ 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_WARNING,"Huge control message discarded!\n");
+ len = msg->headersize - sizeof(DltStorageHeader) + msg->datasize;
+
+ if (len > UINT16_MAX) {
+ dlt_log(LOG_WARNING, "Huge control message discarded!\n");
return DLT_DAEMON_ERROR_UNKNOWN;
}
msg->standardheader->len = DLT_HTOBE_16(((uint16_t)len));
- if((ret=dlt_daemon_client_send(sock,daemon,daemon_local,msg->headerbuffer,sizeof(DltStorageHeader),msg->headerbuffer+sizeof(DltStorageHeader),msg->headersize-sizeof(DltStorageHeader),
- msg->databuffer,msg->datasize,verbose)))
- {
- dlt_log(LOG_DEBUG,"dlt_daemon_control_send_control_message: DLT message send to all failed!.\n");
- return ret;
- }
+ if ((ret =
+ dlt_daemon_client_send(sock, daemon, daemon_local, msg->headerbuffer, sizeof(DltStorageHeader),
+ msg->headerbuffer + sizeof(DltStorageHeader),
+ msg->headersize - sizeof(DltStorageHeader),
+ msg->databuffer, msg->datasize, verbose))) {
+ dlt_log(LOG_DEBUG, "dlt_daemon_control_send_control_message: DLT message send to all failed!.\n");
+ return ret;
+ }
return DLT_DAEMON_ERROR_OK;
}
-int dlt_daemon_client_process_control(int sock, DltDaemon *daemon, DltDaemonLocal *daemon_local, DltMessage *msg, int verbose)
+int dlt_daemon_client_process_control(int sock,
+ DltDaemon *daemon,
+ DltDaemonLocal *daemon_local,
+ DltMessage *msg,
+ int verbose)
{
- uint32_t id,id_tmp=0;
+ uint32_t id, id_tmp = 0;
DltStandardHeaderExtra extra;
PRINT_FUNCTION_VERBOSE(verbose);
- if (daemon == NULL || daemon_local == NULL|| msg == NULL)
- {
+ if ((daemon == NULL) || (daemon_local == NULL) || (msg == NULL))
return -1;
- }
if (msg->datasize < (int32_t)sizeof(uint32_t))
- {
return -1;
- }
extra = msg->headerextra;
/* check if the message needs to be forwarded */
- if (daemon_local->flags.gatewayMode == 1)
- {
+ if (daemon_local->flags.gatewayMode == 1) {
if (strcmp(daemon_local->flags.evalue, extra.ecu) != 0)
- {
return dlt_gateway_forward_control_message(&daemon_local->pGateway,
daemon_local,
msg,
extra.ecu,
verbose);
- }
}
- id_tmp = *((uint32_t*)(msg->databuffer));
- id=DLT_ENDIAN_GET_32(msg->standardheader->htyp ,id_tmp);
- if ((id > 0) && (id < DLT_SERVICE_ID_CALLSW_CINJECTION))
- {
+ id_tmp = *((uint32_t *)(msg->databuffer));
+ id = DLT_ENDIAN_GET_32(msg->standardheader->htyp, id_tmp);
+
+ if ((id > 0) && (id < DLT_SERVICE_ID_CALLSW_CINJECTION)) {
/* Control message handling */
- switch (id)
- {
+ switch (id) {
case DLT_SERVICE_ID_SET_LOG_LEVEL:
{
- dlt_daemon_control_set_log_level(sock, daemon, daemon_local, msg, verbose);
+ 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);
+ dlt_daemon_control_set_trace_status(sock, daemon, daemon_local, msg, verbose);
break;
}
case DLT_SERVICE_ID_GET_LOG_INFO:
@@ -502,100 +492,157 @@ int dlt_daemon_client_process_control(int sock, DltDaemon *daemon, DltDaemonLoca
}
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);
+ 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
- {
+ else {
/* Delete saved files */
- dlt_daemon_control_reset_to_factory_default(daemon, daemon->runtime_application_cfg, daemon->runtime_context_cfg, daemon_local->flags.contextLogLevel, daemon_local->flags.contextTraceStatus, daemon_local->flags.enforceContextLLAndTS, verbose);
- dlt_daemon_control_service_response(sock, daemon, daemon_local, id, DLT_SERVICE_RESPONSE_ERROR, verbose);
+ dlt_daemon_control_reset_to_factory_default(daemon,
+ daemon->runtime_application_cfg,
+ daemon->runtime_context_cfg,
+ daemon_local->flags.contextLogLevel,
+ daemon_local->flags.contextTraceStatus,
+ daemon_local->flags.enforceContextLLAndTS,
+ 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);
+ 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, daemon_local->flags.contextLogLevel, daemon_local->flags.contextTraceStatus, daemon_local->flags.enforceContextLLAndTS, verbose);
- dlt_daemon_control_service_response(sock, daemon, daemon_local, id, DLT_SERVICE_RESPONSE_OK, verbose);
+ dlt_daemon_control_reset_to_factory_default(daemon,
+ daemon->runtime_application_cfg,
+ daemon->runtime_context_cfg,
+ daemon_local->flags.contextLogLevel,
+ daemon_local->flags.contextTraceStatus,
+ daemon_local->flags.enforceContextLLAndTS,
+ 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);
+ 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);
+ 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);
+ 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);
+ 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);
+ 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);
+ 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);
+ 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);
+ 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);
+ 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);
+ 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);
+ 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);
+ 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);
+ 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);
+ dlt_daemon_control_message_buffer_overflow(sock, daemon, daemon_local, daemon->overflow_counter, "",
+ verbose);
break;
}
case DLT_SERVICE_ID_SET_ALL_LOG_LEVEL:
@@ -625,22 +672,26 @@ int dlt_daemon_client_process_control(int sock, DltDaemon *daemon, DltDaemonLoca
case DLT_SERVICE_ID_PASSIVE_NODE_CONNECTION_STATUS:
{
dlt_daemon_control_passive_node_connect_status(sock,
- daemon,
- daemon_local,
- verbose);
+ daemon,
+ daemon_local,
+ verbose);
break;
}
default:
{
- dlt_daemon_control_service_response(sock, daemon, daemon_local, id, DLT_SERVICE_RESPONSE_NOT_SUPPORTED, verbose);
+ dlt_daemon_control_service_response(sock,
+ daemon,
+ daemon_local,
+ id,
+ DLT_SERVICE_RESPONSE_NOT_SUPPORTED,
+ verbose);
break;
}
}
}
- else
- {
+ else {
/* Injection handling */
- dlt_daemon_control_callsw_cinjection(sock, daemon, daemon_local, msg, verbose);
+ dlt_daemon_control_callsw_cinjection(sock, daemon, daemon_local, msg, verbose);
}
return 0;
@@ -650,194 +701,213 @@ void dlt_daemon_control_get_software_version(int sock, DltDaemon *daemon, DltDae
{
DltMessage msg;
uint32_t len;
- DltServiceGetSoftwareVersionResponse *resp;
+ DltServiceGetSoftwareVersionResponse *resp;
PRINT_FUNCTION_VERBOSE(verbose);
- if (daemon==0)
- {
+ if (daemon == 0)
return;
- }
/* initialise new message */
- if (dlt_message_init(&msg,0) == DLT_RETURN_ERROR)
- {
- dlt_daemon_control_service_response(sock, daemon,daemon_local, DLT_SERVICE_ID_GET_SOFTWARE_VERSION, DLT_SERVICE_RESPONSE_ERROR, verbose);
- return;
+ if (dlt_message_init(&msg, 0) == DLT_RETURN_ERROR) {
+ 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))
- {
+
+ if (msg.databuffer && (msg.databuffersize < msg.datasize)) {
free(msg.databuffer);
- msg.databuffer=0;
+ msg.databuffer = 0;
}
- if (msg.databuffer == 0){
- msg.databuffer = (uint8_t *) malloc(msg.datasize);
- msg.databuffersize = msg.datasize;
+
+ 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);
+
+ 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 = (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);
+ memcpy(msg.databuffer + sizeof(DltServiceGetSoftwareVersionResponse), daemon->ECUVersionString, len);
/* send message */
- dlt_daemon_client_send_control_message(sock, daemon,daemon_local, &msg,"","", verbose);
+ dlt_daemon_client_send_control_message(sock, daemon, daemon_local, &msg, "", "", verbose);
/* free message */
- dlt_message_free(&msg,0);
+ 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;
+ DltServiceGetDefaultLogLevelResponse *resp;
PRINT_FUNCTION_VERBOSE(verbose);
- if (daemon==0)
- {
+ if (daemon == 0)
return;
- }
/* initialise new message */
- if (dlt_message_init(&msg,0) == DLT_RETURN_ERROR)
- {
- dlt_daemon_control_service_response(sock, daemon,daemon_local, DLT_SERVICE_ID_GET_DEFAULT_LOG_LEVEL, DLT_SERVICE_RESPONSE_ERROR, verbose);
+ if (dlt_message_init(&msg, 0) == DLT_RETURN_ERROR) {
+ 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))
- {
+
+ if (msg.databuffer && (msg.databuffersize < msg.datasize)) {
free(msg.databuffer);
- msg.databuffer=0;
+ msg.databuffer = 0;
}
- if (msg.databuffer == 0){
- msg.databuffer = (uint8_t *) malloc(msg.datasize);
- msg.databuffersize = msg.datasize;
+
+ 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);
+
+ 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 = (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_client_send_control_message(sock,daemon,daemon_local,&msg,"","", verbose);
+ dlt_daemon_client_send_control_message(sock, daemon, daemon_local, &msg, "", "", verbose);
/* free message */
- dlt_message_free(&msg,0);
+ dlt_message_free(&msg, 0);
}
-void dlt_daemon_control_get_log_info(int sock, DltDaemon *daemon, DltDaemonLocal *daemon_local, DltMessage *msg, int verbose)
+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;
+ DltDaemonContext *context = 0;
+ DltDaemonApplication *application = 0;
- int num_applications=0, num_contexts=0;
- uint16_t count_app_ids=0, count_con_ids=0;
+ int num_applications = 0, num_contexts = 0;
+ uint16_t count_app_ids = 0, count_con_ids = 0;
-#if (DLT_DEBUG_GETLOGINFO==1)
+#if (DLT_DEBUG_GETLOGINFO == 1)
char buf[255];
#endif
- int32_t i,j,offset=0;
- char *apid=0;
- int8_t ll,ts;
+ int32_t i, j, offset = 0;
+ char *apid = 0;
+ int8_t ll, ts;
uint16_t len;
int8_t value;
- int32_t sizecont=0;
+ int32_t sizecont = 0;
int offset_base;
uint32_t sid;
- DltDaemonRegisteredUsers* user_list = NULL;
+ DltDaemonRegisteredUsers *user_list = NULL;
PRINT_FUNCTION_VERBOSE(verbose);
if ((daemon == NULL) || (msg == NULL) || (msg->databuffer == NULL))
- {
return;
- }
if (DLT_CHECK_RCV_DATA_SIZE(msg->datasize, sizeof(DltServiceGetLogInfoRequest)) < 0)
- {
return;
- }
user_list = dlt_daemon_find_users_list(daemon, daemon->ecuid, verbose);
+
if (user_list == NULL)
- {
return;
- }
/* prepare pointer to message request */
- req = (DltServiceGetLogInfoRequest*) (msg->databuffer);
+ req = (DltServiceGetLogInfoRequest *)(msg->databuffer);
/* initialise new message */
- if (dlt_message_init(&resp,0) == DLT_RETURN_ERROR)
- {
- dlt_daemon_control_service_response(sock, daemon,daemon_local, DLT_SERVICE_ID_GET_LOG_INFO, DLT_SERVICE_RESPONSE_ERROR, verbose);
+ if (dlt_message_init(&resp, 0) == DLT_RETURN_ERROR) {
+ 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);
+ 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')
- {
+ if (req->apid[0] != '\0') {
application = dlt_daemon_application_find(daemon,
req->apid,
daemon->ecuid,
verbose);
- if (application)
- {
+
+ if (application) {
num_applications = 1;
- if (req->ctid[0]!='\0')
- {
+
+ if (req->ctid[0] != '\0') {
context = dlt_daemon_context_find(daemon,
req->apid,
req->ctid,
daemon->ecuid,
verbose);
- num_contexts = ((context)?1:0);
+ num_contexts = ((context) ? 1 : 0);
}
- else
- {
+ else {
num_contexts = application->num_contexts;
}
}
- else
- {
+ else {
num_applications = 0;
num_contexts = 0;
}
}
- else
- {
+ else {
/* Request all applications and contexts */
num_applications = user_list->num_applications;
num_contexts = user_list->num_contexts;
@@ -851,161 +921,134 @@ void dlt_daemon_control_get_log_info(int sock, DltDaemon *daemon, DltDaemonLocal
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))
- {
+ 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 */
- }
+ 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 += (num_applications * (sizeof(uint32_t) /* app_id */ + sizeof(uint16_t) /* count_con_ids */)) +
+ (num_contexts * sizecont);
- resp.datasize+= sizeof(uint16_t) /* count_app_ids */;
+ 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')
- {
+ 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 */
- }
+ /* 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 ((user_list->applications) && (application))
- {
- /* Calculate start offset within contexts[] */
- offset_base=0;
- for (i = 0; i < (application - (user_list->applications)); i++)
- {
- offset_base += user_list->applications[i].num_contexts;
- }
+ /* One application, all contexts */
+ if ((user_list->applications) && (application)) {
+ /* Calculate start offset within contexts[] */
+ offset_base = 0;
- /* Iterate over all contexts belonging to this application */
- for (j=0;j<application->num_contexts;j++)
- {
+ for (i = 0; i < (application - (user_list->applications)); i++)
+ offset_base += user_list->applications[i].num_contexts;
- context = &(user_list->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 */
- }
- }
+ /* Iterate over all contexts belonging to this application */
+ for (j = 0; j < application->num_contexts; j++) {
+
+ context = &(user_list->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 */
- }
+ if (application) {
+ resp.datasize += sizeof(uint16_t) /* len_app_description */;
+
+ if (application->application_description != 0)
+ resp.datasize += strlen(application->application_description); /* app_description */
}
}
- else
- {
+ else {
/* All applications, all contexts */
- for (i = 0; i < user_list->num_contexts; i++)
- {
- resp.datasize+=sizeof(uint16_t) /* len_context_description */;
+ for (i = 0; i < user_list->num_contexts; i++) {
+ resp.datasize += sizeof(uint16_t) /* len_context_description */;
+
if (user_list->contexts[i].context_description != 0)
- {
resp.datasize +=
- strlen(user_list->contexts[i].context_description);
- }
+ strlen(user_list->contexts[i].context_description);
}
- for (i = 0; i < user_list->num_applications; i++)
- {
+ for (i = 0; i < user_list->num_applications; i++) {
resp.datasize += sizeof(uint16_t) /* len_app_description */;
+
if (user_list->applications[i].application_description != 0)
- {
resp.datasize += strlen(user_list->applications[i].application_description); /* app_description */
- }
}
}
}
if (verbose)
- {
dlt_vlog(LOG_DEBUG,
"Allocate %d bytes for response msg databuffer\n",
resp.datasize);
- }
/* Allocate buffer for response message */
- resp.databuffer = (uint8_t *) malloc(resp.datasize);
+ 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);
+ 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);
+
+ 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);
+ 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 */
+ 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);
+ 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 (count_app_ids != 0) {
+ memcpy(resp.databuffer + offset, &count_app_ids, sizeof(uint16_t));
+ offset += sizeof(uint16_t);
-#if (DLT_DEBUG_GETLOGINFO==1)
- snprintf(str,DLT_DAEMON_TEXTBUFSIZE,"#apid: %d \n", count_app_ids);
+#if (DLT_DEBUG_GETLOGINFO == 1)
+ snprintf(str, DLT_DAEMON_TEXTBUFSIZE, "#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')
- {
+ for (i = 0; i < count_app_ids; i++) {
+ if (req->apid[0] != '\0') {
apid = req->apid;
}
- else
- {
+ else {
if (user_list->applications)
- {
apid = user_list->applications[i].apid;
- }
else
- {
/* This should never occur! */
- apid=0;
- }
+ apid = 0;
}
application = dlt_daemon_application_find(daemon,
@@ -1013,349 +1056,345 @@ void dlt_daemon_control_get_log_info(int sock, DltDaemon *daemon, DltDaemonLocal
daemon->ecuid,
verbose);
- if (application)
- {
+ if (application) {
/* Calculate start offset within contexts[] */
- offset_base=0;
- for (j = 0; j < (application-(user_list->applications)); j++)
- {
+ offset_base = 0;
+
+ for (j = 0; j < (application - (user_list->applications)); j++)
offset_base += user_list->applications[j].num_contexts;
- }
- dlt_set_id((char*)(resp.databuffer + offset), apid);
+ dlt_set_id((char *)(resp.databuffer + offset), apid);
offset += sizeof(ID4);
-#if (DLT_DEBUG_GETLOGINFO==1)
+#if (DLT_DEBUG_GETLOGINFO == 1)
dlt_print_id(buf, apid);
- snprintf(str,DLT_DAEMON_TEXTBUFSIZE,"apid: %s\n",buf);
+ snprintf(str, DLT_DAEMON_TEXTBUFSIZE, "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));
+ memcpy(resp.databuffer + offset, &count_con_ids, sizeof(uint16_t));
offset += sizeof(uint16_t);
-#if (DLT_DEBUG_GETLOGINFO==1)
- snprintf(str,DLT_DAEMON_TEXTBUFSIZE,"#ctid: %d \n", count_con_ids);
+#if (DLT_DEBUG_GETLOGINFO == 1)
+ snprintf(str, DLT_DAEMON_TEXTBUFSIZE, "#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)
- snprintf(str,DLT_DAEMON_TEXTBUFSIZE,"j: %d \n",j);
+ for (j = 0; j < count_con_ids; j++) {
+#if (DLT_DEBUG_GETLOGINFO == 1)
+ snprintf(str, DLT_DAEMON_TEXTBUFSIZE, "j: %d \n", j);
dlt_log(LOG_DEBUG, str);
#endif
+
if (!((count_con_ids == 1) && (req->apid[0] != '\0') &&
- (req->ctid[0] != '\0')))
- {
+ (req->ctid[0] != '\0')))
context = &(user_list->contexts[offset_base + j]);
- }
+
/* else: context was already searched and found
- (one application (found) with one context (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);
+ ((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)
+#if (DLT_DEBUG_GETLOGINFO == 1)
dlt_print_id(buf, context->ctid);
- snprintf(str,DLT_DAEMON_TEXTBUFSIZE,"ctid: %s \n",buf);
+ snprintf(str, DLT_DAEMON_TEXTBUFSIZE, "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);
+ 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);
+ 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)
- {
+ 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);
+ 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
- {
+ else {
len = 0;
- memcpy(resp.databuffer+offset,&len,sizeof(uint16_t));
- offset+=sizeof(uint16_t);
+ memcpy(resp.databuffer + offset, &len, sizeof(uint16_t));
+ offset += sizeof(uint16_t);
}
}
-#if (DLT_DEBUG_GETLOGINFO==1)
- snprintf(str,DLT_DAEMON_TEXTBUFSIZE,"ll=%d ts=%d \n",(int32_t)ll,(int32_t)ts);
+#if (DLT_DEBUG_GETLOGINFO == 1)
+ snprintf(str, DLT_DAEMON_TEXTBUFSIZE, "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");
+#if (DLT_DEBUG_GETLOGINFO == 1)
+ dlt_log(LOG_DEBUG, "\n");
#endif
}
/* Mode 7 */
- if (req->options==7)
- {
- if (application->application_description)
- {
+ 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);
+ 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
- {
+ else {
len = 0;
- memcpy(resp.databuffer+offset,&len,sizeof(uint16_t));
- offset+=sizeof(uint16_t);
+ 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);
+ dlt_set_id((char *)(resp.databuffer + offset), DLT_DAEMON_REMO_STRING);
/* send message */
- dlt_daemon_client_send_control_message(sock,daemon,daemon_local,&resp,"","", verbose);
+ dlt_daemon_client_send_control_message(sock, daemon, daemon_local, &resp, "", "", verbose);
/* free message */
- dlt_message_free(&resp,0);
+ 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)
+int dlt_daemon_control_message_buffer_overflow(int sock,
+ DltDaemon *daemon,
+ DltDaemonLocal *daemon_local,
+ unsigned int overflow_counter,
+ char *apid,
+ int verbose)
{
- int ret;
+ int ret;
DltMessage msg;
- DltServiceMessageBufferOverflowResponse *resp;
+ DltServiceMessageBufferOverflowResponse *resp;
PRINT_FUNCTION_VERBOSE(verbose);
- if (daemon==0)
- {
+ if (daemon == 0)
return DLT_DAEMON_ERROR_UNKNOWN;
- }
/* initialise new message */
- if (dlt_message_init(&msg,0) == DLT_RETURN_ERROR)
- {
- dlt_daemon_control_service_response(sock, daemon,daemon_local, DLT_SERVICE_ID_MESSAGE_BUFFER_OVERFLOW, DLT_SERVICE_RESPONSE_ERROR, verbose);
- return DLT_DAEMON_ERROR_UNKNOWN;
+ if (dlt_message_init(&msg, 0) == DLT_RETURN_ERROR) {
+ dlt_daemon_control_service_response(sock,
+ daemon,
+ daemon_local,
+ DLT_SERVICE_ID_MESSAGE_BUFFER_OVERFLOW,
+ DLT_SERVICE_RESPONSE_ERROR,
+ verbose);
+ return DLT_DAEMON_ERROR_UNKNOWN;
}
/* prepare payload of data */
msg.datasize = sizeof(DltServiceMessageBufferOverflowResponse);
- if (msg.databuffer && (msg.databuffersize < msg.datasize))
- {
+
+ if (msg.databuffer && (msg.databuffersize < msg.datasize)) {
free(msg.databuffer);
- msg.databuffer=0;
+ msg.databuffer = 0;
}
- if (msg.databuffer == 0){
- msg.databuffer = (uint8_t *) malloc(msg.datasize);
- msg.databuffersize = msg.datasize;
+
+ if (msg.databuffer == 0) {
+ msg.databuffer = (uint8_t *)malloc(msg.datasize);
+ msg.databuffersize = msg.datasize;
}
- if (msg.databuffer==0)
- {
+
+ if (msg.databuffer == 0)
return DLT_DAEMON_ERROR_UNKNOWN;
- }
- resp = (DltServiceMessageBufferOverflowResponse*) msg.databuffer;
+ resp = (DltServiceMessageBufferOverflowResponse *)msg.databuffer;
resp->service_id = DLT_SERVICE_ID_MESSAGE_BUFFER_OVERFLOW;
resp->status = DLT_SERVICE_RESPONSE_OK;
resp->overflow = DLT_MESSAGE_BUFFER_OVERFLOW;
- resp->overflow_counter = overflow_counter;
+ resp->overflow_counter = overflow_counter;
/* send message */
- if((ret=dlt_daemon_client_send_control_message(sock,daemon,daemon_local,&msg,apid,"", verbose)))
- {
- dlt_message_free(&msg,0);
- return ret;
+ if ((ret = dlt_daemon_client_send_control_message(sock, daemon, daemon_local, &msg, apid, "", verbose))) {
+ dlt_message_free(&msg, 0);
+ return ret;
}
/* free message */
- dlt_message_free(&msg,0);
+ dlt_message_free(&msg, 0);
return DLT_DAEMON_ERROR_OK;
}
-void dlt_daemon_control_service_response( int sock, DltDaemon *daemon, DltDaemonLocal *daemon_local, uint32_t service_id, int8_t status , int verbose)
+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)
- {
+ if (daemon == 0)
return;
- }
/* initialise new message */
- if (dlt_message_init(&msg,0) == DLT_RETURN_ERROR)
- {
- return;
- }
+ if (dlt_message_init(&msg, 0) == DLT_RETURN_ERROR)
+ return;
/* prepare payload of data */
msg.datasize = sizeof(DltServiceResponse);
- if (msg.databuffer && (msg.databuffersize < msg.datasize))
- {
+
+ if (msg.databuffer && (msg.databuffersize < msg.datasize)) {
free(msg.databuffer);
- msg.databuffer=0;
+ msg.databuffer = 0;
}
- if (msg.databuffer == 0){
- msg.databuffer = (uint8_t *) malloc(msg.datasize);
- msg.databuffersize = msg.datasize;
+
+ if (msg.databuffer == 0) {
+ msg.databuffer = (uint8_t *)malloc(msg.datasize);
+ msg.databuffersize = msg.datasize;
}
- if (msg.databuffer==0)
- {
+
+ if (msg.databuffer == 0)
return;
- }
- resp = (DltServiceResponse*) msg.databuffer;
+ resp = (DltServiceResponse *)msg.databuffer;
resp->service_id = service_id;
resp->status = status;
/* send message */
- dlt_daemon_client_send_control_message(sock,daemon,daemon_local,&msg,"","", verbose);
+ dlt_daemon_client_send_control_message(sock, daemon, daemon_local, &msg, "", "", verbose);
/* free message */
- dlt_message_free(&msg,0);
+ 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)
+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)
- {
+ if (daemon == 0)
return -1;
- }
/* initialise new message */
- if (dlt_message_init(&msg,0) == DLT_RETURN_ERROR)
- {
- return -1;
- }
+ if (dlt_message_init(&msg, 0) == DLT_RETURN_ERROR)
+ return -1;
/* prepare payload of data */
msg.datasize = sizeof(DltServiceUnregisterContext);
- if (msg.databuffer && (msg.databuffersize < msg.datasize))
- {
+
+ if (msg.databuffer && (msg.databuffersize < msg.datasize)) {
free(msg.databuffer);
- msg.databuffer=0;
+ msg.databuffer = 0;
}
- if (msg.databuffer == 0){
- msg.databuffer = (uint8_t *) malloc(msg.datasize);
- msg.databuffersize = msg.datasize;
+
+ if (msg.databuffer == 0) {
+ msg.databuffer = (uint8_t *)malloc(msg.datasize);
+ msg.databuffersize = msg.datasize;
}
- if (msg.databuffer==0)
- {
+
+ if (msg.databuffer == 0)
return -1;
- }
- resp = (DltServiceUnregisterContext*) msg.databuffer;
+ 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);
+ dlt_set_id(resp->apid, apid);
+ dlt_set_id(resp->ctid, ctid);
+ dlt_set_id(resp->comid, comid);
/* send message */
- if(dlt_daemon_client_send_control_message(sock,daemon,daemon_local,&msg,"","", verbose))
- {
- dlt_message_free(&msg,0);
- return -1;
+ if (dlt_daemon_client_send_control_message(sock, daemon, daemon_local, &msg, "", "", verbose)) {
+ dlt_message_free(&msg, 0);
+ return -1;
}
/* free message */
- dlt_message_free(&msg,0);
+ 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)
+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)
- {
+ if (daemon == 0)
return -1;
- }
/* initialise new message */
- if (dlt_message_init(&msg,0) == DLT_RETURN_ERROR)
- {
- return -1;
- }
+ if (dlt_message_init(&msg, 0) == DLT_RETURN_ERROR)
+ return -1;
/* prepare payload of data */
msg.datasize = sizeof(DltServiceConnectionInfo);
- if (msg.databuffer && (msg.databuffersize < msg.datasize))
- {
+
+ if (msg.databuffer && (msg.databuffersize < msg.datasize)) {
free(msg.databuffer);
- msg.databuffer=0;
+ msg.databuffer = 0;
}
- if (msg.databuffer == 0){
- msg.databuffer = (uint8_t *) malloc(msg.datasize);
- msg.databuffersize = msg.datasize;
+
+ if (msg.databuffer == 0) {
+ msg.databuffer = (uint8_t *)malloc(msg.datasize);
+ msg.databuffersize = msg.datasize;
}
- if (msg.databuffer==0)
- {
+
+ if (msg.databuffer == 0)
return -1;
- }
- resp = (DltServiceConnectionInfo*) msg.databuffer;
+ 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_client_send_control_message(sock,daemon,daemon_local,&msg,"","", verbose))
- {
- dlt_message_free(&msg,0);
- return -1;
+ if (dlt_daemon_client_send_control_message(sock, daemon, daemon_local, &msg, "", "", verbose)) {
+ dlt_message_free(&msg, 0);
+ return -1;
}
/* free message */
- dlt_message_free(&msg,0);
+ dlt_message_free(&msg, 0);
return 0;
}
@@ -1367,54 +1406,49 @@ int dlt_daemon_control_message_timezone(int sock, DltDaemon *daemon, DltDaemonLo
PRINT_FUNCTION_VERBOSE(verbose);
- if (daemon==0)
- {
+ if (daemon == 0)
return -1;
- }
/* initialise new message */
- if (dlt_message_init(&msg,0) == DLT_RETURN_ERROR)
- {
- return -1;
- }
+ if (dlt_message_init(&msg, 0) == DLT_RETURN_ERROR)
+ return -1;
/* prepare payload of data */
msg.datasize = sizeof(DltServiceTimezone);
- if (msg.databuffer && (msg.databuffersize < msg.datasize))
- {
+
+ if (msg.databuffer && (msg.databuffersize < msg.datasize)) {
free(msg.databuffer);
- msg.databuffer=0;
+ msg.databuffer = 0;
}
- if (msg.databuffer == 0){
- msg.databuffer = (uint8_t *) malloc(msg.datasize);
- msg.databuffersize = msg.datasize;
+
+ if (msg.databuffer == 0) {
+ msg.databuffer = (uint8_t *)malloc(msg.datasize);
+ msg.databuffersize = msg.datasize;
}
- if (msg.databuffer==0)
- {
+
+ if (msg.databuffer == 0)
return -1;
- }
- resp = (DltServiceTimezone*) msg.databuffer;
+ resp = (DltServiceTimezone *)msg.databuffer;
resp->service_id = DLT_SERVICE_ID_TIMEZONE;
resp->status = DLT_SERVICE_RESPONSE_OK;
- time_t t = time(NULL);
- struct tm lt;
- localtime_r(&t, &lt);
+ time_t t = time(NULL);
+ struct tm lt;
+ localtime_r(&t, &lt);
#if !defined(__CYGWIN__)
- resp->timezone = (int32_t) lt.tm_gmtoff;
+ resp->timezone = (int32_t)lt.tm_gmtoff;
#endif
- resp->isdst = (uint8_t) lt.tm_isdst;
+ resp->isdst = (uint8_t)lt.tm_isdst;
/* send message */
- if(dlt_daemon_client_send_control_message(sock,daemon,daemon_local,&msg,"","", verbose))
- {
- dlt_message_free(&msg,0);
- return -1;
+ if (dlt_daemon_client_send_control_message(sock, daemon, daemon_local, &msg, "", "", verbose)) {
+ dlt_message_free(&msg, 0);
+ return -1;
}
/* free message */
- dlt_message_free(&msg,0);
+ dlt_message_free(&msg, 0);
return 0;
}
@@ -1426,98 +1460,92 @@ int dlt_daemon_control_message_marker(int sock, DltDaemon *daemon, DltDaemonLoca
PRINT_FUNCTION_VERBOSE(verbose);
- if (daemon==0)
- {
+ if (daemon == 0)
return -1;
- }
/* initialise new message */
- if (dlt_message_init(&msg,0) == DLT_RETURN_ERROR)
- {
- return -1;
- }
+ if (dlt_message_init(&msg, 0) == DLT_RETURN_ERROR)
+ return -1;
/* prepare payload of data */
msg.datasize = sizeof(DltServiceMarker);
- if (msg.databuffer && (msg.databuffersize < msg.datasize))
- {
+
+ if (msg.databuffer && (msg.databuffersize < msg.datasize)) {
free(msg.databuffer);
- msg.databuffer=0;
+ msg.databuffer = 0;
}
- if (msg.databuffer == 0){
- msg.databuffer = (uint8_t *) malloc(msg.datasize);
- msg.databuffersize = msg.datasize;
+
+ if (msg.databuffer == 0) {
+ msg.databuffer = (uint8_t *)malloc(msg.datasize);
+ msg.databuffersize = msg.datasize;
}
- if (msg.databuffer==0)
- {
+
+ if (msg.databuffer == 0)
return -1;
- }
- resp = (DltServiceMarker*) msg.databuffer;
+ resp = (DltServiceMarker *)msg.databuffer;
resp->service_id = DLT_SERVICE_ID_MARKER;
resp->status = DLT_SERVICE_RESPONSE_OK;
/* send message */
- if(dlt_daemon_client_send_control_message(sock,daemon,daemon_local,&msg,"","", verbose))
- {
- dlt_message_free(&msg,0);
- return -1;
+ if (dlt_daemon_client_send_control_message(sock, daemon, daemon_local, &msg, "", "", verbose)) {
+ dlt_message_free(&msg, 0);
+ return -1;
}
/* free message */
- dlt_message_free(&msg,0);
+ dlt_message_free(&msg, 0);
return 0;
}
-void dlt_daemon_control_callsw_cinjection(int sock, DltDaemon *daemon, DltDaemonLocal *daemon_local, DltMessage *msg, int verbose)
+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;
+ 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 data_length_inject = 0;
+ uint32_t data_length_inject_tmp = 0;
- int32_t datalength;
+ int32_t datalength;
- DltUserHeader userheader;
- DltUserControlMsgInjection usercontext;
- uint8_t *userbuffer;
+ DltUserHeader userheader;
+ DltUserControlMsgInjection usercontext;
+ uint8_t *userbuffer;
PRINT_FUNCTION_VERBOSE(verbose);
if ((daemon == NULL) || (msg == NULL) || (msg->databuffer == NULL))
- {
return;
- }
datalength = msg->datasize;
ptr = msg->databuffer;
- DLT_MSG_READ_VALUE(id_tmp,ptr,datalength,uint32_t); /* Get service id */
- id=DLT_ENDIAN_GET_32(msg->standardheader->htyp, id_tmp);
+ 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))
- {
+ 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;
+ 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);
+ 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))
- {
+ if (DLT_IS_HTYP_UEH(msg->standardheader->htyp)) {
dlt_set_id(apid, msg->extendedheader->apid);
dlt_set_id(ctid, msg->extendedheader->ctid);
}
- else
- {
+ 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);
+ dlt_daemon_control_service_response(sock, daemon, daemon_local, id, DLT_SERVICE_RESPONSE_ERROR, verbose);
return;
}
@@ -1528,73 +1556,73 @@ void dlt_daemon_control_callsw_cinjection(int sock, DltDaemon *daemon, DltDaemon
daemon->ecuid,
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);
+ 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) < DLT_RETURN_OK)
- {
- 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;
+ if (dlt_user_set_userheader(&userheader, DLT_USER_MESSAGE_INJECTION) < DLT_RETURN_OK) {
+ 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
- {
+ else {
/* Invalid ID */
- dlt_daemon_control_service_response(sock, daemon, daemon_local, id, DLT_SERVICE_RESPONSE_NOT_SUPPORTED, verbose);
+ dlt_daemon_control_service_response(sock, daemon, daemon_local, id, DLT_SERVICE_RESPONSE_NOT_SUPPORTED,
+ verbose);
}
}
-void dlt_daemon_send_log_level(int sock, DltDaemon *daemon, DltDaemonLocal *daemon_local, DltDaemonContext *context,int8_t loglevel, int verbose)
+void dlt_daemon_send_log_level(int sock,
+ DltDaemon *daemon,
+ DltDaemonLocal *daemon_local,
+ DltDaemonContext *context,
+ int8_t loglevel,
+ int verbose)
{
PRINT_FUNCTION_VERBOSE(verbose);
@@ -1605,17 +1633,14 @@ void dlt_daemon_send_log_level(int sock, DltDaemon *daemon, DltDaemonLocal *daem
context->log_level = loglevel; /* No endianess conversion necessary*/
if ((context->user_handle >= DLT_FD_MINIMUM) &&
- (dlt_daemon_user_send_log_level(daemon, context, verbose)==0))
- {
+ (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
- {
+ 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);
}
-
}
void dlt_daemon_find_multiple_context_and_send_log_level(int sock,
@@ -1631,102 +1656,116 @@ void dlt_daemon_find_multiple_context_and_send_log_level(int sock,
int count = 0;
DltDaemonContext *context = NULL;
- char src_str[DLT_ID_SIZE +1] = {0};
+ char src_str[DLT_ID_SIZE + 1] = { 0 };
int8_t ret = 0;
- DltDaemonRegisteredUsers* user_list = NULL;
+ DltDaemonRegisteredUsers *user_list = NULL;
- if (daemon == 0)
- {
+ if (daemon == 0) {
dlt_vlog(LOG_ERR, "%s: Invalid parameters\n", __func__);
return;
}
user_list = dlt_daemon_find_users_list(daemon, daemon->ecuid, verbose);
+
if (user_list == NULL)
- {
return;
- }
- for (count = 0; count < user_list->num_contexts; count++)
- {
+ for (count = 0; count < user_list->num_contexts; count++) {
context = &(user_list->contexts[count]);
- if (context)
- {
+ if (context) {
if (app_flag == 1)
- {
strncpy(src_str, context->apid, DLT_ID_SIZE);
- }
else
- {
strncpy(src_str, context->ctid, DLT_ID_SIZE);
- }
+
ret = strncmp(src_str, str, len);
+
if (ret == 0)
- {
dlt_daemon_send_log_level(sock, daemon, daemon_local, context, loglevel, verbose);
- }
else if ((ret > 0) && (app_flag == 1))
- {
break;
- }
else
- {
continue;
- }
}
}
}
-void dlt_daemon_control_set_log_level(int sock, DltDaemon *daemon, DltDaemonLocal *daemon_local, DltMessage *msg, int 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+1] = {0};
- char ctid[DLT_ID_SIZE+1] = {0};
+ char apid[DLT_ID_SIZE + 1] = { 0 };
+ char ctid[DLT_ID_SIZE + 1] = { 0 };
DltServiceSetLogLevel *req = NULL;
DltDaemonContext *context = NULL;
int8_t appid_length = 0;
int8_t ctxtid_length = 0;
if ((daemon == NULL) || (msg == NULL) || (msg->databuffer == NULL))
- {
return;
- }
if (DLT_CHECK_RCV_DATA_SIZE(msg->datasize, sizeof(DltServiceSetLogLevel)) < 0)
- {
return;
- }
- req = (DltServiceSetLogLevel*) (msg->databuffer);
+ req = (DltServiceSetLogLevel *)(msg->databuffer);
+
if (daemon_local->flags.enforceContextLLAndTS)
- {
req->log_level = getStatus(req->log_level, daemon_local->flags.contextLogLevel);
- }
dlt_set_id(apid, req->apid);
dlt_set_id(ctid, req->ctid);
appid_length = strlen(apid);
ctxtid_length = strlen(ctid);
- if ((appid_length != 0) && (apid[appid_length-1] == '*') && (ctid[0] == 0)) /*appid provided having '*' in it and ctid is null*/
- {
- dlt_daemon_find_multiple_context_and_send_log_level(sock, daemon, daemon_local, 1, apid, appid_length-1, req->log_level, verbose);
- }
- else if ((ctxtid_length != 0) && (ctid[ctxtid_length-1] == '*') && (apid[0] == 0)) /*ctid provided is having '*' in it and appid is null*/
- {
- dlt_daemon_find_multiple_context_and_send_log_level(sock, daemon, daemon_local, 0, ctid, ctxtid_length-1, req->log_level, verbose);
- }
- else if ((appid_length != 0) && (apid[appid_length-1] != '*') && (ctid[0] == 0)) /*only app id case*/
- {
- dlt_daemon_find_multiple_context_and_send_log_level(sock, daemon, daemon_local, 1, apid, DLT_ID_SIZE, req->log_level, verbose);
- }
- else if ((ctxtid_length != 0) && (ctid[ctxtid_length-1] != '*') && (apid[0] == 0)) /*only context id case*/
- {
- dlt_daemon_find_multiple_context_and_send_log_level(sock, daemon, daemon_local, 0, ctid, DLT_ID_SIZE, req->log_level, verbose);
- }
- else
- {
+
+ if ((appid_length != 0) && (apid[appid_length - 1] == '*') && (ctid[0] == 0)) { /*appid provided having '*' in it and ctid is null*/
+ dlt_daemon_find_multiple_context_and_send_log_level(sock,
+ daemon,
+ daemon_local,
+ 1,
+ apid,
+ appid_length - 1,
+ req->log_level,
+ verbose);
+ }
+ else if ((ctxtid_length != 0) && (ctid[ctxtid_length - 1] == '*') && (apid[0] == 0)) /*ctid provided is having '*' in it and appid is null*/
+ {
+ dlt_daemon_find_multiple_context_and_send_log_level(sock,
+ daemon,
+ daemon_local,
+ 0,
+ ctid,
+ ctxtid_length - 1,
+ req->log_level,
+ verbose);
+ }
+ else if ((appid_length != 0) && (apid[appid_length - 1] != '*') && (ctid[0] == 0)) /*only app id case*/
+ {
+ dlt_daemon_find_multiple_context_and_send_log_level(sock,
+ daemon,
+ daemon_local,
+ 1,
+ apid,
+ DLT_ID_SIZE,
+ req->log_level,
+ verbose);
+ }
+ else if ((ctxtid_length != 0) && (ctid[ctxtid_length - 1] != '*') && (apid[0] == 0)) /*only context id case*/
+ {
+ dlt_daemon_find_multiple_context_and_send_log_level(sock,
+ daemon,
+ daemon_local,
+ 0,
+ ctid,
+ DLT_ID_SIZE,
+ req->log_level,
+ verbose);
+ }
+ else {
context = dlt_daemon_context_find(daemon,
apid,
ctid,
@@ -1734,14 +1773,18 @@ void dlt_daemon_control_set_log_level(int sock, DltDaemon *daemon, DltDaemonLoca
verbose);
/* Set log level */
- if (context!=0)
- {
+ if (context != 0) {
dlt_daemon_send_log_level(sock, daemon, daemon_local, context, req->log_level, verbose);
}
- else
- {
- dlt_vlog(LOG_ERR, "Could not set log level: %d. Context [%.4s:%.4s] not found:", req->log_level, apid, ctid);
- dlt_daemon_control_service_response(sock, daemon, daemon_local, DLT_SERVICE_ID_SET_LOG_LEVEL, DLT_SERVICE_RESPONSE_ERROR, verbose);
+ else {
+ dlt_vlog(LOG_ERR, "Could not set log level: %d. Context [%.4s:%.4s] not found:", req->log_level, apid,
+ ctid);
+ dlt_daemon_control_service_response(sock,
+ daemon,
+ daemon_local,
+ DLT_SERVICE_ID_SET_LOG_LEVEL,
+ DLT_SERVICE_RESPONSE_ERROR,
+ verbose);
}
}
}
@@ -1763,12 +1806,10 @@ void dlt_daemon_send_trace_status(int sock,
context->trace_status = tracestatus; /* No endianess conversion necessary*/
if ((context->user_handle >= DLT_FD_MINIMUM) &&
- (dlt_daemon_user_send_log_level(daemon, context, verbose)==0))
- {
+ (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
- {
+ 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);
@@ -1788,158 +1829,181 @@ void dlt_daemon_find_multiple_context_and_send_trace_status(int sock,
int count = 0;
DltDaemonContext *context = NULL;
- char src_str[DLT_ID_SIZE +1] = {0};
+ char src_str[DLT_ID_SIZE + 1] = { 0 };
int8_t ret = 0;
- DltDaemonRegisteredUsers* user_list = NULL;
+ DltDaemonRegisteredUsers *user_list = NULL;
- if (daemon == 0)
- {
+ if (daemon == 0) {
dlt_vlog(LOG_ERR, "%s: Invalid parameters\n", __func__);
return;
}
user_list = dlt_daemon_find_users_list(daemon, daemon->ecuid, verbose);
+
if (user_list == NULL)
- {
return;
- }
- for (count = 0; count < user_list->num_contexts; count++)
- {
+ for (count = 0; count < user_list->num_contexts; count++) {
context = &(user_list->contexts[count]);
- if (context)
- {
+ if (context) {
if (app_flag == 1)
- {
strncpy(src_str, context->apid, DLT_ID_SIZE);
- }
else
- {
strncpy(src_str, context->ctid, DLT_ID_SIZE);
- }
+
ret = strncmp(src_str, str, len);
+
if (ret == 0)
- {
dlt_daemon_send_trace_status(sock, daemon, daemon_local, context, tracestatus, verbose);
- }
else if ((ret > 0) && (app_flag == 1))
- {
break;
- }
else
- {
continue;
- }
}
}
}
-void dlt_daemon_control_set_trace_status(int sock, DltDaemon *daemon, DltDaemonLocal *daemon_local, DltMessage *msg, int 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+1] = {0};
- char ctid[DLT_ID_SIZE+1] = {0};
+ char apid[DLT_ID_SIZE + 1] = { 0 };
+ char ctid[DLT_ID_SIZE + 1] = { 0 };
DltServiceSetLogLevel *req = NULL;
DltDaemonContext *context = NULL;
int8_t appid_length = 0;
int8_t ctxtid_length = 0;
if ((daemon == NULL) || (msg == NULL) || (msg->databuffer == NULL))
- {
return;
- }
if (DLT_CHECK_RCV_DATA_SIZE(msg->datasize, sizeof(DltServiceSetLogLevel)) < 0)
- {
return;
- }
- req = (DltServiceSetLogLevel*) (msg->databuffer);
+ req = (DltServiceSetLogLevel *)(msg->databuffer);
+
if (daemon_local->flags.enforceContextLLAndTS)
- {
req->log_level = getStatus(req->log_level, daemon_local->flags.contextTraceStatus);
- }
dlt_set_id(apid, req->apid);
dlt_set_id(ctid, req->ctid);
appid_length = strlen(apid);
ctxtid_length = strlen(ctid);
- if ((appid_length != 0) && (apid[appid_length-1] == '*') && (ctid[0] == 0)) /*appid provided having '*' in it and ctid is null*/
- {
- dlt_daemon_find_multiple_context_and_send_trace_status(sock, daemon, daemon_local, 1, apid, appid_length-1, req->log_level, verbose);
- }
- else if ((ctxtid_length != 0) && (ctid[ctxtid_length-1] == '*') && (apid[0] == 0)) /*ctid provided is having '*' in it and appid is null*/
- {
- dlt_daemon_find_multiple_context_and_send_trace_status(sock, daemon, daemon_local, 0, ctid, ctxtid_length-1, req->log_level, verbose);
- }
- else if ((appid_length != 0) && (apid[appid_length-1] != '*') && (ctid[0] == 0)) /*only app id case*/
- {
- dlt_daemon_find_multiple_context_and_send_trace_status(sock, daemon, daemon_local, 1, apid, DLT_ID_SIZE, req->log_level, verbose);
- }
- else if ((ctxtid_length != 0) && (ctid[ctxtid_length-1] != '*') && (apid[0] == 0)) /*only context id case*/
- {
- dlt_daemon_find_multiple_context_and_send_trace_status(sock, daemon, daemon_local, 0, ctid, DLT_ID_SIZE, req->log_level, verbose);
- }
- else
- {
- context=dlt_daemon_context_find(daemon, apid, ctid, daemon->ecuid, verbose);
+ if ((appid_length != 0) && (apid[appid_length - 1] == '*') && (ctid[0] == 0)) { /*appid provided having '*' in it and ctid is null*/
+ dlt_daemon_find_multiple_context_and_send_trace_status(sock,
+ daemon,
+ daemon_local,
+ 1,
+ apid,
+ appid_length - 1,
+ req->log_level,
+ verbose);
+ }
+ else if ((ctxtid_length != 0) && (ctid[ctxtid_length - 1] == '*') && (apid[0] == 0)) /*ctid provided is having '*' in it and appid is null*/
+
+ {
+ dlt_daemon_find_multiple_context_and_send_trace_status(sock,
+ daemon,
+ daemon_local,
+ 0,
+ ctid,
+ ctxtid_length - 1,
+ req->log_level,
+ verbose);
+ }
+ else if ((appid_length != 0) && (apid[appid_length - 1] != '*') && (ctid[0] == 0)) /*only app id case*/
+ {
+ dlt_daemon_find_multiple_context_and_send_trace_status(sock,
+ daemon,
+ daemon_local,
+ 1,
+ apid,
+ DLT_ID_SIZE,
+ req->log_level,
+ verbose);
+ }
+ else if ((ctxtid_length != 0) && (ctid[ctxtid_length - 1] != '*') && (apid[0] == 0)) /*only context id case*/
+ {
+ dlt_daemon_find_multiple_context_and_send_trace_status(sock,
+ daemon,
+ daemon_local,
+ 0,
+ ctid,
+ DLT_ID_SIZE,
+ req->log_level,
+ verbose);
+ }
+ else {
+ context = dlt_daemon_context_find(daemon, apid, ctid, daemon->ecuid, verbose);
/* Set trace status */
- if (context!=0)
- {
+ if (context != 0) {
dlt_daemon_send_trace_status(sock, daemon, daemon_local, context, req->log_level, verbose);
}
- else
- {
- dlt_vlog(LOG_ERR, "Could not set trace status: %d. Context [%.4s:%.4s] not found:", req->log_level, apid, ctid);
- dlt_daemon_control_service_response(sock, daemon, daemon_local, DLT_SERVICE_ID_SET_LOG_LEVEL, DLT_SERVICE_RESPONSE_ERROR, verbose);
+ else {
+ dlt_vlog(LOG_ERR,
+ "Could not set trace status: %d. Context [%.4s:%.4s] not found:",
+ req->log_level,
+ apid,
+ ctid);
+ dlt_daemon_control_service_response(sock,
+ daemon,
+ daemon_local,
+ DLT_SERVICE_ID_SET_LOG_LEVEL,
+ DLT_SERVICE_RESPONSE_ERROR,
+ verbose);
}
}
}
-void dlt_daemon_control_set_default_log_level(int sock, DltDaemon *daemon, DltDaemonLocal *daemon_local, DltMessage *msg, int 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;
+ int32_t id = DLT_SERVICE_ID_SET_DEFAULT_LOG_LEVEL;
if ((daemon == NULL) || (msg == NULL) || (msg->databuffer == NULL))
- {
return;
- }
if (DLT_CHECK_RCV_DATA_SIZE(msg->datasize, sizeof(DltServiceSetDefaultLogLevel)) < 0)
- {
return;
- }
- req = (DltServiceSetDefaultLogLevel*) (msg->databuffer);
+ req = (DltServiceSetDefaultLogLevel *)(msg->databuffer);
/* No endianess conversion necessary */
if (/*(req->log_level>=0) &&*/
- (req->log_level<=DLT_LOG_VERBOSE))
- {
+ (req->log_level <= DLT_LOG_VERBOSE)) {
if (daemon_local->flags.enforceContextLLAndTS)
- daemon->default_log_level = getStatus(req->log_level, daemon_local->flags.contextLogLevel);
- else
- daemon->default_log_level = req->log_level; /* No endianess conversion necessary */
+ daemon->default_log_level = getStatus(req->log_level, daemon_local->flags.contextLogLevel);
+ else
+ 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);
+ 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);
+ else {
+ dlt_daemon_control_service_response(sock, daemon, daemon_local, id, DLT_SERVICE_RESPONSE_ERROR, verbose);
}
}
-void dlt_daemon_control_set_all_log_level(int sock, DltDaemon *daemon, DltDaemonLocal *daemon_local, DltMessage *msg, int verbose)
+void dlt_daemon_control_set_all_log_level(int sock,
+ DltDaemon *daemon,
+ DltDaemonLocal *daemon_local,
+ DltMessage *msg,
+ int verbose)
{
PRINT_FUNCTION_VERBOSE(verbose);
@@ -1947,83 +2011,76 @@ void dlt_daemon_control_set_all_log_level(int sock, DltDaemon *daemon, DltDaemon
int32_t id = DLT_SERVICE_ID_SET_ALL_LOG_LEVEL;
int8_t loglevel = 0;
- if ((daemon == NULL) || (msg == NULL) || (msg->databuffer == NULL))
- {
+ if ((daemon == NULL) || (msg == NULL) || (msg->databuffer == NULL)) {
dlt_vlog(LOG_ERR, "%s: Invalid parameters\n", __func__);
return;
}
if (DLT_CHECK_RCV_DATA_SIZE(msg->datasize, sizeof(DltServiceSetDefaultLogLevel)) < 0)
- {
return;
- }
- req = (DltServiceSetDefaultLogLevel*) (msg->databuffer);
+ req = (DltServiceSetDefaultLogLevel *)(msg->databuffer);
/* No endianess conversion necessary */
- if ((req != NULL) && ((req->log_level <= DLT_LOG_VERBOSE) || (req->log_level == (uint8_t)DLT_LOG_DEFAULT)))
- {
+ if ((req != NULL) && ((req->log_level <= DLT_LOG_VERBOSE) || (req->log_level == (uint8_t)DLT_LOG_DEFAULT))) {
if (daemon_local->flags.enforceContextLLAndTS)
- {
loglevel = getStatus(req->log_level, daemon_local->flags.contextLogLevel);
- }
else
- {
loglevel = req->log_level; /* No endianess conversion necessary */
- }
/* Send Update to all contexts using the new log level */
dlt_daemon_user_send_all_log_level_update(daemon, loglevel, verbose);
dlt_daemon_control_service_response(sock, daemon, daemon_local, id, DLT_SERVICE_RESPONSE_OK, verbose);
}
- else
- {
+ 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)
+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;
+ int32_t id = DLT_SERVICE_ID_SET_DEFAULT_TRACE_STATUS;
if ((daemon == NULL) || (msg == NULL) || (msg->databuffer == NULL))
- {
return;
- }
if (DLT_CHECK_RCV_DATA_SIZE(msg->datasize, sizeof(DltServiceSetDefaultLogLevel)) < 0)
- {
return;
- }
- req = (DltServiceSetDefaultLogLevel*) (msg->databuffer);
+ req = (DltServiceSetDefaultLogLevel *)(msg->databuffer);
/* No endianess conversion necessary */
- if ((req->log_level==DLT_TRACE_STATUS_OFF) ||
- (req->log_level==DLT_TRACE_STATUS_ON))
- {
+ if ((req->log_level == DLT_TRACE_STATUS_OFF) ||
+ (req->log_level == DLT_TRACE_STATUS_ON)) {
if (daemon_local->flags.enforceContextLLAndTS)
- daemon->default_trace_status = getStatus(req->log_level, daemon_local->flags.contextTraceStatus);
- else
- daemon->default_trace_status = req->log_level; /* No endianess conversion necessary*/
+ daemon->default_trace_status = getStatus(req->log_level, daemon_local->flags.contextTraceStatus);
+ else
+ 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);
+ 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);
+ else {
+ dlt_daemon_control_service_response(sock, daemon, daemon_local, id, DLT_SERVICE_RESPONSE_ERROR, verbose);
}
}
-void dlt_daemon_control_set_all_trace_status(int sock, DltDaemon *daemon, DltDaemonLocal *daemon_local, DltMessage *msg, int verbose)
+void dlt_daemon_control_set_all_trace_status(int sock,
+ DltDaemon *daemon,
+ DltDaemonLocal *daemon_local,
+ DltMessage *msg,
+ int verbose)
{
PRINT_FUNCTION_VERBOSE(verbose);
@@ -2031,131 +2088,121 @@ void dlt_daemon_control_set_all_trace_status(int sock, DltDaemon *daemon, DltDae
int32_t id = DLT_SERVICE_ID_SET_ALL_TRACE_STATUS;
int8_t tracestatus = 0;
- if ((daemon == NULL) || (msg == NULL) || (msg->databuffer == NULL))
- {
+ if ((daemon == NULL) || (msg == NULL) || (msg->databuffer == NULL)) {
dlt_vlog(LOG_ERR, "%s: Invalid parameters\n", __func__);
return;
}
if (DLT_CHECK_RCV_DATA_SIZE(msg->datasize, sizeof(DltServiceSetDefaultLogLevel)) < 0)
- {
return;
- }
- req = (DltServiceSetDefaultLogLevel*) (msg->databuffer);
+ req = (DltServiceSetDefaultLogLevel *)(msg->databuffer);
/* No endianess conversion necessary */
- if ((req != NULL) && ((req->log_level <= DLT_TRACE_STATUS_ON) || (req->log_level == (uint8_t)DLT_TRACE_STATUS_DEFAULT)))
- {
+ if ((req != NULL) &&
+ ((req->log_level <= DLT_TRACE_STATUS_ON) || (req->log_level == (uint8_t)DLT_TRACE_STATUS_DEFAULT))) {
if (daemon_local->flags.enforceContextLLAndTS)
- {
tracestatus = getStatus(req->log_level, daemon_local->flags.contextTraceStatus);
- }
else
- {
tracestatus = req->log_level; /* No endianess conversion necessary */
- }
/* Send Update to all contexts using the new log level */
dlt_daemon_user_send_all_trace_status_update(daemon, tracestatus, verbose);
dlt_daemon_control_service_response(sock, daemon, daemon_local, id, DLT_SERVICE_RESPONSE_OK, verbose);
}
- else
- {
+ 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)
+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;
+ int32_t id = DLT_SERVICE_ID_SET_TIMING_PACKETS;
if ((daemon == NULL) || (msg == NULL) || (msg->databuffer == NULL))
- {
return;
- }
if (DLT_CHECK_RCV_DATA_SIZE(msg->datasize, sizeof(DltServiceSetVerboseMode)) < 0)
- {
return;
- }
- req = (DltServiceSetVerboseMode*) (msg->databuffer);
- if ((req->new_status==0) || (req->new_status==1))
- {
+ 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);
+ 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);
+ 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)
{
- int ret;
+ int ret;
DltMessage msg;
int32_t len;
PRINT_FUNCTION_VERBOSE(verbose);
- if (daemon==0)
- {
+ if (daemon == 0)
return;
- }
/* initialise new message */
- if (dlt_message_init(&msg,0) == DLT_RETURN_ERROR)
- {
+ if (dlt_message_init(&msg, 0) == DLT_RETURN_ERROR)
return;
- }
/* send message */
/* prepare storage header */
- msg.storageheader = (DltStorageHeader*)msg.headerbuffer;
- dlt_set_storageheader(msg.storageheader,daemon->ecuid);
+ 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 ;
+ 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);
+#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);
+ 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 =
+ (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 */
+ 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);
+ 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_WARNING,"Huge control message discarded!\n");
+ len = msg.headersize - sizeof(DltStorageHeader) + msg.datasize;
+
+ if (len > UINT16_MAX) {
+ dlt_log(LOG_WARNING, "Huge control message discarded!\n");
/* free message */
- dlt_message_free(&msg,0);
+ dlt_message_free(&msg, 0);
return;
}
@@ -2163,14 +2210,14 @@ void dlt_daemon_control_message_time(int sock, DltDaemon *daemon, DltDaemonLocal
msg.standardheader->len = DLT_HTOBE_16(((uint16_t)len));
/* Send message */
- if((ret = dlt_daemon_client_send(sock,daemon,daemon_local,msg.headerbuffer,sizeof(DltStorageHeader),msg.headerbuffer+sizeof(DltStorageHeader),msg.headersize-sizeof(DltStorageHeader),
- msg.databuffer,msg.datasize,verbose)))
- {
-
- }
+ if ((ret =
+ dlt_daemon_client_send(sock, daemon, daemon_local, msg.headerbuffer, sizeof(DltStorageHeader),
+ msg.headerbuffer + sizeof(DltStorageHeader),
+ msg.headersize - sizeof(DltStorageHeader),
+ msg.databuffer, msg.datasize, verbose))) {}
/* free message */
- dlt_message_free(&msg,0);
+ dlt_message_free(&msg, 0);
}
int dlt_daemon_process_one_s_timer(DltDaemon *daemon,
@@ -2184,8 +2231,7 @@ int dlt_daemon_process_one_s_timer(DltDaemon *daemon,
PRINT_FUNCTION_VERBOSE(verbose);
- if ((daemon_local == NULL) || (daemon == NULL) || (receiver == NULL))
- {
+ if ((daemon_local == NULL) || (daemon == NULL) || (receiver == NULL)) {
snprintf(local_str,
DLT_DAEMON_TEXTBUFSIZE,
"%s: invalid parameters",
@@ -2196,36 +2242,30 @@ int dlt_daemon_process_one_s_timer(DltDaemon *daemon,
res = read(receiver->fd, &expir, sizeof(expir));
- if(res < 0)
- {
+ if (res < 0) {
snprintf(local_str,
DLT_DAEMON_TEXTBUFSIZE,
"%s: Fail to read timer (%s)\n", __func__, strerror(errno));
dlt_log(LOG_WARNING, str);
/* Activity received on timer_wd, but unable to read the fd:
- let's go on sending notification */
+ * let's go on sending notification */
}
- if((daemon->state == DLT_DAEMON_STATE_SEND_BUFFER) ||
- (daemon->state == DLT_DAEMON_STATE_BUFFER_FULL))
- {
+ if ((daemon->state == DLT_DAEMON_STATE_SEND_BUFFER) ||
+ (daemon->state == DLT_DAEMON_STATE_BUFFER_FULL)) {
if (dlt_daemon_send_ringbuffer_to_client(daemon,
daemon_local,
daemon_local->flags.vflag))
- {
dlt_log(LOG_DEBUG,
"Can't send contents of ring buffer to clients\n");
- }
}
- if((daemon->timingpackets) &&
- (daemon->state == DLT_DAEMON_STATE_SEND_DIRECT))
- {
+ if ((daemon->timingpackets) &&
+ (daemon->state == DLT_DAEMON_STATE_SEND_DIRECT))
dlt_daemon_control_message_time(DLT_DAEMON_SEND_TO_ALL,
daemon,
daemon_local,
daemon_local->flags.vflag);
- }
dlt_log(LOG_DEBUG, "Timer timingpacket\n");
@@ -2243,8 +2283,7 @@ int dlt_daemon_process_sixty_s_timer(DltDaemon *daemon,
PRINT_FUNCTION_VERBOSE(verbose);
- if((daemon_local == NULL) || (daemon == NULL) || (receiver == NULL))
- {
+ if ((daemon_local == NULL) || (daemon == NULL) || (receiver == NULL)) {
snprintf(str,
DLT_DAEMON_TEXTBUFSIZE,
"%s: invalid parameters",
@@ -2255,32 +2294,28 @@ int dlt_daemon_process_sixty_s_timer(DltDaemon *daemon,
res = read(receiver->fd, &expir, sizeof(expir));
- if(res < 0)
- {
+ if (res < 0) {
snprintf(local_str,
DLT_DAEMON_TEXTBUFSIZE,
"%s: Fail to read timer (%s)\n", __func__, strerror(errno));
dlt_log(LOG_WARNING, str);
/* Activity received on timer_wd, but unable to read the fd:
- let's go on sending notification */
+ * let's go on sending notification */
}
- if(daemon_local->flags.sendECUSoftwareVersion > 0)
- {
+ 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
+ if (daemon_local->flags.sendTimezone > 0) {
+ /* send timezone information */
time_t t = time(NULL);
struct tm lt;
/*Added memset to avoid compiler warning for near initialization */
- memset((void*)&lt, 0, sizeof(lt));
+ memset((void *)&lt, 0, sizeof(lt));
localtime_r(&t, &lt);
dlt_daemon_control_message_timezone(DLT_DAEMON_SEND_TO_ALL,
@@ -2306,8 +2341,7 @@ int dlt_daemon_process_systemd_timer(DltDaemon *daemon,
PRINT_FUNCTION_VERBOSE(verbose);
- if((daemon_local == NULL) || (daemon == NULL) || (receiver == NULL))
- {
+ if ((daemon_local == NULL) || (daemon == NULL) || (receiver == NULL)) {
snprintf(local_str,
DLT_DAEMON_TEXTBUFSIZE,
"%s: invalid parameters",
@@ -2318,21 +2352,18 @@ int dlt_daemon_process_systemd_timer(DltDaemon *daemon,
res = read(receiver->fd, &expir, sizeof(expir));
- if(res < 0)
- {
+ if (res < 0) {
snprintf(local_str,
DLT_DAEMON_TEXTBUFSIZE,
"Failed to read timer_wd; %s\n",
strerror(errno));
dlt_log(LOG_WARNING, local_str);
/* Activity received on timer_wd, but unable to read the fd:
- let's go on sending notification */
+ * let's go on sending notification */
}
- if(sd_notify(0, "WATCHDOG=1") < 0)
- {
+ if (sd_notify(0, "WATCHDOG=1") < 0)
dlt_log(LOG_CRIT, "Could not reset systemd watchdog\n");
- }
dlt_log(LOG_DEBUG, "Timer watchdog\n");
@@ -2370,16 +2401,14 @@ void dlt_daemon_control_service_logstorage(int sock,
PRINT_FUNCTION_VERBOSE(verbose);
- if ((daemon == NULL) || (msg == NULL) || (daemon_local == NULL))
- {
+ if ((daemon == NULL) || (msg == NULL) || (daemon_local == NULL)) {
dlt_vlog(LOG_ERR,
"%s: Invalid function parameters\n",
__func__);
- return ;
+ return;
}
- if ((daemon_local->flags.offlineLogstorageMaxDevices <= 0) || (msg->databuffer == NULL))
- {
+ if ((daemon_local->flags.offlineLogstorageMaxDevices <= 0) || (msg->databuffer == NULL)) {
dlt_daemon_control_service_response(sock,
daemon,
daemon_local,
@@ -2393,19 +2422,16 @@ void dlt_daemon_control_service_logstorage(int sock,
}
if (DLT_CHECK_RCV_DATA_SIZE(msg->datasize, sizeof(DltServiceOfflineLogstorage)) < 0)
- {
return;
- }
- req = (DltServiceOfflineLogstorage*) (msg->databuffer);
+ req = (DltServiceOfflineLogstorage *)(msg->databuffer);
- for (i = 0; i < daemon_local->flags.offlineLogstorageMaxDevices; i++)
- {
+ for (i = 0; i < daemon_local->flags.offlineLogstorageMaxDevices; i++) {
connection_type = daemon->storage_handle[i].connection_type;
+
/* Check if the requested device path is already used as log storage device */
if (strncmp(daemon->storage_handle[i].device_mount_point,
- req->mount_point, strlen(req->mount_point)) == 0)
- {
+ req->mount_point, strlen(req->mount_point)) == 0) {
device_index = i;
break;
}
@@ -2413,41 +2439,33 @@ void dlt_daemon_control_service_logstorage(int sock,
/* Get first available device index here */
if ((connection_type != DLT_OFFLINE_LOGSTORAGE_DEVICE_CONNECTED) &&
(device_index == -1))
- {
device_index = i;
- }
}
/* It might be possible to sync all caches of all devices */
if ((req->connection_type == DLT_OFFLINE_LOGSTORAGE_SYNC_CACHES) &&
- (strlen(req->mount_point) == 0))
- {
+ (strlen(req->mount_point) == 0)) {
/* It is expected to receive an empty mount point to sync all Logstorage
* devices in this case. */
}
- else
- {
- if (device_index == -1)
- {
- dlt_daemon_control_service_response(sock,
- daemon,
- daemon_local,
- DLT_SERVICE_ID_OFFLINE_LOGSTORAGE,
- DLT_SERVICE_RESPONSE_ERROR,
- verbose);
- dlt_log(LOG_WARNING, "MAX devices already in use \n");
- return;
- }
+ else if (device_index == -1) {
+ dlt_daemon_control_service_response(sock,
+ daemon,
+ daemon_local,
+ DLT_SERVICE_ID_OFFLINE_LOGSTORAGE,
+ DLT_SERVICE_RESPONSE_ERROR,
+ verbose);
+ dlt_log(LOG_WARNING, "MAX devices already in use \n");
+ return;
}
/* Check for device connection request from log storage ctrl app */
device = &daemon->storage_handle[device_index];
- if (req->connection_type == DLT_OFFLINE_LOGSTORAGE_DEVICE_CONNECTED)
- {
+
+ if (req->connection_type == DLT_OFFLINE_LOGSTORAGE_DEVICE_CONNECTED) {
ret = dlt_logstorage_device_connected(device, req->mount_point);
- if (ret == 1)
- {
+ if (ret == 1) {
dlt_daemon_control_service_response(sock,
daemon,
daemon_local,
@@ -2482,15 +2500,15 @@ void dlt_daemon_control_service_logstorage(int sock,
}
/* Check for device disconnection request from log storage ctrl app */
- else if(req->connection_type == DLT_OFFLINE_LOGSTORAGE_DEVICE_DISCONNECTED)
+ else if (req->connection_type == DLT_OFFLINE_LOGSTORAGE_DEVICE_DISCONNECTED)
{
/* Check if log level of running application needs to be reset */
dlt_daemon_logstorage_reset_application_loglevel(
- daemon,
- daemon_local,
- device_index,
- daemon_local->flags.offlineLogstorageMaxDevices,
- verbose);
+ daemon,
+ daemon_local,
+ device_index,
+ daemon_local->flags.offlineLogstorageMaxDevices,
+ verbose);
dlt_logstorage_device_disconnected(&(daemon->storage_handle[device_index]),
DLT_LOGSTORAGE_SYNC_ON_DEVICE_DISCONNECT);
@@ -2504,54 +2522,45 @@ void dlt_daemon_control_service_logstorage(int sock,
}
/* Check for cache synchronization request from log storage ctrl app */
- else if(req->connection_type == DLT_OFFLINE_LOGSTORAGE_SYNC_CACHES)
+ else if (req->connection_type == DLT_OFFLINE_LOGSTORAGE_SYNC_CACHES)
{
int ret = 0;
- if (device_index == -1) /* sync all Logstorage devices */
- {
+
+ if (device_index == -1) { /* sync all Logstorage devices */
+
for (i = 0; i < daemon_local->flags.offlineLogstorageMaxDevices; i++)
- {
if (daemon->storage_handle[i].connection_type ==
DLT_OFFLINE_LOGSTORAGE_DEVICE_CONNECTED)
- {
ret = dlt_daemon_logstorage_sync_cache(
- daemon,
- daemon_local,
- daemon->storage_handle[i].device_mount_point,
- verbose);
- }
- }
+ daemon,
+ daemon_local,
+ daemon->storage_handle[i].device_mount_point,
+ verbose);
}
- else
- {
+ else {
/* trigger logstorage to sync caches */
ret = dlt_daemon_logstorage_sync_cache(daemon,
- daemon_local,
- req->mount_point,
- verbose);
+ daemon_local,
+ req->mount_point,
+ verbose);
}
if (ret == 0)
- {
dlt_daemon_control_service_response(sock,
daemon,
daemon_local,
DLT_SERVICE_ID_OFFLINE_LOGSTORAGE,
DLT_SERVICE_RESPONSE_OK,
verbose);
- }
else
- {
dlt_daemon_control_service_response(sock,
daemon,
daemon_local,
DLT_SERVICE_ID_OFFLINE_LOGSTORAGE,
DLT_SERVICE_RESPONSE_ERROR,
verbose);
- }
}
- else
- {
+ else {
dlt_daemon_control_service_response(sock,
daemon,
daemon_local,
@@ -2572,15 +2581,12 @@ void dlt_daemon_control_passive_node_connect(int sock,
DltServicePassiveNodeConnect *req;
uint32_t id = DLT_SERVICE_ID_PASSIVE_NODE_CONNECT;
- if (daemon == NULL || daemon_local == NULL || msg == NULL ||
- msg->databuffer == NULL)
- {
+ if ((daemon == NULL) || (daemon_local == NULL) || (msg == NULL) ||
+ (msg->databuffer == NULL))
return;
- }
/* return error, if gateway mode not enabled*/
- if (daemon_local->flags.gatewayMode == 0)
- {
+ if (daemon_local->flags.gatewayMode == 0) {
dlt_log(LOG_WARNING,
"Received passive node connection status request, "
"but GatewayMode is disabled\n");
@@ -2597,34 +2603,28 @@ void dlt_daemon_control_passive_node_connect(int sock,
}
if (DLT_CHECK_RCV_DATA_SIZE(msg->datasize, sizeof(DltServicePassiveNodeConnect)) < 0)
- {
return;
- }
- req = (DltServicePassiveNodeConnect *) msg->databuffer;
+ req = (DltServicePassiveNodeConnect *)msg->databuffer;
if (dlt_gateway_process_on_demand_request(&daemon_local->pGateway,
daemon_local,
req->node_id,
req->connection_status,
verbose) < 0)
- {
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);
- }
}
void dlt_daemon_control_passive_node_connect_status(int sock,
@@ -2639,19 +2639,14 @@ void dlt_daemon_control_passive_node_connect_status(int sock,
PRINT_FUNCTION_VERBOSE(verbose);
- if (daemon == NULL || daemon_local == NULL)
- {
+ if ((daemon == NULL) || (daemon_local == NULL))
return;
- }
if (dlt_message_init(&msg, verbose) == -1)
- {
return;
- }
/* return error, if gateway mode not enabled*/
- if (daemon_local->flags.gatewayMode == 0)
- {
+ if (daemon_local->flags.gatewayMode == 0) {
dlt_log(LOG_WARNING,
"Received passive node connection status request, "
"but GatewayMode is disabled\n");
@@ -2669,39 +2664,37 @@ void dlt_daemon_control_passive_node_connect_status(int sock,
/* prepare payload of data */
msg.datasize = sizeof(DltServicePassiveNodeConnectionInfo);
+
if (msg.databuffer && (msg.databuffersize < msg.datasize))
- {
msg.databuffer = NULL;
- }
- if (msg.databuffer == NULL)
- {
- msg.databuffer = (uint8_t *) malloc(msg.datasize);
- if (msg.databuffer == NULL)
- {
+
+ if (msg.databuffer == NULL) {
+ msg.databuffer = (uint8_t *)malloc(msg.datasize);
+
+ if (msg.databuffer == NULL) {
dlt_log(LOG_CRIT, "Cannot allocate memory for message response\n");
return;
}
+
msg.databuffersize = msg.datasize;
}
- resp = (DltServicePassiveNodeConnectionInfo *) msg.databuffer;
+ resp = (DltServicePassiveNodeConnectionInfo *)msg.databuffer;
memset(resp, 0, msg.datasize);
resp->service_id = DLT_SERVICE_ID_PASSIVE_NODE_CONNECTION_STATUS;
resp->status = DLT_SERVICE_RESPONSE_OK;
resp->num_connections = daemon_local->pGateway.num_connections;
- for (i = 0; i < resp->num_connections; i++)
- {
- if ((i * DLT_ID_SIZE) > DLT_ENTRY_MAX)
- {
+ for (i = 0; i < resp->num_connections; i++) {
+ if ((i * DLT_ID_SIZE) > DLT_ENTRY_MAX) {
dlt_log(LOG_ERR,
"Maximal message size reached. Skip further information\n");
break;
}
con = &daemon_local->pGateway.connections[i];
- if (con == NULL)
- {
+
+ if (con == NULL) {
dlt_log(LOG_CRIT, "Passive node connection structure is NULL\n");
dlt_daemon_control_service_response(
sock,
View Lorry Controller Status