From: Sean Bright <sean.bright@gmail.com>
Date: Wed, 13 Jan 2016 13:20:24 +0000 (-0500)
Subject: res_musiconhold: Prevent multiple simultaneous reloads.
X-Git-Tag: 11.22.0-rc1~35
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2d29e67567f18668b6003771787370460acc01bf;p=thirdparty%2Fasterisk.git

res_musiconhold: Prevent multiple simultaneous reloads.

There are two ways in which the reload() function in res_musiconhold can be
called from the CLI:

  * module reload res_musiconhold.so
  * moh reload

In the former case, the module loader holds a lock that prevents multiple
concurrent calls, but in the latter there is no such protection.

This patch changes the 'moh reload' CLI command to invoke the module loader
directly, rather than call reload() explicitly.

ASTERISK-25687 #close

Change-Id: I408968b4c8932864411b7f9ad88cfdc7b9ba711c
---

diff --git a/res/res_musiconhold.c b/res/res_musiconhold.c
index 91724734e2..1002633e24 100644
--- a/res/res_musiconhold.c
+++ b/res/res_musiconhold.c
@@ -67,6 +67,9 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/time.h"
 #include "asterisk/poll-compat.h"
 
+/* In order to gain access to ast_module_reload in 11 you need to include _private.h */
+#include "asterisk/_private.h"
+
 #define INITIAL_NUM_FILES   8
 #define HANDLE_REF	1
 #define DONT_UNREF	0
@@ -1836,7 +1839,8 @@ static char *handle_cli_moh_reload(struct ast_cli_entry *e, int cmd, struct ast_
 	if (a->argc != e->args)
 		return CLI_SHOWUSAGE;
 
-	reload();
+	/* The module loader will prevent concurrent reloads from occurring, so we delegate */
+	ast_module_reload("res_musiconhold");
 
 	return CLI_SUCCESS;
 }