From: Joshua Colp <jcolp@digium.com>
Date: Mon, 13 Feb 2012 19:51:14 +0000 (+0000)
Subject: Only allow one 'dialplan reload' to execute at a time as otherwise they would share... 
X-Git-Tag: 10.3.0-rc1~41
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=912a4062e5fa85581cb7059e26e443e784ff2cd4;p=thirdparty%2Fasterisk.git

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

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

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/10@355010 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/pbx/pbx_config.c b/pbx/pbx_config.c
index c4d7737443..b985df8216 100644
--- a/pbx/pbx_config.c
+++ b/pbx/pbx_config.c
@@ -55,6 +55,8 @@ static char *overrideswitch_config = NULL;
 
 AST_MUTEX_DEFINE_STATIC(save_dialplan_lock);
 
+AST_MUTEX_DEFINE_STATIC(reload_lock);
+
 static struct ast_context *local_contexts = NULL;
 static struct ast_hashtab *local_table = NULL;
 /*
@@ -1776,11 +1778,15 @@ static int pbx_load_module(void)
 {
 	struct ast_context *con;
 
+	ast_mutex_lock(&reload_lock);
+
 	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);
 
-	if (!pbx_load_config(config))
+	if (!pbx_load_config(config)) {
+		ast_mutex_unlock(&reload_lock);
 		return AST_MODULE_LOAD_DECLINE;
+	}
 	
 	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_contexts = NULL;
 
+	ast_mutex_unlock(&reload_lock);
+
 	for (con = NULL; (con = ast_walk_contexts(con));)
 		ast_context_verify_includes(con);