diff options
Diffstat (limited to 'src/daemon/dlt_daemon_common.c')
| -rw-r--r-- | src/daemon/dlt_daemon_common.c | 1023 |
1 files changed, 436 insertions, 587 deletions
diff --git a/src/daemon/dlt_daemon_common.c b/src/daemon/dlt_daemon_common.c index ce2de71..8508dfe 100644 --- a/src/daemon/dlt_daemon_common.c +++ b/src/daemon/dlt_daemon_common.c @@ -63,8 +63,8 @@ * $LastChangedRevision: 1670 $ * $LastChangedDate: 2011-04-08 15:12:06 +0200 (Fr, 08. Apr 2011) $ * $LastChangedBy$ - Initials Date Comment - aw 13.01.2010 initial + * Initials Date Comment + * aw 13.01.2010 initial */ #include <stdio.h> @@ -94,37 +94,32 @@ sem_t dlt_daemon_mutex; static int dlt_daemon_cmp_apid(const void *m1, const void *m2) { - if(m1 == NULL || m2 == NULL) + if ((m1 == NULL) || (m2 == NULL)) return -1; - DltDaemonApplication *mi1 = (DltDaemonApplication *) m1; - DltDaemonApplication *mi2 = (DltDaemonApplication *) m2; + DltDaemonApplication *mi1 = (DltDaemonApplication *)m1; + DltDaemonApplication *mi2 = (DltDaemonApplication *)m2; return memcmp(mi1->apid, mi2->apid, DLT_ID_SIZE); } static int dlt_daemon_cmp_apid_ctid(const void *m1, const void *m2) { - if(m1 == NULL || m2 == NULL) + if ((m1 == NULL) || (m2 == NULL)) return -1; int ret, cmp; - DltDaemonContext *mi1 = (DltDaemonContext *) m1; - DltDaemonContext *mi2 = (DltDaemonContext *) m2; + DltDaemonContext *mi1 = (DltDaemonContext *)m1; + DltDaemonContext *mi2 = (DltDaemonContext *)m2; - cmp=memcmp(mi1->apid, mi2->apid, DLT_ID_SIZE); - if (cmp<0) - { - ret=-1; - } - else if (cmp==0) - { - ret=memcmp(mi1->ctid, mi2->ctid, DLT_ID_SIZE); - } + cmp = memcmp(mi1->apid, mi2->apid, DLT_ID_SIZE); + + if (cmp < 0) + ret = -1; + else if (cmp == 0) + ret = memcmp(mi1->ctid, mi2->ctid, DLT_ID_SIZE); else - { - ret=1; - } + ret = 1; return ret; } @@ -137,90 +132,89 @@ DltDaemonRegisteredUsers *dlt_daemon_find_users_list(DltDaemon *daemon, int i = 0; - if (daemon == NULL || ecu == NULL) - { + if ((daemon == NULL) || (ecu == NULL)) { dlt_vlog(LOG_ERR, "%s: Wrong parameters", __func__); - return (DltDaemonRegisteredUsers *) NULL; + return (DltDaemonRegisteredUsers *)NULL; } for (i = 0; i < daemon->num_user_lists; i++) - { if (strncmp(ecu, daemon->user_list[i].ecu, DLT_ID_SIZE) == 0) - { return &daemon->user_list[i]; - } - } dlt_vlog(LOG_ERR, "Cannot find user list for ECU: %4s\n", ecu); - return (DltDaemonRegisteredUsers *) NULL; + return (DltDaemonRegisteredUsers *)NULL; } -int dlt_daemon_load_runtime_configuration(DltDaemon *daemon,const char *runtime_directory, int verbose) +int dlt_daemon_load_runtime_configuration(DltDaemon *daemon, const char *runtime_directory, int verbose) { int append_length = 0; - if (daemon == NULL || runtime_directory == NULL) - { + if ((daemon == NULL) || (runtime_directory == NULL)) return DLT_RETURN_ERROR; - } /* prepare filenames for configuration */ append_length = PATH_MAX - sizeof(DLT_RUNTIME_APPLICATION_CFG); - if(runtime_directory[0]) - { - strncpy(daemon->runtime_application_cfg,runtime_directory,append_length); - daemon->runtime_application_cfg[append_length]=0; + + if (runtime_directory[0]) { + strncpy(daemon->runtime_application_cfg, runtime_directory, append_length); + daemon->runtime_application_cfg[append_length] = 0; } - else - { - strncpy(daemon->runtime_application_cfg,DLT_RUNTIME_DEFAULT_DIRECTORY,append_length); - daemon->runtime_application_cfg[append_length]=0; + else { + strncpy(daemon->runtime_application_cfg, DLT_RUNTIME_DEFAULT_DIRECTORY, append_length); + daemon->runtime_application_cfg[append_length] = 0; } - strcat(daemon->runtime_application_cfg,DLT_RUNTIME_APPLICATION_CFG); /* strcat uncritical here, because max length already checked */ + + strcat(daemon->runtime_application_cfg, DLT_RUNTIME_APPLICATION_CFG); /* strcat uncritical here, because max length already checked */ append_length = PATH_MAX - sizeof(DLT_RUNTIME_CONTEXT_CFG); - if(runtime_directory[0]) - { - strncpy(daemon->runtime_context_cfg,runtime_directory,append_length); - daemon->runtime_context_cfg[append_length]=0; + + if (runtime_directory[0]) { + strncpy(daemon->runtime_context_cfg, runtime_directory, append_length); + daemon->runtime_context_cfg[append_length] = 0; } - else - { - strncpy(daemon->runtime_context_cfg,DLT_RUNTIME_DEFAULT_DIRECTORY,append_length); - daemon->runtime_context_cfg[append_length]=0; + else { + strncpy(daemon->runtime_context_cfg, DLT_RUNTIME_DEFAULT_DIRECTORY, append_length); + daemon->runtime_context_cfg[append_length] = 0; } - strcat(daemon->runtime_context_cfg,DLT_RUNTIME_CONTEXT_CFG); /* strcat uncritical here, because max length already checked */ + + strcat(daemon->runtime_context_cfg, DLT_RUNTIME_CONTEXT_CFG); /* strcat uncritical here, because max length already checked */ append_length = PATH_MAX - sizeof(DLT_RUNTIME_CONFIGURATION); - if(runtime_directory[0]) - { - strncpy(daemon->runtime_configuration,runtime_directory,append_length); - daemon->runtime_configuration[append_length]=0; + + if (runtime_directory[0]) { + strncpy(daemon->runtime_configuration, runtime_directory, append_length); + daemon->runtime_configuration[append_length] = 0; } - else - { - strncpy(daemon->runtime_configuration,DLT_RUNTIME_DEFAULT_DIRECTORY,append_length); - daemon->runtime_configuration[append_length]=0; + else { + strncpy(daemon->runtime_configuration, DLT_RUNTIME_DEFAULT_DIRECTORY, append_length); + daemon->runtime_configuration[append_length] = 0; } - strcat(daemon->runtime_configuration,DLT_RUNTIME_CONFIGURATION); /* strcat uncritical here, because max length already checked */ + + strcat(daemon->runtime_configuration, DLT_RUNTIME_CONFIGURATION); /* strcat uncritical here, because max length already checked */ /* Check for runtime cfg, if it is loadable, load it! */ - if ((dlt_daemon_applications_load(daemon,daemon->runtime_application_cfg, verbose)==0) && - (dlt_daemon_contexts_load(daemon,daemon->runtime_context_cfg, verbose)==0)) - { + if ((dlt_daemon_applications_load(daemon, daemon->runtime_application_cfg, verbose) == 0) && + (dlt_daemon_contexts_load(daemon, daemon->runtime_context_cfg, verbose) == 0)) daemon->runtime_context_cfg_loaded = 1; - } /* load configuration if available */ - dlt_daemon_configuration_load(daemon,daemon->runtime_configuration, verbose); + dlt_daemon_configuration_load(daemon, daemon->runtime_configuration, verbose); return DLT_RETURN_OK; } -int dlt_daemon_init(DltDaemon *daemon,unsigned long RingbufferMinSize,unsigned long RingbufferMaxSize,unsigned long RingbufferStepSize,const char *runtime_directory,int InitialContextLogLevel, int InitialContextTraceStatus, int ForceLLTS, int verbose) +int dlt_daemon_init(DltDaemon *daemon, + unsigned long RingbufferMinSize, + unsigned long RingbufferMaxSize, + unsigned long RingbufferStepSize, + const char *runtime_directory, + int InitialContextLogLevel, + int InitialContextTraceStatus, + int ForceLLTS, + int verbose) { PRINT_FUNCTION_VERBOSE(verbose); - if (daemon == NULL || runtime_directory == NULL) + if ((daemon == NULL) || (runtime_directory == NULL)) return -1; daemon->user_list = NULL; @@ -243,15 +237,20 @@ int dlt_daemon_init(DltDaemon *daemon,unsigned long RingbufferMinSize,unsigned l daemon->sendserialheader = 0; daemon->timingpackets = 0; - dlt_set_id(daemon->ecuid,""); + dlt_set_id(daemon->ecuid, ""); /* initialize ring buffer for client connection */ - snprintf(str,DLT_DAEMON_COMMON_TEXTBUFSIZE,"Ringbuffer configuration: %lu/%lu/%lu\n", RingbufferMinSize,RingbufferMaxSize,RingbufferStepSize ); + snprintf(str, + DLT_DAEMON_COMMON_TEXTBUFSIZE, + "Ringbuffer configuration: %lu/%lu/%lu\n", + RingbufferMinSize, + RingbufferMaxSize, + RingbufferStepSize); dlt_log(LOG_INFO, str); - if (dlt_buffer_init_dynamic(&(daemon->client_ringbuffer), RingbufferMinSize,RingbufferMaxSize,RingbufferStepSize) == DLT_RETURN_ERROR) - { + + if (dlt_buffer_init_dynamic(&(daemon->client_ringbuffer), RingbufferMinSize, RingbufferMaxSize, + RingbufferStepSize) == DLT_RETURN_ERROR) return -1; - } daemon->storage_handle = NULL; return 0; @@ -264,15 +263,14 @@ int dlt_daemon_free(DltDaemon *daemon, int verbose) PRINT_FUNCTION_VERBOSE(verbose); - if (daemon == NULL || daemon->user_list == NULL) + if ((daemon == NULL) || (daemon->user_list == NULL)) return -1; /* free all registered user information */ - for (i = 0; i < daemon->num_user_lists; i++) - { + for (i = 0; i < daemon->num_user_lists; i++) { user_list = &daemon->user_list[i]; - if (user_list != NULL) - { + + if (user_list != NULL) { /* ignore return values */ dlt_daemon_contexts_clear(daemon, user_list->ecu, verbose); dlt_daemon_applications_clear(daemon, user_list->ecu, verbose); @@ -280,10 +278,10 @@ int dlt_daemon_free(DltDaemon *daemon, int verbose) } free(daemon->user_list); + if (app_recv_buffer) - { free(app_recv_buffer); - } + /* free ringbuffer */ dlt_buffer_free_dynamic(&(daemon->client_ringbuffer)); @@ -301,16 +299,13 @@ int dlt_daemon_init_user_information(DltDaemon *daemon, PRINT_FUNCTION_VERBOSE(verbose); if ((daemon == NULL) || ((gateway_mode == 1) && (gateway == NULL))) - { return DLT_RETURN_ERROR; - } - if (gateway_mode == 0) - { + if (gateway_mode == 0) { /* initialize application list */ daemon->user_list = calloc(nodes, sizeof(DltDaemonRegisteredUsers)); - if (daemon->user_list == NULL) - { + + if (daemon->user_list == NULL) { dlt_log(LOG_ERR, "Allocating memory for user information"); return DLT_RETURN_ERROR; } @@ -318,14 +313,13 @@ int dlt_daemon_init_user_information(DltDaemon *daemon, dlt_set_id(daemon->user_list[0].ecu, daemon->ecuid); daemon->num_user_lists = 1; } - else /* gateway is active */ - { + else { /* gateway is active */ nodes += gateway->num_connections; /* initialize application list */ daemon->user_list = calloc(nodes, sizeof(DltDaemonRegisteredUsers)); - if (daemon->user_list == NULL) - { + + if (daemon->user_list == NULL) { dlt_log(LOG_ERR, "Allocating memory for user information"); return DLT_RETURN_ERROR; } @@ -334,9 +328,7 @@ int dlt_daemon_init_user_information(DltDaemon *daemon, daemon->num_user_lists = nodes; for (i = 1; i < nodes; i++) - { - dlt_set_id(daemon->user_list[i].ecu, gateway->connections[i-1].ecuid); - } + dlt_set_id(daemon->user_list[i].ecu, gateway->connections[i - 1].ecuid); } return DLT_RETURN_OK; @@ -348,25 +340,19 @@ int dlt_daemon_applications_invalidate_fd(DltDaemon *daemon, int verbose) { int i; - DltDaemonRegisteredUsers* user_list = NULL; + DltDaemonRegisteredUsers *user_list = NULL; PRINT_FUNCTION_VERBOSE(verbose); - if (daemon == NULL || ecu == NULL) - { + if ((daemon == NULL) || (ecu == NULL)) return DLT_RETURN_ERROR; - } user_list = dlt_daemon_find_users_list(daemon, ecu, verbose); - if (user_list != NULL) - { - for (i=0; i<user_list->num_applications; i++) - { + + if (user_list != NULL) { + for (i = 0; i < user_list->num_applications; i++) if (user_list->applications[i].user_handle == fd) - { user_list->applications[i].user_handle = DLT_FD_INIT; - } - } return DLT_RETURN_OK; } @@ -382,29 +368,23 @@ int dlt_daemon_applications_clear(DltDaemon *daemon, char *ecu, int verbose) PRINT_FUNCTION_VERBOSE(verbose); if ((daemon == NULL) || (daemon->user_list == NULL) || (ecu == NULL)) - { return DLT_RETURN_WRONG_PARAMETER; - } user_list = dlt_daemon_find_users_list(daemon, ecu, verbose); + if (user_list == NULL) - { return DLT_RETURN_ERROR; - } - for (i=0; i < user_list->num_applications; i++) - { - if (user_list->applications[i].application_description != NULL) - { + for (i = 0; i < user_list->num_applications; i++) + if (user_list->applications[i].application_description != NULL) { free(user_list->applications[i].application_description); user_list->applications[i].application_description = NULL; } - } + + if (user_list->applications != NULL) - { free(user_list->applications); - } user_list->applications = NULL; user_list->num_applications = 0; @@ -412,7 +392,7 @@ int dlt_daemon_applications_clear(DltDaemon *daemon, char *ecu, int verbose) return 0; } -DltDaemonApplication* dlt_daemon_application_add(DltDaemon *daemon, +DltDaemonApplication *dlt_daemon_application_add(DltDaemon *daemon, char *apid, pid_t pid, char *description, @@ -426,56 +406,49 @@ DltDaemonApplication* dlt_daemon_application_add(DltDaemon *daemon, int dlt_user_handle; DltDaemonRegisteredUsers *user_list = NULL; #ifndef DLT_USE_UNIX_SOCKET_IPC - (void) fd; /* To avoid compiler warning : unused variable */ + (void)fd; /* To avoid compiler warning : unused variable */ char filename[DLT_DAEMON_COMMON_TEXTBUFSIZE]; #endif - if ((daemon == NULL) || (apid == NULL) || (apid[0]=='\0') || (ecu == NULL)) - { - return (DltDaemonApplication*) NULL; - } + if ((daemon == NULL) || (apid == NULL) || (apid[0] == '\0') || (ecu == NULL)) + return (DltDaemonApplication *)NULL; user_list = dlt_daemon_find_users_list(daemon, ecu, verbose); + if (user_list == NULL) - { - return (DltDaemonApplication*) NULL; - } + return (DltDaemonApplication *)NULL; + + if (user_list->applications == NULL) { + user_list->applications = (DltDaemonApplication *) + malloc(sizeof(DltDaemonApplication) * DLT_DAEMON_APPL_ALLOC_SIZE); - if (user_list->applications == NULL) - { - user_list->applications = (DltDaemonApplication*) - malloc(sizeof(DltDaemonApplication) * DLT_DAEMON_APPL_ALLOC_SIZE); if (user_list->applications == NULL) - { - return (DltDaemonApplication*) NULL; - } + return (DltDaemonApplication *)NULL; } - new_application=0; + new_application = 0; /* Check if application [apid] is already available */ application = dlt_daemon_application_find(daemon, apid, ecu, verbose); - if (application == NULL) - { + + if (application == NULL) { user_list->num_applications += 1; - if (user_list->num_applications != 0) - { - if ((user_list->num_applications % DLT_DAEMON_APPL_ALLOC_SIZE) == 0) - { + if (user_list->num_applications != 0) { + if ((user_list->num_applications % DLT_DAEMON_APPL_ALLOC_SIZE) == 0) { /* allocate memory in steps of DLT_DAEMON_APPL_ALLOC_SIZE, e.g. 100 */ old = user_list->applications; - user_list->applications = (DltDaemonApplication*) - malloc(sizeof(DltDaemonApplication) * - ((user_list->num_applications / DLT_DAEMON_APPL_ALLOC_SIZE) + 1) * - DLT_DAEMON_APPL_ALLOC_SIZE); + user_list->applications = (DltDaemonApplication *) + malloc(sizeof(DltDaemonApplication) * + ((user_list->num_applications / DLT_DAEMON_APPL_ALLOC_SIZE) + 1) * + DLT_DAEMON_APPL_ALLOC_SIZE); - if (user_list->applications == NULL) - { + if (user_list->applications == NULL) { user_list->applications = old; user_list->num_applications -= 1; - return (DltDaemonApplication*) NULL; + return (DltDaemonApplication *)NULL; } + memcpy(user_list->applications, old, sizeof(DltDaemonApplication) * user_list->num_applications); @@ -485,7 +458,7 @@ DltDaemonApplication* dlt_daemon_application_add(DltDaemon *daemon, application = &(user_list->applications[user_list->num_applications - 1]); - dlt_set_id(application->apid,apid); + dlt_set_id(application->apid, apid); application->pid = 0; application->application_description = NULL; application->num_contexts = 0; @@ -493,7 +466,9 @@ DltDaemonApplication* dlt_daemon_application_add(DltDaemon *daemon, new_application = 1; - } else if ((pid != application->pid) && (application->pid != 0)) { + } + else if ((pid != application->pid) && (application->pid != 0)) + { dlt_vlog(LOG_WARNING, "Duplicate registration of ApplicationID: '%.4s'; registering from PID %d, existing from PID %d\n", @@ -503,53 +478,47 @@ DltDaemonApplication* dlt_daemon_application_add(DltDaemon *daemon, } /* Store application description and pid of application */ - if (application->application_description) - { + if (application->application_description) { free(application->application_description); application->application_description = NULL; } - if (description != NULL) - { + if (description != NULL) { application->application_description = malloc(strlen(description) + 1); - if (application->application_description) - { + + if (application->application_description) { strncpy(application->application_description, description, strlen(description)); application->application_description[strlen(description)] = '\0'; } - else - { + else { dlt_log(LOG_ERR, "Cannot allocate memory to store application description\n"); free(application); - return (DltDaemonApplication*) NULL; + return (DltDaemonApplication *)NULL; } } - if (application->user_handle != DLT_FD_INIT) - { - if (application->pid != pid) - { + if (application->user_handle != DLT_FD_INIT) { + if (application->pid != pid) { #ifndef DLT_USE_UNIX_SOCKET_IPC - if (close(application->user_handle) < 0) - { - dlt_vlog(LOG_WARNING, - "close() failed to %s/dltpipes/dlt%d, errno=%d (%s)!\n", - dltFifoBaseDir, - pid, - errno, - strerror(errno)); /* errno 2: ENOENT - No such file or directory */ - } + + if (close(application->user_handle) < 0) + dlt_vlog(LOG_WARNING, + "close() failed to %s/dltpipes/dlt%d, errno=%d (%s)!\n", + dltFifoBaseDir, + pid, + errno, + strerror(errno)); /* errno 2: ENOENT - No such file or directory */ + #endif - application->user_handle = DLT_FD_INIT; - application->pid = 0; + application->user_handle = DLT_FD_INIT; + application->pid = 0; } } /* open user pipe only if it is not yet opened */ - if ((application->user_handle == DLT_FD_INIT) && (pid != 0)) - { + if ((application->user_handle == DLT_FD_INIT) && (pid != 0)) { #ifdef DLT_USE_UNIX_SOCKET_IPC dlt_user_handle = fd; #else @@ -559,15 +528,16 @@ DltDaemonApplication* dlt_daemon_application_add(DltDaemon *daemon, dltFifoBaseDir, pid); - dlt_user_handle = open(filename, O_WRONLY|O_NONBLOCK); - if (dlt_user_handle < 0) - { + dlt_user_handle = open(filename, O_WRONLY | O_NONBLOCK); + + if (dlt_user_handle < 0) { int prio = (errno == ENOENT) ? LOG_INFO : LOG_WARNING; dlt_vlog(prio, "open() failed to %s, errno=%d (%s)!\n", filename, errno, strerror(errno)); } /* if */ + #endif /* check if file descriptor was already used, and make it invalid if it - * is reused. This prevents sending messages to wrong file descriptor */ + * is reused. This prevents sending messages to wrong file descriptor */ dlt_daemon_applications_invalidate_fd(daemon, ecu, dlt_user_handle, verbose); dlt_daemon_contexts_invalidate_fd(daemon, ecu, dlt_user_handle, verbose); @@ -576,8 +546,7 @@ DltDaemonApplication* dlt_daemon_application_add(DltDaemon *daemon, } /* Sort */ - if (new_application) - { + if (new_application) { qsort(user_list->applications, user_list->num_applications, sizeof(DltDaemonApplication), @@ -601,21 +570,16 @@ int dlt_daemon_application_del(DltDaemon *daemon, PRINT_FUNCTION_VERBOSE(verbose); if ((daemon == NULL) || (application == NULL) || (ecu == NULL)) - { return -1; - } user_list = dlt_daemon_find_users_list(daemon, ecu, verbose); + if (user_list == NULL) - { return -1; - } - if (user_list->num_applications > 0) - { + if (user_list->num_applications > 0) { /* Check if user handle is open; if yes, close it */ - if (application->user_handle >= DLT_FD_MINIMUM) - { + if (application->user_handle >= DLT_FD_MINIMUM) { #ifndef DLT_USE_UNIX_SOCKET_IPC close(application->user_handle); #endif @@ -623,8 +587,7 @@ int dlt_daemon_application_del(DltDaemon *daemon, } /* Free description of application to be deleted */ - if (application->application_description) - { + if (application->application_description) { free(application->application_description); application->application_description = NULL; } @@ -633,11 +596,11 @@ int dlt_daemon_application_del(DltDaemon *daemon, /* move all applications above pos to pos */ memmove(&(user_list->applications[pos]), - &(user_list->applications[pos+1]), + &(user_list->applications[pos + 1]), sizeof(DltDaemonApplication) * ((user_list->num_applications - 1) - pos)); /* Clear last application */ - memset(&(user_list->applications[user_list->num_applications-1]), + memset(&(user_list->applications[user_list->num_applications - 1]), 0, sizeof(DltDaemonApplication)); @@ -647,43 +610,38 @@ int dlt_daemon_application_del(DltDaemon *daemon, return 0; } -DltDaemonApplication* dlt_daemon_application_find(DltDaemon *daemon, +DltDaemonApplication *dlt_daemon_application_find(DltDaemon *daemon, char *apid, char *ecu, int verbose) { DltDaemonApplication application; - DltDaemonRegisteredUsers* user_list = NULL; + DltDaemonRegisteredUsers *user_list = NULL; PRINT_FUNCTION_VERBOSE(verbose); if ((daemon == NULL) || (daemon->user_list == NULL) || (apid == NULL) || - (apid[0]=='\0') || (ecu == NULL)) - { - return (DltDaemonApplication*) NULL; - } + (apid[0] == '\0') || (ecu == NULL)) + return (DltDaemonApplication *)NULL; user_list = dlt_daemon_find_users_list(daemon, ecu, verbose); - if (user_list == NULL || (user_list->num_applications == 0)) - { - return (DltDaemonApplication*) NULL; - } + + if ((user_list == NULL) || (user_list->num_applications == 0)) + return (DltDaemonApplication *)NULL; /* Check, if apid is smaller than smallest apid or greater than greatest apid */ if ((memcmp(apid, user_list->applications[0].apid, DLT_ID_SIZE) < 0) || (memcmp(apid, user_list->applications[user_list->num_applications - 1].apid, DLT_ID_SIZE) > 0)) - { - return (DltDaemonApplication*) NULL; - } + return (DltDaemonApplication *)NULL; dlt_set_id(application.apid, apid); - return (DltDaemonApplication*)bsearch(&application, - user_list->applications, - user_list->num_applications, - sizeof(DltDaemonApplication), - dlt_daemon_cmp_apid); + return (DltDaemonApplication *)bsearch(&application, + user_list->applications, + user_list->num_applications, + sizeof(DltDaemonApplication), + dlt_daemon_cmp_apid); } int dlt_daemon_applications_load(DltDaemon *daemon, const char *filename, int verbose) @@ -696,13 +654,12 @@ int dlt_daemon_applications_load(DltDaemon *daemon, const char *filename, int ve PRINT_FUNCTION_VERBOSE(verbose); - if ((daemon == NULL) || (filename == NULL) || (filename[0]=='\0')) + if ((daemon == NULL) || (filename == NULL) || (filename[0] == '\0')) return -1; - fd=fopen(filename, "r"); + fd = fopen(filename, "r"); - if (fd == NULL) - { + if (fd == NULL) { dlt_vlog(LOG_WARNING, "%s: cannot open file %s: %s\n", __func__, @@ -712,19 +669,17 @@ int dlt_daemon_applications_load(DltDaemon *daemon, const char *filename, int ve return -1; } - while (!feof(fd)) - { + while (!feof(fd)) { /* Clear buf */ memset(buf, 0, sizeof(buf)); /* Get line */ ret = fgets(buf, sizeof(buf), fd); - if (NULL == ret) - { + + if (NULL == ret) { /* fgets always null pointer if the last byte of the file is a new line * We need to check here if there was an error or was it feof.*/ - if (ferror(fd)) - { + if (ferror(fd)) { dlt_vlog(LOG_WARNING, "%s: fgets(buf,sizeof(buf),fd) returned NULL. %s\n", __func__, @@ -732,31 +687,29 @@ int dlt_daemon_applications_load(DltDaemon *daemon, const char *filename, int ve fclose(fd); return -1; } - else if(feof(fd)) + else if (feof(fd)) { fclose(fd); return 0; } - else - { + else { dlt_vlog(LOG_WARNING, - "%s: fgets(buf,sizeof(buf),fd) returned NULL. Unknown error.\n", - __func__); + "%s: fgets(buf,sizeof(buf),fd) returned NULL. Unknown error.\n", + __func__); fclose(fd); return -1; } } - if (strcmp(buf, "") != 0) - { + if (strcmp(buf, "") != 0) { /* Split line */ pb = strtok(buf, ":"); - if (pb != NULL) - { - dlt_set_id(apid,pb); - pb = strtok(NULL,":"); - if (pb != NULL) - { + + if (pb != NULL) { + dlt_set_id(apid, pb); + pb = strtok(NULL, ":"); + + if (pb != NULL) { /* pb contains now the description */ /* pid is unknown at loading time */ if (dlt_daemon_application_add(daemon, @@ -765,8 +718,7 @@ int dlt_daemon_applications_load(DltDaemon *daemon, const char *filename, int ve pb, -1, daemon->ecuid, - verbose) == 0) - { + verbose) == 0) { dlt_vlog(LOG_WARNING, "%s: dlt_daemon_application_add failed for %4s\n", __func__, @@ -778,6 +730,7 @@ int dlt_daemon_applications_load(DltDaemon *daemon, const char *filename, int ve } } } + fclose(fd); return 0; @@ -788,50 +741,41 @@ int dlt_daemon_applications_save(DltDaemon *daemon, const char *filename, int ve FILE *fd; int i; - char apid[DLT_ID_SIZE+1]; /* DLT_ID_SIZE+1, because the 0-termination is required here */ - DltDaemonRegisteredUsers* user_list = NULL; + char apid[DLT_ID_SIZE + 1]; /* DLT_ID_SIZE+1, because the 0-termination is required here */ + DltDaemonRegisteredUsers *user_list = NULL; PRINT_FUNCTION_VERBOSE(verbose); - if ((daemon == NULL) || (filename == NULL) || (filename[0]=='\0')) - { + if ((daemon == NULL) || (filename == NULL) || (filename[0] == '\0')) return -1; - } memset(apid, 0, sizeof(apid)); user_list = dlt_daemon_find_users_list(daemon, daemon->ecuid, verbose); + if (user_list == NULL) - { return -1; - } - if ((user_list->applications != NULL) && (user_list->num_applications > 0)) - { + if ((user_list->applications != NULL) && (user_list->num_applications > 0)) { fd = fopen(filename, "w"); - if (fd != NULL) - { - for (i = 0; i < user_list->num_applications; i++) - { + + if (fd != NULL) { + for (i = 0; i < user_list->num_applications; i++) { dlt_set_id(apid, user_list->applications[i].apid); if ((user_list->applications[i].application_description) && (user_list->applications[i].application_description[0] != '\0')) - { fprintf(fd, "%s:%s:\n", apid, user_list->applications[i].application_description); - } else - { fprintf(fd, "%s::\n", apid); - } } + fclose(fd); } - else - { + else { dlt_vlog(LOG_ERR, "%s: open %s failed! No application information stored.\n", __func__, filename); @@ -841,7 +785,7 @@ int dlt_daemon_applications_save(DltDaemon *daemon, const char *filename, int ve return 0; } -DltDaemonContext* dlt_daemon_context_add(DltDaemon *daemon, +DltDaemonContext *dlt_daemon_context_add(DltDaemon *daemon, char *apid, char *ctid, int8_t log_level, @@ -855,70 +799,60 @@ DltDaemonContext* dlt_daemon_context_add(DltDaemon *daemon, DltDaemonApplication *application; DltDaemonContext *context; DltDaemonContext *old; - int new_context=0; - DltDaemonRegisteredUsers* user_list = NULL; + int new_context = 0; + DltDaemonRegisteredUsers *user_list = NULL; PRINT_FUNCTION_VERBOSE(verbose); - if ((daemon == NULL) || (apid == NULL) || (apid[0]=='\0') || - (ctid == NULL) || (ctid[0]=='\0') || (ecu == NULL)) - { - return (DltDaemonContext*) NULL; - } + if ((daemon == NULL) || (apid == NULL) || (apid[0] == '\0') || + (ctid == NULL) || (ctid[0] == '\0') || (ecu == NULL)) + return (DltDaemonContext *)NULL; - if ((log_level<DLT_LOG_DEFAULT) || (log_level>DLT_LOG_VERBOSE)) - { - return (DltDaemonContext*) NULL; - } + if ((log_level < DLT_LOG_DEFAULT) || (log_level > DLT_LOG_VERBOSE)) + return (DltDaemonContext *)NULL; - if ((trace_status<DLT_TRACE_STATUS_DEFAULT) || (trace_status>DLT_TRACE_STATUS_ON)) - { - return (DltDaemonContext*) NULL; - } + if ((trace_status < DLT_TRACE_STATUS_DEFAULT) || (trace_status > DLT_TRACE_STATUS_ON)) + return (DltDaemonContext *)NULL; user_list = dlt_daemon_find_users_list(daemon, ecu, verbose); + if (user_list == NULL) - { - return (DltDaemonContext*) NULL; - } + return (DltDaemonContext *)NULL; + + if (user_list->contexts == NULL) { + user_list->contexts = (DltDaemonContext *)malloc(sizeof(DltDaemonContext) * DLT_DAEMON_CONTEXT_ALLOC_SIZE); - if (user_list->contexts == NULL) - { - user_list->contexts = (DltDaemonContext*) malloc(sizeof(DltDaemonContext)*DLT_DAEMON_CONTEXT_ALLOC_SIZE); if (user_list->contexts == NULL) - { - return (DltDaemonContext*) NULL; - } + return (DltDaemonContext *)NULL; } /* Check if application [apid] is available */ application = dlt_daemon_application_find(daemon, apid, ecu, verbose); + if (application == NULL) - { - return (DltDaemonContext*) NULL; - } + return (DltDaemonContext *)NULL; /* Check if context [apid, ctid] is already available */ context = dlt_daemon_context_find(daemon, apid, ctid, ecu, verbose); - if (context == NULL) - { + + if (context == NULL) { user_list->num_contexts += 1; - if (user_list->num_contexts != 0) - { - if ((user_list->num_contexts % DLT_DAEMON_CONTEXT_ALLOC_SIZE) == 0) - { + if (user_list->num_contexts != 0) { + if ((user_list->num_contexts % DLT_DAEMON_CONTEXT_ALLOC_SIZE) == 0) { /* allocate memory for context in steps of DLT_DAEMON_CONTEXT_ALLOC_SIZE, e.g 100 */ old = user_list->contexts; - user_list->contexts = (DltDaemonContext*) malloc(sizeof(DltDaemonContext) * - ((user_list->num_contexts / DLT_DAEMON_CONTEXT_ALLOC_SIZE) + 1) * DLT_DAEMON_CONTEXT_ALLOC_SIZE); + user_list->contexts = (DltDaemonContext *)malloc(sizeof(DltDaemonContext) * + ((user_list->num_contexts / + DLT_DAEMON_CONTEXT_ALLOC_SIZE) + 1) * + DLT_DAEMON_CONTEXT_ALLOC_SIZE); - if (user_list->contexts == NULL) - { + if (user_list->contexts == NULL) { user_list->contexts = old; user_list->num_contexts -= 1; - return (DltDaemonContext*) NULL; + return (DltDaemonContext *)NULL; } + memcpy(user_list->contexts, old, sizeof(DltDaemonContext) * user_list->num_contexts); @@ -928,42 +862,35 @@ DltDaemonContext* dlt_daemon_context_add(DltDaemon *daemon, context = &(user_list->contexts[user_list->num_contexts - 1]); - dlt_set_id(context->apid,apid); - dlt_set_id(context->ctid,ctid); + dlt_set_id(context->apid, apid); + dlt_set_id(context->ctid, ctid); context->context_description = NULL; application->num_contexts++; - new_context =1; + new_context = 1; } /* Set context description */ - if (context->context_description) - { + if (context->context_description) { free(context->context_description); context->context_description = NULL; } - if (description != NULL) - { - context->context_description = malloc(strlen(description)+1); + if (description != NULL) { + context->context_description = malloc(strlen(description) + 1); - if (context->context_description) - { - strncpy(context->context_description,description,strlen(description)); - context->context_description[strlen(description)]='\0'; + if (context->context_description) { + strncpy(context->context_description, description, strlen(description)); + context->context_description[strlen(description)] = '\0'; } } - if ((strncmp(daemon->ecuid, ecu, DLT_ID_SIZE) == 0) && (daemon->force_ll_ts)) - { + if ((strncmp(daemon->ecuid, ecu, DLT_ID_SIZE) == 0) && (daemon->force_ll_ts)) { if (log_level > daemon->default_log_level) - { log_level = daemon->default_log_level; - } + if (trace_status > daemon->default_trace_status) - { trace_status = daemon->default_trace_status; - } dlt_vlog(LOG_NOTICE, "Adapting ll_ts for context: %.4s:%.4s with %i %i\n", @@ -974,11 +901,10 @@ DltDaemonContext* dlt_daemon_context_add(DltDaemon *daemon, } /* Store log level and trace status, - if this is a new context, or - if this is an old context and the runtime cfg was not loaded */ + * if this is a new context, or + * if this is an old context and the runtime cfg was not loaded */ if ((new_context == 1) || - ((new_context == 0) && (daemon->runtime_context_cfg_loaded == 0))) - { + ((new_context == 0) && (daemon->runtime_context_cfg_loaded == 0))) { context->log_level = log_level; context->trace_status = trace_status; } @@ -987,8 +913,7 @@ DltDaemonContext* dlt_daemon_context_add(DltDaemon *daemon, context->user_handle = user_handle; /* Sort */ - if (new_context) - { + if (new_context) { qsort(user_list->contexts, user_list->num_contexts, sizeof(DltDaemonContext), @@ -1002,7 +927,7 @@ DltDaemonContext* dlt_daemon_context_add(DltDaemon *daemon, } int dlt_daemon_context_del(DltDaemon *daemon, - DltDaemonContext* context, + DltDaemonContext *context, char *ecu, int verbose) { @@ -1013,28 +938,23 @@ int dlt_daemon_context_del(DltDaemon *daemon, PRINT_FUNCTION_VERBOSE(verbose); if ((daemon == NULL) || (context == NULL) || (ecu == NULL)) - { return -1; - } user_list = dlt_daemon_find_users_list(daemon, ecu, verbose); + if (user_list == NULL) - { return -1; - } - if (user_list->num_contexts > 0) - { + if (user_list->num_contexts > 0) { application = dlt_daemon_application_find(daemon, context->apid, ecu, verbose); /* Free description of context to be deleted */ - if (context->context_description) - { + if (context->context_description) { free(context->context_description); context->context_description = NULL; } - pos = context-(user_list->contexts); + pos = context - (user_list->contexts); /* move all contexts above pos to pos */ memmove(&(user_list->contexts[pos]), @@ -1042,7 +962,7 @@ int dlt_daemon_context_del(DltDaemon *daemon, sizeof(DltDaemonContext) * ((user_list->num_contexts - 1) - pos)); /* Clear last context */ - memset(&(user_list->contexts[user_list->num_contexts-1]), + memset(&(user_list->contexts[user_list->num_contexts - 1]), 0, sizeof(DltDaemonContext)); @@ -1050,54 +970,47 @@ int dlt_daemon_context_del(DltDaemon *daemon, /* Check if application [apid] is available */ if (application != NULL) - { application->num_contexts--; - } } return 0; } -DltDaemonContext* dlt_daemon_context_find(DltDaemon *daemon, +DltDaemonContext *dlt_daemon_context_find(DltDaemon *daemon, char *apid, char *ctid, char *ecu, int verbose) { DltDaemonContext context; - DltDaemonRegisteredUsers* user_list = NULL; + DltDaemonRegisteredUsers *user_list = NULL; PRINT_FUNCTION_VERBOSE(verbose); - if ((daemon == NULL) || (apid == NULL) || (apid[0]=='\0') || - (ctid == NULL) || (ctid[0]=='\0') || (ecu == NULL)) - { - return (DltDaemonContext*) NULL; - } + if ((daemon == NULL) || (apid == NULL) || (apid[0] == '\0') || + (ctid == NULL) || (ctid[0] == '\0') || (ecu == NULL)) + return (DltDaemonContext *)NULL; user_list = dlt_daemon_find_users_list(daemon, ecu, verbose); + if ((user_list == NULL) || (user_list->num_contexts == 0)) - { - return (DltDaemonContext*) NULL; - } + return (DltDaemonContext *)NULL; /* Check, if apid is smaller than smallest apid or greater than greatest apid */ if ((memcmp(apid, user_list->contexts[0].apid, DLT_ID_SIZE) < 0) || (memcmp(apid, - user_list->contexts[user_list->num_contexts-1].apid, + user_list->contexts[user_list->num_contexts - 1].apid, DLT_ID_SIZE) > 0)) - { - return (DltDaemonContext*) NULL; - } + return (DltDaemonContext *)NULL; - dlt_set_id(context.apid,apid); - dlt_set_id(context.ctid,ctid); + dlt_set_id(context.apid, apid); + dlt_set_id(context.ctid, ctid); - return (DltDaemonContext*)bsearch(&context, - user_list->contexts, - user_list->num_contexts, - sizeof(DltDaemonContext), - dlt_daemon_cmp_apid_ctid); + return (DltDaemonContext *)bsearch(&context, + user_list->contexts, + user_list->num_contexts, + sizeof(DltDaemonContext), + dlt_daemon_cmp_apid_ctid); } int dlt_daemon_contexts_invalidate_fd(DltDaemon *daemon, @@ -1106,25 +1019,19 @@ int dlt_daemon_contexts_invalidate_fd(DltDaemon *daemon, int verbose) { int i; - DltDaemonRegisteredUsers* user_list = NULL; + DltDaemonRegisteredUsers *user_list = NULL; PRINT_FUNCTION_VERBOSE(verbose); if ((daemon == NULL) || (ecu == NULL)) - { return -1; - } user_list = dlt_daemon_find_users_list(daemon, ecu, verbose); - if (user_list != NULL) - { - for (i=0; i<user_list->num_contexts; i++) - { + + if (user_list != NULL) { + for (i = 0; i < user_list->num_contexts; i++) if (user_list->contexts[i].user_handle == fd) - { user_list->contexts[i].user_handle = DLT_FD_INIT; - } - } return 0; } @@ -1139,36 +1046,29 @@ int dlt_daemon_contexts_clear(DltDaemon *daemon, char *ecu, int verbose) PRINT_FUNCTION_VERBOSE(verbose); - if (daemon == NULL || ecu == NULL) - { + if ((daemon == NULL) || (ecu == NULL)) return DLT_RETURN_WRONG_PARAMETER; - } users = dlt_daemon_find_users_list(daemon, ecu, verbose); + if (users == NULL) - { return DLT_RETURN_ERROR; - } for (i = 0; i < users->num_contexts; i++) - { - if (users->contexts[i].context_description != NULL) - { + if (users->contexts[i].context_description != NULL) { free(users->contexts[i].context_description); users->contexts[i].context_description = NULL; } - } - if (users->contexts) - { + + + if (users->contexts) { free(users->contexts); users->contexts = NULL; } for (i = 0; i < users->num_applications; i++) - { users->applications[i].num_contexts = 0; - } users->num_contexts = 0; @@ -1186,15 +1086,12 @@ int dlt_daemon_contexts_load(DltDaemon *daemon, const char *filename, int verbos PRINT_FUNCTION_VERBOSE(verbose); - if ((daemon == NULL) || (filename == NULL) ||( filename[0]=='\0')) - { + if ((daemon == NULL) || (filename == NULL) || (filename[0] == '\0')) return -1; - } fd = fopen(filename, "r"); - if (fd == NULL) - { + if (fd == NULL) { dlt_vlog(LOG_WARNING, "DLT runtime-context load, cannot open file %s: %s\n", filename, @@ -1203,19 +1100,17 @@ int dlt_daemon_contexts_load(DltDaemon *daemon, const char *filename, int verbos return -1; } - while (!feof(fd)) - { + while (!feof(fd)) { /* Clear buf */ memset(buf, 0, sizeof(buf)); /* Get line */ - ret = fgets(buf,sizeof(buf),fd); - if (NULL == ret) - { + ret = fgets(buf, sizeof(buf), fd); + + if (NULL == ret) { /* fgets always returns null pointer if the last byte of the file is a new line. * We need to check here if there was an error or was it feof.*/ - if (ferror(fd)) - { + if (ferror(fd)) { dlt_vlog(LOG_WARNING, "%s fgets(buf,sizeof(buf),fd[%d]) returned NULL. %s\n", __func__, @@ -1224,13 +1119,12 @@ int dlt_daemon_contexts_load(DltDaemon *daemon, const char *filename, int verbos fclose(fd); return -1; } - else if(feof(fd)) + else if (feof(fd)) { fclose(fd); return 0; } - else - { + else { dlt_vlog(LOG_WARNING, "%s fgets(buf,sizeof(buf),fd[%d]) returned NULL. Unknown error.\n", __func__, @@ -1240,28 +1134,27 @@ int dlt_daemon_contexts_load(DltDaemon *daemon, const char *filename, int verbos } } - if (strcmp(buf ,"") != 0) - { + if (strcmp(buf, "") != 0) { /* Split line */ pb = strtok(buf, ":"); - if (pb != NULL) - { + + if (pb != NULL) { dlt_set_id(apid, pb); pb = strtok(NULL, ":"); - if (pb != NULL) - { + + if (pb != NULL) { dlt_set_id(ctid, pb); pb = strtok(NULL, ":"); - if (pb != NULL) - { + + if (pb != NULL) { sscanf(pb, "%d", &ll); pb = strtok(NULL, ":"); - if (pb != NULL) - { + + if (pb != NULL) { sscanf(pb, "%d", &ts); - pb = strtok(NULL,":"); - if (pb != NULL) - { + pb = strtok(NULL, ":"); + + if (pb != NULL) { /* pb contains now the description */ /* log_level_pos, and user_handle are unknown at loading time */ @@ -1274,8 +1167,7 @@ int dlt_daemon_contexts_load(DltDaemon *daemon, const char *filename, int verbos 0, pb, daemon->ecuid, - verbose) == NULL) - { + verbose) == NULL) { dlt_vlog(LOG_WARNING, "%s dlt_daemon_context_add failed\n", __func__); @@ -1289,64 +1181,56 @@ int dlt_daemon_contexts_load(DltDaemon *daemon, const char *filename, int verbos } } } + fclose(fd); return 0; } -int dlt_daemon_contexts_save(DltDaemon *daemon,const char *filename, int verbose) +int dlt_daemon_contexts_save(DltDaemon *daemon, const char *filename, int verbose) { FILE *fd; int i; - char apid[DLT_ID_SIZE+1], ctid[DLT_ID_SIZE+1]; /* DLT_ID_SIZE+1, because the 0-termination is required here */ - DltDaemonRegisteredUsers* user_list = NULL; + char apid[DLT_ID_SIZE + 1], ctid[DLT_ID_SIZE + 1]; /* DLT_ID_SIZE+1, because the 0-termination is required here */ + DltDaemonRegisteredUsers *user_list = NULL; PRINT_FUNCTION_VERBOSE(verbose); - if ((daemon == NULL) || (filename == NULL) || (filename[0]=='\0')) - { + if ((daemon == NULL) || (filename == NULL) || (filename[0] == '\0')) return -1; - } user_list = dlt_daemon_find_users_list(daemon, daemon->ecuid, verbose); + if (user_list == NULL) - { return -1; - } memset(apid, 0, sizeof(apid)); memset(ctid, 0, sizeof(ctid)); - if ((user_list->contexts) && (user_list->num_contexts > 0)) - { + if ((user_list->contexts) && (user_list->num_contexts > 0)) { fd = fopen(filename, "w"); - if (fd != NULL) - { - for (i = 0; i < user_list->num_contexts; i++) - { + + if (fd != NULL) { + for (i = 0; i < user_list->num_contexts; i++) { dlt_set_id(apid, user_list->contexts[i].apid); dlt_set_id(ctid, user_list->contexts[i].ctid); if ((user_list->contexts[i].context_description) && (user_list->contexts[i].context_description[0] != '\0')) - { - fprintf(fd,"%s:%s:%d:%d:%s:\n",apid,ctid, + fprintf(fd, "%s:%s:%d:%d:%s:\n", apid, ctid, (int)(user_list->contexts[i].log_level), (int)(user_list->contexts[i].trace_status), user_list->contexts[i].context_description); - } else - { - fprintf(fd,"%s:%s:%d:%d::\n",apid,ctid, + fprintf(fd, "%s:%s:%d:%d::\n", apid, ctid, (int)(user_list->contexts[i].log_level), (int)(user_list->contexts[i].trace_status)); - } } + fclose(fd); } - else - { + else { dlt_vlog(LOG_ERR, "%s: Cannot open %s. No context information stored\n", __func__, @@ -1366,11 +1250,11 @@ int dlt_daemon_configuration_save(DltDaemon *daemon, const char *filename, int v if ((daemon == NULL) || (filename == NULL) || (filename[0] == '\0')) return -1; - fd=fopen(filename, "w"); - if (fd != NULL) - { - fprintf(fd,"# 0 = off, 1 = external, 2 = internal, 3 = both\n"); - fprintf(fd,"LoggingMode = %d\n",daemon->mode); + fd = fopen(filename, "w"); + + if (fd != NULL) { + fprintf(fd, "# 0 = off, 1 = external, 2 = internal, 3 = both\n"); + fprintf(fd, "LoggingMode = %d\n", daemon->mode); fclose(fd); } @@ -1380,10 +1264,10 @@ int dlt_daemon_configuration_save(DltDaemon *daemon, const char *filename, int v int dlt_daemon_configuration_load(DltDaemon *daemon, const char *filename, int verbose) { - if(daemon == NULL || filename == NULL) + if ((daemon == NULL) || (filename == NULL)) return -1; - FILE * pFile; + FILE *pFile; char line[1024]; char token[1024]; char value[1024]; @@ -1391,65 +1275,55 @@ int dlt_daemon_configuration_load(DltDaemon *daemon, const char *filename, int v PRINT_FUNCTION_VERBOSE(verbose); - pFile = fopen (filename,"r"); + pFile = fopen (filename, "r"); - if (pFile != NULL) - { - while(1) - { + if (pFile != NULL) { + while (1) { /* fetch line from configuration file */ - if ( fgets (line , 1024 , pFile) != NULL ) - { - pch = strtok (line," =\r\n"); - token[0]=0; - value[0]=0; + if (fgets (line, 1024, pFile) != NULL) { + pch = strtok (line, " =\r\n"); + token[0] = 0; + value[0] = 0; - while (pch != NULL) - { - if(strcmp(pch,"#")==0) + while (pch != NULL) { + if (strcmp(pch, "#") == 0) break; - if(token[0]==0) - { - strncpy(token,pch,sizeof(token)-1); - token[sizeof(token)-1]=0; + if (token[0] == 0) { + strncpy(token, pch, sizeof(token) - 1); + token[sizeof(token) - 1] = 0; } - else - { - strncpy(value,pch,sizeof(value)-1); - value[sizeof(value)-1]=0; + else { + strncpy(value, pch, sizeof(value) - 1); + value[sizeof(value) - 1] = 0; break; } pch = strtok (NULL, " =\r\n"); - } - - if(token[0] && value[0]) - { - /* parse arguments here */ - if(strcmp(token, "LoggingMode") == 0) - { - daemon->mode = atoi(value); - snprintf(str,DLT_DAEMON_COMMON_TEXTBUFSIZE,"Runtime Option: %s=%d\n",token,daemon->mode); - dlt_log(LOG_INFO, str); - } - else - { - snprintf(str,DLT_DAEMON_COMMON_TEXTBUFSIZE,"Unknown option: %s=%s\n",token,value); - dlt_log(LOG_WARNING, str); - } + } + + if (token[0] && value[0]) { + /* parse arguments here */ + if (strcmp(token, "LoggingMode") == 0) { + daemon->mode = atoi(value); + snprintf(str, DLT_DAEMON_COMMON_TEXTBUFSIZE, "Runtime Option: %s=%d\n", token, daemon->mode); + dlt_log(LOG_INFO, str); + } + else { + snprintf(str, DLT_DAEMON_COMMON_TEXTBUFSIZE, "Unknown option: %s=%s\n", token, value); + dlt_log(LOG_WARNING, str); } + } } - else - { + else { break; } } + fclose (pFile); } - else - { - dlt_vlog(LOG_INFO, "Cannot open configuration file: %s\n",filename); + else { + dlt_vlog(LOG_INFO, "Cannot open configuration file: %s\n", filename); } return 0; @@ -1463,28 +1337,25 @@ int dlt_daemon_user_send_log_level(DltDaemon *daemon, DltDaemonContext *context, PRINT_FUNCTION_VERBOSE(verbose); - if ((daemon == NULL) || (context == NULL)) - { + if ((daemon == NULL) || (context == NULL)) { dlt_vlog(LOG_ERR, "NULL parameter in %s", __func__); return -1; } - if (dlt_user_set_userheader(&userheader, DLT_USER_MESSAGE_LOG_LEVEL) < DLT_RETURN_OK) - { + if (dlt_user_set_userheader(&userheader, DLT_USER_MESSAGE_LOG_LEVEL) < DLT_RETURN_OK) { dlt_vlog(LOG_ERR, "Failed to set userheader in %s", __func__); return -1; } - if(context->storage_log_level != DLT_LOG_DEFAULT) - { - usercontext.log_level = context->log_level > context->storage_log_level ? context->log_level:context->storage_log_level; - } + if (context->storage_log_level != DLT_LOG_DEFAULT) + usercontext.log_level = context->log_level > + context->storage_log_level ? context->log_level : context->storage_log_level; else /* Storage log level is not updated (is DEFAULT) then no device is yet connected so ignore */ - { - usercontext.log_level = ((context->log_level == DLT_LOG_DEFAULT)?daemon->default_log_level:context->log_level); - } + usercontext.log_level = + ((context->log_level == DLT_LOG_DEFAULT) ? daemon->default_log_level : context->log_level); - usercontext.trace_status = ((context->trace_status == DLT_TRACE_STATUS_DEFAULT)?daemon->default_trace_status:context->trace_status); + usercontext.trace_status = + ((context->trace_status == DLT_TRACE_STATUS_DEFAULT) ? daemon->default_trace_status : context->trace_status); usercontext.log_level_pos = context->log_level_pos; @@ -1499,17 +1370,15 @@ int dlt_daemon_user_send_log_level(DltDaemon *daemon, DltDaemonContext *context, /* log to FIFO */ errno = 0; ret = dlt_user_log_out2(context->user_handle, - &(userheader), sizeof(DltUserHeader), - &(usercontext), sizeof(DltUserControlMsgLogLevel)); + &(userheader), sizeof(DltUserHeader), + &(usercontext), sizeof(DltUserControlMsgLogLevel)); - if (ret < DLT_RETURN_OK) - { + if (ret < DLT_RETURN_OK) { dlt_vlog(LOG_ERR, "Failed to send data to application in %s: %s", __func__, errno != 0 ? strerror(errno) : "Unknown error"); - if (errno == EPIPE) - { + if (errno == EPIPE) { #ifndef DLT_USE_UNIX_SOCKET_IPC /* Close connection */ close(context->user_handle); @@ -1518,7 +1387,7 @@ int dlt_daemon_user_send_log_level(DltDaemon *daemon, DltDaemonContext *context, } } - return ((ret == DLT_RETURN_OK) ? DLT_RETURN_OK : DLT_RETURN_ERROR); + return (ret == DLT_RETURN_OK) ? DLT_RETURN_OK : DLT_RETURN_ERROR; } int dlt_daemon_user_send_log_state(DltDaemon *daemon, DltDaemonApplication *app, int verbose) @@ -1539,56 +1408,56 @@ int dlt_daemon_user_send_log_state(DltDaemon *daemon, DltDaemonApplication *app, /* log to FIFO */ ret = dlt_user_log_out2(app->user_handle, - &(userheader), sizeof(DltUserHeader), - &(logstate), sizeof(DltUserControlMsgLogState)); + &(userheader), sizeof(DltUserHeader), + &(logstate), sizeof(DltUserControlMsgLogState)); - if (ret < DLT_RETURN_OK) - { - if (errno==EPIPE) - { + if (ret < DLT_RETURN_OK) { + if (errno == EPIPE) { #ifndef DLT_USE_UNIX_SOCKET_IPC /* Close connection */ close(app->user_handle); #endif - app->user_handle=DLT_FD_INIT; + app->user_handle = DLT_FD_INIT; } } - return ((ret == DLT_RETURN_OK) ? DLT_RETURN_OK : DLT_RETURN_ERROR); + return (ret == DLT_RETURN_OK) ? DLT_RETURN_OK : DLT_RETURN_ERROR; } -void dlt_daemon_control_reset_to_factory_default(DltDaemon *daemon,const char *filename, const char *filename1, int InitialContextLogLevel, int InitialContextTraceStatus, int InitialEnforceLlTsStatus, int verbose) +void dlt_daemon_control_reset_to_factory_default(DltDaemon *daemon, + const char *filename, + const char *filename1, + int InitialContextLogLevel, + int InitialContextTraceStatus, + int InitialEnforceLlTsStatus, + int verbose) { FILE *fd; PRINT_FUNCTION_VERBOSE(verbose); - if ((daemon == NULL) || (filename == NULL) || (filename1 == NULL)) - { + if ((daemon == NULL) || (filename == NULL) || (filename1 == NULL)) { dlt_log(LOG_WARNING, "Wrong parameter: Null pointer\n"); return; } - if ((filename[0] == '\0') || (filename1[0] == '\0')) - { + if ((filename[0] == '\0') || (filename1[0] == '\0')) { dlt_log(LOG_WARNING, "Wrong parameter: Empty string\n"); return; } /* Check for runtime cfg file and delete it, if available */ - fd=fopen(filename, "r"); + fd = fopen(filename, "r"); - if (fd != NULL) - { + if (fd != NULL) { /* Close and delete file */ fclose(fd); unlink(filename); } - fd=fopen(filename1, "r"); + fd = fopen(filename1, "r"); - if (fd != NULL) - { + if (fd != NULL) { /* Close and delete file */ fclose(fd); unlink(filename1); @@ -1599,7 +1468,7 @@ void dlt_daemon_control_reset_to_factory_default(DltDaemon *daemon,const char *f daemon->force_ll_ts = InitialEnforceLlTsStatus; /* Reset all other things (log level, trace status, etc. - to default values */ + * to default values */ /* Inform user libraries about changed default log level/trace status */ dlt_daemon_user_send_default_update(daemon, verbose); @@ -1613,35 +1482,27 @@ void dlt_daemon_user_send_default_update(DltDaemon *daemon, int verbose) PRINT_FUNCTION_VERBOSE(verbose); - if (daemon == NULL) - { + if (daemon == NULL) { dlt_log(LOG_WARNING, "Wrong parameter: Null pointer\n"); 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 != NULL) - { + if (context != NULL) { if ((context->log_level == DLT_LOG_DEFAULT) || - (context->trace_status == DLT_TRACE_STATUS_DEFAULT)) - { - if (context->user_handle >= DLT_FD_MINIMUM) - { + (context->trace_status == DLT_TRACE_STATUS_DEFAULT)) { + if (context->user_handle >= DLT_FD_MINIMUM) { if (dlt_daemon_user_send_log_level(daemon, context, verbose) == -1) - { dlt_vlog(LOG_WARNING, "Cannot update default of %.4s:%.4s\n", context->apid, context->ctid); - } } } } @@ -1657,30 +1518,28 @@ void dlt_daemon_user_send_all_log_level_update(DltDaemon *daemon, int8_t log_lev PRINT_FUNCTION_VERBOSE(verbose); if (daemon == NULL) - { 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->user_handle >= DLT_FD_MINIMUM) - { + + if (context) { + if (context->user_handle >= DLT_FD_MINIMUM) { context->log_level = log_level; + if (dlt_daemon_user_send_log_level(daemon, context, verbose) == -1) - { - dlt_vlog(LOG_WARNING, "Cannot send log level %.4s:%.4s -> %i\n", context->apid, context->ctid, context->log_level); - } + dlt_vlog(LOG_WARNING, + "Cannot send log level %.4s:%.4s -> %i\n", + context->apid, + context->ctid, + context->log_level); } } } @@ -1695,29 +1554,28 @@ void dlt_daemon_user_send_all_trace_status_update(DltDaemon *daemon, int8_t trac PRINT_FUNCTION_VERBOSE(verbose); if (daemon == NULL) - { return; - } user_list = dlt_daemon_find_users_list(daemon, daemon->ecuid, verbose); + if (user_list == NULL) - { return; - } + dlt_vlog(LOG_NOTICE, "All trace status is updated -> %i\n", trace_status); - 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->user_handle >= DLT_FD_MINIMUM) - { + + if (context) { + if (context->user_handle >= DLT_FD_MINIMUM) { context->trace_status = trace_status; + if (dlt_daemon_user_send_log_level(daemon, context, verbose) == -1) - { - dlt_vlog(LOG_WARNING, "Cannot send trace status %.4s:%.4s -> %i\n", context->apid, context->ctid, context->trace_status); - } + dlt_vlog(LOG_WARNING, + "Cannot send trace status %.4s:%.4s -> %i\n", + context->apid, + context->ctid, + context->trace_status); } } } @@ -1731,30 +1589,23 @@ void dlt_daemon_user_send_all_log_state(DltDaemon *daemon, int verbose) PRINT_FUNCTION_VERBOSE(verbose); - if (daemon == NULL) - { + if (daemon == NULL) { dlt_log(LOG_WARNING, "Wrong parameter: Null pointer\n"); return; } user_list = dlt_daemon_find_users_list(daemon, daemon->ecuid, verbose); + if (user_list == NULL) - { return; - } - for (count = 0; count < user_list->num_applications; count ++) - { + for (count = 0; count < user_list->num_applications; count++) { app = &(user_list->applications[count]); - if (app != NULL) - { - if (app->user_handle >= DLT_FD_MINIMUM) - { + if (app != NULL) { + if (app->user_handle >= DLT_FD_MINIMUM) { if (dlt_daemon_user_send_log_state(daemon, app, verbose) == -1) - { - dlt_vlog(LOG_WARNING, "Cannot send log state to Apid: %.4s, PID: %d\n",app->apid, app->pid); - } + dlt_vlog(LOG_WARNING, "Cannot send log state to Apid: %.4s, PID: %d\n", app->apid, app->pid); } } } @@ -1762,28 +1613,26 @@ void dlt_daemon_user_send_all_log_state(DltDaemon *daemon, int verbose) void dlt_daemon_change_state(DltDaemon *daemon, DltDaemonState newState) { - switch(newState) - { - case DLT_DAEMON_STATE_INIT: - dlt_log(LOG_INFO,"Switched to init state.\n"); - daemon->state = DLT_DAEMON_STATE_INIT; - break; - case DLT_DAEMON_STATE_BUFFER: - dlt_log(LOG_INFO,"Switched to buffer state for socket connections.\n"); - daemon->state = DLT_DAEMON_STATE_BUFFER; - break; - case DLT_DAEMON_STATE_BUFFER_FULL: - dlt_log(LOG_INFO,"Switched to buffer full state.\n"); - daemon->state = DLT_DAEMON_STATE_BUFFER_FULL; - break; - case DLT_DAEMON_STATE_SEND_BUFFER: - dlt_log(LOG_INFO,"Switched to send buffer state for socket connections.\n"); - daemon->state = DLT_DAEMON_STATE_SEND_BUFFER; - break; - case DLT_DAEMON_STATE_SEND_DIRECT: - dlt_log(LOG_INFO,"Switched to send direct state.\n"); - daemon->state = DLT_DAEMON_STATE_SEND_DIRECT; - break; + switch (newState) { + case DLT_DAEMON_STATE_INIT: + dlt_log(LOG_INFO, "Switched to init state.\n"); + daemon->state = DLT_DAEMON_STATE_INIT; + break; + case DLT_DAEMON_STATE_BUFFER: + dlt_log(LOG_INFO, "Switched to buffer state for socket connections.\n"); + daemon->state = DLT_DAEMON_STATE_BUFFER; + break; + case DLT_DAEMON_STATE_BUFFER_FULL: + dlt_log(LOG_INFO, "Switched to buffer full state.\n"); + daemon->state = DLT_DAEMON_STATE_BUFFER_FULL; + break; + case DLT_DAEMON_STATE_SEND_BUFFER: + dlt_log(LOG_INFO, "Switched to send buffer state for socket connections.\n"); + daemon->state = DLT_DAEMON_STATE_SEND_BUFFER; + break; + case DLT_DAEMON_STATE_SEND_DIRECT: + dlt_log(LOG_INFO, "Switched to send direct state.\n"); + daemon->state = DLT_DAEMON_STATE_SEND_DIRECT; + break; } - } |