diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-05-18 20:55:15 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-05-18 20:55:15 +0000 |
| commit | 8305b9b8420436117d0456dfcb9cca40739cf25d (patch) | |
| tree | d891873c71942b01255cdbb31d78dbffd2bda63e /res | |
| parent | a1a3caa05ad2210a7eaf6028d2db5e34231b9fe7 (diff) | |
Merged revisions 195370 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r195370 | tilghman | 2009-05-18 15:52:33 -0500 (Mon, 18 May 2009) | 15 lines
Recorded merge of revisions 195366 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r195366 | tilghman | 2009-05-18 15:24:13 -0500 (Mon, 18 May 2009) | 8 lines
Add a similar dependency on SMDI for voicemail as already exists for ADSI.
(closes issue #14846)
Reported by: pj
Patches:
20090413__bug14846__1.4.diff.txt uploaded by tilghman (license 14)
20090507__issue14846__1.6.0.diff.txt uploaded by tilghman (license 14)
20090507__issue14846__1.6.1.diff.txt uploaded by tilghman (license 14)
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@195373 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'res')
| -rw-r--r-- | res/res_monitor.c | 1 | ||||
| -rw-r--r-- | res/res_smdi.c | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/res/res_monitor.c b/res/res_monitor.c index 6bd96fbca..17d84892f 100644 --- a/res/res_monitor.c +++ b/res/res_monitor.c @@ -38,6 +38,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/module.h" #include "asterisk/manager.h" #include "asterisk/cli.h" +#define AST_API_MODULE #include "asterisk/monitor.h" #include "asterisk/app.h" #include "asterisk/utils.h" diff --git a/res/res_smdi.c b/res/res_smdi.c index cb8cd6120..224dca9e4 100644 --- a/res/res_smdi.c +++ b/res/res_smdi.c @@ -43,6 +43,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/module.h" #include "asterisk/lock.h" #include "asterisk/utils.h" +#define AST_API_MODULE #include "asterisk/smdi.h" #include "asterisk/config.h" #include "asterisk/astobj.h" @@ -1332,6 +1333,8 @@ static struct ast_custom_function smdi_msg_function = { .read = smdi_msg_read, }; +static int unload_module(void); + static int load_module(void) { int res; @@ -1349,8 +1352,10 @@ static int load_module(void) /* load the config and start the listener threads*/ res = smdi_load(0); if (res < 0) { + unload_module(); return res; } else if (res == 1) { + unload_module(); ast_log(LOG_NOTICE, "No SMDI interfaces are available to listen on, not starting SMDI listener.\n"); return AST_MODULE_LOAD_DECLINE; } |