sysmocom
/
asterisk
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
This commit is contained in:
Russell Bryant 2014-04-23 15:02:39 +00:00
parent 9b71a87108
commit 4b9b4790d9
4 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
funcs/func_periodic_hook.c
View File

@ -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,
);

7
funcs/func_periodic_hook.exports.in Normal file
View File

@ -0,0 +1,7 @@
{
global:
LINKER_SYMBOL_PREFIX*ast_beep_start;
LINKER_SYMBOL_PREFIX*ast_beep_stop;
local:
*;
};

1
main/asterisk.dynamics
View File

@ -1,6 +1,7 @@
{
*ast_adsi_*;
*ast_agi_*;
*ast_beep_*;
*ast_pktccops_*;
*ast_smdi_*;
*ast_monitor_*;

1
res/res_monitor.c
View File

@ -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"