diff options
| author | Jason Parker <jparker@digium.com> | 2014-07-24 16:52:00 +0000 |
|---|---|---|
| committer | Jason Parker <jparker@digium.com> | 2014-07-24 16:52:00 +0000 |
| commit | 7e7ba07936205fddbb4691ab8d0fbbd107bcbbe2 (patch) | |
| tree | 18952dd396820b46f8b87306307b86488d139777 /addons | |
| parent | f6283866c13a6ced25000443d287dd168fa9a0ca (diff) | |
Don't cause Asterisk to exit if ooh323.conf not found.
(closes issue ASTERISK-23814)
........
Merged revisions 419374 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 419375 from http://svn.asterisk.org/svn/asterisk/branches/11
........
Merged revisions 419376 from http://svn.asterisk.org/svn/asterisk/branches/12
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@419377 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'addons')
| -rw-r--r-- | addons/chan_ooh323.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/addons/chan_ooh323.c b/addons/chan_ooh323.c index 1d37fbc2a..a873fa871 100644 --- a/addons/chan_ooh323.c +++ b/addons/chan_ooh323.c @@ -3749,12 +3749,12 @@ static int load_module(void) .onMediaChanged = (cb_OnMediaChanged) setup_rtp_remote, }; if (!(gCap = ast_format_cap_alloc(AST_FORMAT_CAP_FLAG_DEFAULT))) { - return AST_MODULE_LOAD_FAILURE; + return AST_MODULE_LOAD_DECLINE; } if (!(ooh323_tech.capabilities = ast_format_cap_alloc(AST_FORMAT_CAP_FLAG_DEFAULT))) { ao2_ref(gCap, -1); gCap = NULL; - return AST_MODULE_LOAD_FAILURE; + return AST_MODULE_LOAD_DECLINE; } ast_format_cap_append(gCap, ast_format_ulaw, 0); ast_format_cap_append_by_type(ooh323_tech.capabilities, AST_MEDIA_TYPE_UNKNOWN); @@ -3790,7 +3790,7 @@ static int load_module(void) gCap = NULL; ao2_ref(ooh323_tech.capabilities, -1); ooh323_tech.capabilities = NULL; - return AST_MODULE_LOAD_FAILURE; + return AST_MODULE_LOAD_DECLINE; } /* Make sure we can register our OOH323 channel type */ @@ -3800,7 +3800,7 @@ static int load_module(void) gCap = NULL; ao2_ref(ooh323_tech.capabilities, -1); ooh323_tech.capabilities = NULL; - return AST_MODULE_LOAD_FAILURE; + return AST_MODULE_LOAD_DECLINE; } ast_rtp_glue_register(&ooh323_rtp); ast_cli_register_multiple(cli_ooh323, sizeof(cli_ooh323) / sizeof(struct ast_cli_entry)); @@ -3917,7 +3917,7 @@ static int load_module(void) restart_monitor(); } else { ast_log(LOG_ERROR, "Can't load ooh323 config file, OOH323 Disabled\n"); - return AST_MODULE_LOAD_FAILURE; + return AST_MODULE_LOAD_DECLINE; } return 0; |