denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- two daemon logger were created -> fixed

Browse Source 
- bug in freeing of globals fixed
This commit is contained in:
Jan Hutter
2005-11-22 11:51:01 +00:00
parent c163397e7e
commit ca03b73be9
1 changed files with 3 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/charon/daemon.c
+3 -14
View File
@@ -122,14 +122,6 @@ int main()
destroy_globals(); destroy_globals();
return -1; return -1;
} }
/* a own logger for the daemon is created */
logger = global_logger_manager->create_logger(global_logger_manager,DAEMON,NULL);
if (logger == NULL)
{
printf("could not create logger object");
destroy_globals();
return -1;
}
logger->log(logger,CONTROL,"start daemon %s", DAEMON_NAME); logger->log(logger,CONTROL,"start daemon %s", DAEMON_NAME);
/* now its time to create all the different threads :-) */ /* now its time to create all the different threads :-) */
@@ -274,7 +266,7 @@ static void destroy_globals()
{ {
global_ike_sa_manager->destroy(global_ike_sa_manager); global_ike_sa_manager->destroy(global_ike_sa_manager);
} }
if (global_ike_sa_manager != NULL) if (global_configuration_manager != NULL)
{ {
global_configuration_manager->destroy(global_configuration_manager); global_configuration_manager->destroy(global_configuration_manager);
} }
@@ -355,13 +347,10 @@ static void destroy_and_exit(int exit_code)
/* logger is destroyed */ /* logger is destroyed */
logger->log(logger,CONTROL|MORE,"destroy logger"); logger->log(logger,CONTROL|MORE,"destroy logger");
global_logger_manager->destroy_logger(global_logger_manager,logger);
logger->log(logger,CONTROL|MORE,"destroy logger_manager"); logger->log(logger,CONTROL|MORE,"destroy logger_manager");
logger->log(logger,CONTROL|MORE,"------------------------------------"); logger->log(logger,CONTROL|MORE,"------------------------------------");
if (global_logger_manager != NULL) global_logger_manager->destroy_logger(global_logger_manager,logger);
{ global_logger_manager->destroy(global_logger_manager);
global_logger_manager->destroy(global_logger_manager);
}
#ifdef LEAK_DETECTIVE #ifdef LEAK_DETECTIVE
/* Leaks are reported in log file */ /* Leaks are reported in log file */