kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-13 16:21:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add a similar dependency on SMDI for voicemail as already exists for ADSI.

Browse Source 
(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: https://origsvn.digium.com/svn/asterisk/branches/1.4@195366 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2009-05-18 20:24:13 +00:00
parent ee5ca5fb33
commit efb22ba096
2 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
apps/app_voicemail.c
View File

@@ -8862,7 +8862,10 @@ static int load_module(void)
{
int res;
char *adsi_loaded = ast_module_helper("", "res_adsi.so", 0, 0, 0, 0);
char *smdi_loaded = ast_module_helper("", "res_smdi.so", 0, 0, 0, 0);
free(adsi_loaded);
free(smdi_loaded);
if (!adsi_loaded) {
/* If embedded, res_adsi may be known as "res_adsi" not "res_adsi.so" */
adsi_loaded = ast_module_helper("", "res_adsi", 0, 0, 0, 0);
@@ -8873,6 +8876,16 @@ static int load_module(void)
}
}
if (!smdi_loaded) {
/* If embedded, res_smdi may be known as "res_smdi" not "res_smdi.so" */
smdi_loaded = ast_module_helper("", "res_smdi", 0, 0, 0, 0);
ast_free(smdi_loaded);
if (!smdi_loaded) {
ast_log(LOG_ERROR, "app_voicemail.so depends upon res_smdi.so\n");
return AST_MODULE_LOAD_DECLINE;
}
}
my_umask = umask(0);
umask(my_umask);
res = ast_register_application(app, vm_exec, synopsis_vm, descrip_vm);

4
res/res_smdi.c
View File

@@ -1337,6 +1337,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;
@@ -1354,8 +1356,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_WARNING, "No SMDI interfaces are available to listen on, not starting SMDI listener.\n");
return AST_MODULE_LOAD_DECLINE;
}