Fix error loading res_monitor.

For some odd reason, loading app_mixmonitor was fine, but res_monitor was not. This patch fixes a set of issues related to func_periodic_hook exporting the beep functions that gets res_monitor working again. git-svn-id: http://svn.asterisk.org/svn/asterisk/trunk@412910 f38db490-d61c-443f-a65b-d21fe96a405b
jcollie · Apr 23, 2014 · d5e46c4 · d5e46c4
1 parent aaef7d3
commit d5e46c4
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 1 deletion.
diff --git a/funcs/func_periodic_hook.c b/funcs/func_periodic_hook.c
@@ -520,4 +520,7 @@ int AST_OPTIONAL_API_NAME(ast_beep_stop)(struct ast_channel *chan, const char *b
 	return hook_write(chan, NULL, (char *) beep_id, "off");
 }
 
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Periodic dialplan hooks.");
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS, "Periodic dialplan hooks.",
+		.load = load_module,
+		.unload = unload_module,
+		);
diff --git a/funcs/func_periodic_hook.exports.in b/funcs/func_periodic_hook.exports.in
@@ -0,0 +1,7 @@
+{
+	global:
+		LINKER_SYMBOL_PREFIX*ast_beep_start;
+		LINKER_SYMBOL_PREFIX*ast_beep_stop;
+	local:
+		*;
+};
diff --git a/main/asterisk.dynamics b/main/asterisk.dynamics
@@ -1,6 +1,7 @@
 {
 	*ast_adsi_*;
 	*ast_agi_*;
+	*ast_beep_*;
 	*ast_pktccops_*;
 	*ast_smdi_*;
 	*ast_monitor_*;

diff --git a/res/res_monitor.c b/res/res_monitor.c
@@ -46,6 +46,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/stasis_channels.h"
 #define AST_API_MODULE
 #include "asterisk/monitor.h"
+#undef AST_API_MODULE
 #include "asterisk/app.h"
 #include "asterisk/utils.h"
 #include "asterisk/config.h"