[asterisk-commits] russell: branch group/newcdr r202063 - /team/group/newcdr/main/

[SVN commits to the Asterisk project]

Author: russell
Date: Fri Jun 19 16:32:05 2009
New Revision: 202063

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=202063
Log:
Make CEL reloads actually execute, and then fix them to not deadlock or crash.

Modified:
    team/group/newcdr/main/cel.c
    team/group/newcdr/main/loader.c

Modified: team/group/newcdr/main/cel.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/group/newcdr/main/cel.c?view=diff&rev=202063&r1=202062&r2=202063
==============================================================================
--- team/group/newcdr/main/cel.c (original)
+++ team/group/newcdr/main/cel.c Fri Jun 19 16:32:05 2009
@@ -211,7 +211,7 @@
 	const char *enabled_value;
 	const char *val;
 	int res = 0;
-	struct ast_flags config_flags = { CONFIG_FLAG_FILEUNCHANGED };
+	struct ast_flags config_flags = { 0, };
 	const char *s;
 
 	ast_mutex_lock(&reload_lock);
@@ -228,13 +228,15 @@
 		while ((str = ast_hashtab_next(it))) {
 			free(str);
 		}
+		ast_hashtab_end_traversal(it);
 		ast_hashtab_destroy(appset, NULL);
 		appset = 0;
 	}
 
 	config = ast_config_load2("cel.conf", "cel", config_flags);
 
-	if (!config || config == CONFIG_STATUS_FILEUNCHANGED) {
+	if (config == CONFIG_STATUS_FILEMISSING) {
+		config = NULL;
 		goto return_cleanup;
 	}
 

Modified: team/group/newcdr/main/loader.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/group/newcdr/main/loader.c?view=diff&rev=202063&r1=202062&r2=202063
==============================================================================
--- team/group/newcdr/main/loader.c (original)
+++ team/group/newcdr/main/loader.c Fri Jun 19 16:32:05 2009
@@ -258,6 +258,7 @@
 	{ "dsp",	ast_dsp_reload},
 	{ "udptl",	ast_udptl_reload },
 	{ "indications", ast_indications_reload },
+	{ "cel",        ast_cel_engine_reload },
 	{ NULL, 	NULL }
 };