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.1@202472 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/cdr/cdr_sqlite3_custom.c b/cdr/cdr_sqlite3_custom.c
index fc4741d410b4ed309a074f78b0d10ae2351fa0e5..64981191d19380bd02f74e2713e9ec6372affb4e 100644 (file)
--- a/cdr/cdr_sqlite3_custom.c
+++ b/cdr/cdr_sqlite3_custom.c
@@ -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)
 {
@@ -170,11 +170,8 @@ static int load_config(int reload)
        if (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;
        }
@@ -191,7 +188,6 @@ static int load_config(int reload)
        /* Columns */
        tmp = ast_variable_retrieve(cfg, "master", "columns");
        if (load_column_config(tmp)) {
-               ast_mutex_unlock(&lock);
                ast_config_destroy(cfg);
                free_config();
                return -1;
@@ -200,7 +196,6 @@ static int load_config(int reload)
        /* Values */
        tmp = ast_variable_retrieve(cfg, "master", "values");
        if (load_values_config(tmp)) {
-               ast_mutex_unlock(&lock);
                ast_config_destroy(cfg);
                free_config();
                return -1;
@@ -208,18 +203,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;
@@ -232,10 +224,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)
@@ -251,6 +239,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];
@@ -272,8 +262,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);
@@ -297,10 +285,10 @@ static int sqlite3_log(struct ast_cdr *cdr)
 
 static int unload_module(void)
 {
-       free_config();
-
        ast_cdr_unregister(name);
 
+       free_config();
+
        return 0;
 }
 
@@ -311,15 +299,9 @@ 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;
+       }
 
        /* is the database there? */
        snprintf(filename, sizeof(filename), "%s/master.db", ast_config_AST_LOG_DIR);
@@ -347,12 +329,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",