Merged revisions 202417 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

........
  r202417 | seanbright | 2009-06-22 12:09:50 -0400 (Mon, 22 Jun 2009) | 4 lines
  
  Fix lock usage in cdr_sqlite3_custom to avoid potential crashes during reload.
  
  Pointed out by Russell while working on the CEL branch.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@202473 65c4cc65-6c06-0410-ace0-fbb531ad65f3
1.6.2
Sean Bright 16 years ago
parent 824737f6d7
commit b2a1c9bf51

@ -70,7 +70,7 @@ struct values {
static AST_LIST_HEAD_STATIC(sql_values, values);
static int free_config(void);
static void free_config(void);
static int load_column_config(const char *tmp)
{
@ -166,11 +166,8 @@ static int load_config(int reload)
free_config();
}
ast_mutex_lock(&lock);
if (!(mappingvar = ast_variable_browse(cfg, "master"))) {
/* Nothing configured */
ast_mutex_unlock(&lock);
ast_config_destroy(cfg);
return -1;
}
@ -185,7 +182,6 @@ static int load_config(int reload)
/* Columns */
if (load_column_config(ast_variable_retrieve(cfg, "master", "columns"))) {
ast_mutex_unlock(&lock);
ast_config_destroy(cfg);
free_config();
return -1;
@ -193,7 +189,6 @@ static int load_config(int reload)
/* Values */
if (load_values_config(ast_variable_retrieve(cfg, "master", "values"))) {
ast_mutex_unlock(&lock);
ast_config_destroy(cfg);
free_config();
return -1;
@ -201,18 +196,15 @@ static int load_config(int reload)
ast_verb(3, "cdr_sqlite3_custom: Logging CDR records to table '%s' in 'master.db'\n", table);
ast_mutex_unlock(&lock);
ast_config_destroy(cfg);
return 0;
}
static int free_config(void)
static void free_config(void)
{
struct values *value;
ast_mutex_lock(&lock);
if (db) {
sqlite3_close(db);
db = NULL;
@ -226,10 +218,6 @@ static int free_config(void)
while ((value = AST_LIST_REMOVE_HEAD(&sql_values, list))) {
ast_free(value);
}
ast_mutex_unlock(&lock);
return 0;
}
static int sqlite3_log(struct ast_cdr *cdr)
@ -245,6 +233,8 @@ static int sqlite3_log(struct ast_cdr *cdr)
return 0;
}
ast_mutex_lock(&lock);
{ /* Make it obvious that only sql should be used outside of this block */
char *escaped;
char subst_buf[2048];
@ -262,8 +252,6 @@ static int sqlite3_log(struct ast_cdr *cdr)
ast_free(value_string);
}
ast_mutex_lock(&lock);
/* XXX This seems awful arbitrary... */
for (count = 0; count < 5; count++) {
res = sqlite3_exec(db, sql, NULL, NULL, &error);
@ -289,10 +277,10 @@ static int sqlite3_log(struct ast_cdr *cdr)
static int unload_module(void)
{
free_config();
ast_cdr_unregister(name);
free_config();
return 0;
}
@ -303,14 +291,7 @@ static int load_module(void)
int res;
char *sql;
if (!load_config(0)) {
res = ast_cdr_register(name, desc, sqlite3_log);
if (res) {
ast_log(LOG_ERROR, "Unable to register custom SQLite3 CDR handling\n");
free_config();
return AST_MODULE_LOAD_DECLINE;
}
} else {
if (load_config(0)) {
return AST_MODULE_LOAD_DECLINE;
}
@ -340,12 +321,25 @@ static int load_module(void)
}
}
return 0;
res = ast_cdr_register(name, desc, sqlite3_log);
if (res) {
ast_log(LOG_ERROR, "Unable to register custom SQLite3 CDR handling\n");
free_config();
return AST_MODULE_LOAD_DECLINE;
}
return AST_MODULE_LOAD_SUCCESS;
}
static int reload(void)
{
return load_config(1);
int res = 0;
ast_mutex_lock(&lock);
res = load_config(1);
ast_mutex_unlock(&lock);
return res;
}
AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "SQLite3 Custom CDR Module",

Loading…
Cancel
Save