sharpetronics/strongswan
1
0
Fork 0
mirror of https://github.com/strongswan/strongswan.git synced 2025-10-08 00:02:03 -04:00
Code Issues Projects Releases Wiki Activity

fixed bug in logger_manager

Browse Source
This commit is contained in:
Jan Hutter 2005-11-16 07:01:08 +00:00
parent cb4f26c5fe
commit 083254bb69
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/charon/testcases/testcases.c
View File

@ -233,7 +233,7 @@ logger_manager_t *global_logger_manager;
global_event_queue = event_queue_create(); global_event_queue = event_queue_create();
global_send_queue = send_queue_create(); global_send_queue = send_queue_create();
global_logger_manager->disable_logger_level(global_logger_manager,TESTER,ALL);
tester_t *tester = tester_create(test_output, FALSE); tester_t *tester = tester_create(test_output, FALSE);

16
Source/charon/utils/logger_manager.c
View File

@ -141,7 +141,7 @@ static logger_t *create_logger(private_logger_manager_t *this, logger_context_t
context_name = "NO CONTEXT"; context_name = "NO CONTEXT";
break; break;
} }
/* logger manager is thread save */
pthread_mutex_lock(&(this->mutex)); pthread_mutex_lock(&(this->mutex));
if (name != NULL) if (name != NULL)
{ {
@ -186,9 +186,14 @@ static logger_t *create_logger(private_logger_manager_t *this, logger_context_t
} }
/**
* Implements logger_manager_t-function get_logger_level.
* @see logger_manager_s.get_logger_level.
*/
static logger_level_t get_logger_level (private_logger_manager_t *this, logger_context_t context) static logger_level_t get_logger_level (private_logger_manager_t *this, logger_context_t context)
{ {
linked_list_iterator_t *iterator; linked_list_iterator_t *iterator;
/* set logger_level to default logger_level */
logger_level_t logger_level = this->default_log_level; logger_level_t logger_level = this->default_log_level;
pthread_mutex_lock(&(this->mutex)); pthread_mutex_lock(&(this->mutex));
@ -198,6 +203,8 @@ static logger_level_t get_logger_level (private_logger_manager_t *this, logger_c
pthread_mutex_unlock(&(this->mutex)); pthread_mutex_unlock(&(this->mutex));
return logger_level; return logger_level;
} }
/* check for existing logger_level entry */
while (iterator->has_next(iterator)) while (iterator->has_next(iterator))
{ {
@ -266,7 +273,6 @@ static status_t destroy_logger (private_logger_manager_t *this,logger_t *logger)
*/ */
static status_t set_logger_level (private_logger_manager_t *this, logger_context_t context,logger_level_t logger_level,bool enable) static status_t set_logger_level (private_logger_manager_t *this, logger_context_t context,logger_level_t logger_level,bool enable)
{ {
linked_list_iterator_t *iterator; linked_list_iterator_t *iterator;
status_t status; status_t status;
@ -278,6 +284,7 @@ static status_t set_logger_level (private_logger_manager_t *this, logger_context
} }
status = NOT_FOUND; status = NOT_FOUND;
/* find existing logger_level entry */
while (iterator->has_next(iterator)) while (iterator->has_next(iterator))
{ {
logger_levels_entry_t * entry; logger_levels_entry_t * entry;
@ -308,7 +315,7 @@ static status_t set_logger_level (private_logger_manager_t *this, logger_context
if (status == NOT_FOUND) if (status == NOT_FOUND)
{ {
/* logger_levels entry not existing for current context */
logger_levels_entry_t *entry = allocator_alloc_thing(logger_levels_entry_t); logger_levels_entry_t *entry = allocator_alloc_thing(logger_levels_entry_t);
if (entry == NULL) if (entry == NULL)
{ {
@ -316,11 +323,12 @@ static status_t set_logger_level (private_logger_manager_t *this, logger_context
return OUT_OF_RES; return OUT_OF_RES;
} }
entry->context = context; entry->context = context;
entry->level = (enable) ? logger_level : this->default_log_level; entry->level = (enable) ? logger_level : (this->default_log_level & (~logger_level));
status = this->logger_levels->insert_last(this->logger_levels,entry); status = this->logger_levels->insert_last(this->logger_levels,entry);
if (status != SUCCESS) if (status != SUCCESS)
{ {
allocator_free(entry);
pthread_mutex_unlock(&(this->mutex)); pthread_mutex_unlock(&(this->mutex));
return status; return status;
} }