kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-19 03:07:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Only allow one 'dialplan reload' to execute at a time as otherwise they would share the same common local context list.

Browse Source 
(closes issue AST-758)
........

Merged revisions 355009 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 355010 from http://svn.asterisk.org/svn/asterisk/branches/10


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@355011 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Joshua Colp
2012-02-13 19:56:02 +00:00
parent 34c55e8e7c
commit be2ac1b3dd
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pbx/pbx_config.c
View File

@@ -55,6 +55,8 @@ static char *overrideswitch_config = NULL;
AST_MUTEX_DEFINE_STATIC(save_dialplan_lock); AST_MUTEX_DEFINE_STATIC(save_dialplan_lock);
AST_MUTEX_DEFINE_STATIC(reload_lock);
static struct ast_context *local_contexts = NULL; static struct ast_context *local_contexts = NULL;
static struct ast_hashtab *local_table = NULL; static struct ast_hashtab *local_table = NULL;
/* /*
@@ -1776,11 +1778,15 @@ static int pbx_load_module(void)
{ {
struct ast_context *con; struct ast_context *con;
ast_mutex_lock(&reload_lock);
if (!local_table) if (!local_table)
local_table = ast_hashtab_create(17, ast_hashtab_compare_contexts, ast_hashtab_resize_java, ast_hashtab_newsize_java, ast_hashtab_hash_contexts, 0); local_table = ast_hashtab_create(17, ast_hashtab_compare_contexts, ast_hashtab_resize_java, ast_hashtab_newsize_java, ast_hashtab_hash_contexts, 0);
if (!pbx_load_config(config)) if (!pbx_load_config(config)) {
ast_mutex_unlock(&reload_lock);
return AST_MODULE_LOAD_DECLINE; return AST_MODULE_LOAD_DECLINE;
}
pbx_load_users(); pbx_load_users();
@@ -1788,6 +1794,8 @@ static int pbx_load_module(void)
local_table = NULL; /* the local table has been moved into the global one. */ local_table = NULL; /* the local table has been moved into the global one. */
local_contexts = NULL; local_contexts = NULL;
ast_mutex_unlock(&reload_lock);
for (con = NULL; (con = ast_walk_contexts(con));) for (con = NULL; (con = ast_walk_contexts(con));)
ast_context_verify_includes(con); ast_context_verify_includes(con);