[svn-commits] seanbright: branch 1.6.0 r202471 - in /branches/1.6.0: ./ cdr/

[SVN commits to the Digium repositories]

Author: seanbright
Date: Mon Jun 22 11:30:58 2009
New Revision: 202471

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=202471
Log:
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.
........

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/cdr/cdr_sqlite3_custom.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/cdr/cdr_sqlite3_custom.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.0/cdr/cdr_sqlite3_custom.c?view=diff&rev=202471&r1=202470&r2=202471
==============================================================================
--- branches/1.6.0/cdr/cdr_sqlite3_custom.c (original)
+++ branches/1.6.0/cdr/cdr_sqlite3_custom.c Mon Jun 22 11:30:58 2009
@@ -70,7 +70,7 @@
 
 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 @@
 	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 @@
 	/* 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 @@
 	/* 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,17 +203,14 @@
 
 	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);
@@ -232,10 +224,6 @@
 
 	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)
@@ -250,6 +238,8 @@
 		/* Should not be loaded, but be failsafe. */
 		return 0;
 	}
+
+	ast_mutex_lock(&lock);
 
 	{ /* Make it obvious that only sql should be used outside of this block */
 		char *escaped;
@@ -272,8 +262,6 @@
 		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,9 +285,9 @@
 
 static int unload_module(void)
 {
+	ast_cdr_unregister(name);
+
 	free_config();
-
-	ast_cdr_unregister(name);
 
 	return 0;
 }
@@ -311,15 +299,9 @@
 	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 @@
 		}
 	}
 
-	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",