diff options
author | Russell Bryant <russell@russellbryant.com> | 2014-04-23 15:02:39 +0000 |
---|---|---|
committer | Russell Bryant <russell@russellbryant.com> | 2014-04-23 15:02:39 +0000 |
commit | 4b9b4790d95624152b2b0f0e474a9290c94516a6 (patch) | |
tree | 6c15385187b74e083f65bbce9960856617f2c2ac | |
parent | 9b71a87108e8547f2bd02e5d685cd502bf4e822a (diff) |
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: https://origsvn.digium.com/svn/asterisk/trunk@412910 65c4cc65-6c06-0410-ace0-fbb531ad65f3
-rw-r--r-- | funcs/func_periodic_hook.c | 5 | ||||
-rw-r--r-- | funcs/func_periodic_hook.exports.in | 7 | ||||
-rw-r--r-- | main/asterisk.dynamics | 1 | ||||
-rw-r--r-- | res/res_monitor.c | 1 |
4 files changed, 13 insertions, 1 deletions
diff --git a/funcs/func_periodic_hook.c b/funcs/func_periodic_hook.c index 39dfab396..4ee98f3ff 100644 --- 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 new file mode 100644 index 000000000..0ca2f0bee --- /dev/null +++ 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 index 28f801b1e..1c4b1b1ee 100644 --- 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 index f81507285..8181b867f 100644 --- 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" |