[asterisk-commits] russell: trunk r412910 - in /trunk: funcs/ main/ res/

[SVN commits to the Asterisk project]

Author: russell
Date: Wed Apr 23 10:02:39 2014
New Revision: 412910

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=412910
Log:
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.


Added:
    trunk/funcs/func_periodic_hook.exports.in   (with props)
Modified:
    trunk/funcs/func_periodic_hook.c
    trunk/main/asterisk.dynamics
    trunk/res/res_monitor.c

Modified: trunk/funcs/func_periodic_hook.c
URL: http://svnview.digium.com/svn/asterisk/trunk/funcs/func_periodic_hook.c?view=diff&rev=412910&r1=412909&r2=412910
==============================================================================
--- trunk/funcs/func_periodic_hook.c (original)
+++ trunk/funcs/func_periodic_hook.c Wed Apr 23 10:02:39 2014
@@ -520,4 +520,7 @@
 	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,
+		);

Added: trunk/funcs/func_periodic_hook.exports.in
URL: http://svnview.digium.com/svn/asterisk/trunk/funcs/func_periodic_hook.exports.in?view=auto&rev=412910
==============================================================================
--- trunk/funcs/func_periodic_hook.exports.in (added)
+++ trunk/funcs/func_periodic_hook.exports.in Wed Apr 23 10:02:39 2014
@@ -1,0 +1,7 @@
+{
+	global:
+		LINKER_SYMBOL_PREFIX*ast_beep_start;
+		LINKER_SYMBOL_PREFIX*ast_beep_stop;
+	local:
+		*;
+};

Propchange: trunk/funcs/func_periodic_hook.exports.in
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: trunk/funcs/func_periodic_hook.exports.in
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: trunk/funcs/func_periodic_hook.exports.in
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: trunk/main/asterisk.dynamics
URL: http://svnview.digium.com/svn/asterisk/trunk/main/asterisk.dynamics?view=diff&rev=412910&r1=412909&r2=412910
==============================================================================
--- trunk/main/asterisk.dynamics (original)
+++ trunk/main/asterisk.dynamics Wed Apr 23 10:02:39 2014
@@ -1,6 +1,7 @@
 {
 	*ast_adsi_*;
 	*ast_agi_*;
+	*ast_beep_*;
 	*ast_pktccops_*;
 	*ast_smdi_*;
 	*ast_monitor_*;

Modified: trunk/res/res_monitor.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_monitor.c?view=diff&rev=412910&r1=412909&r2=412910
==============================================================================
--- trunk/res/res_monitor.c (original)
+++ trunk/res/res_monitor.c Wed Apr 23 10:02:39 2014
@@ -46,6 +46,7 @@
 #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"