kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-29 23:39:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Last commit for a bit, minor cleanups and move the lock initialization.

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@123076 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Sean Bright
2008-06-16 17:33:10 +00:00
parent 4ee3510f10
commit f0b9647b09
1 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
cdr/cdr_tds.c
View File

@@ -109,6 +109,8 @@ static void get_date(char *, struct timeval);
static int mssql_connect(void); static int mssql_connect(void);
static int mssql_disconnect(void); static int mssql_disconnect(void);
static void cdr_tds_config_destroy(void);
static int tds_log(struct ast_cdr *cdr) static int tds_log(struct ast_cdr *cdr)
{ {
char sqlcmd[2048], start[80], answer[80], end[80]; char sqlcmd[2048], start[80], answer[80], end[80];
@@ -395,15 +397,20 @@ connect_fail:
return -1; return -1;
} }
static void cdr_tds_config_destroy(void)
{
ast_mutex_destroy(&settings->lock);
ast_string_field_free_memory(settings);
ast_free(settings);
}
static int tds_unload_module(void) static int tds_unload_module(void)
{ {
mssql_disconnect(); mssql_disconnect();
ast_cdr_unregister(name); ast_cdr_unregister(name);
ast_mutex_destroy(&settings->lock); cdr_tds_config_destroy();
ast_string_field_free_memory(settings);
ast_free(settings);
return 0; return 0;
} }
@@ -417,7 +424,7 @@ static int tds_load_module(int reload)
cfg = ast_config_load(config, config_flags); cfg = ast_config_load(config, config_flags);
if (!cfg) { if (!cfg) {
ast_log(LOG_NOTICE, "Unable to load config for MSSQL CDR's: %s\n", config); ast_log(LOG_NOTICE, "Unable to load config for MSSQL CDRs: %s\n", config);
return 0; return 0;
} else if (cfg == CONFIG_STATUS_FILEUNCHANGED) } else if (cfg == CONFIG_STATUS_FILEUNCHANGED)
return 0; return 0;
@@ -441,9 +448,9 @@ static int tds_load_module(int reload)
ast_config_destroy(cfg); ast_config_destroy(cfg);
return 0; return 0;
} }
}
ast_mutex_init(&settings->lock); ast_mutex_init(&settings->lock);
}
ptr = ast_variable_retrieve(cfg, "global", "hostname"); ptr = ast_variable_retrieve(cfg, "global", "hostname");
if (ptr) { if (ptr) {
@@ -470,7 +477,7 @@ static int tds_load_module(int reload)
if (ptr) { if (ptr) {
ast_string_field_set(settings, password, ptr); ast_string_field_set(settings, password, ptr);
} else { } else {
ast_log(LOG_ERROR,"Database password not specified.\n"); ast_log(LOG_ERROR, "Database password not specified.\n");
} }
ptr = ast_variable_retrieve(cfg, "global", "charset"); ptr = ast_variable_retrieve(cfg, "global", "charset");