From 9219a97997b02cb6b206da679002f3fc16aea310 Mon Sep 17 00:00:00 2001
From: Jason Parker <jparker@digium.com>
Date: Thu, 24 Jul 2014 16:49:35 +0000
Subject: [PATCH] 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
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/11@419375 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
addons/chan_ooh323.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/addons/chan_ooh323.c b/addons/chan_ooh323.c
index 673c5a5223..e34e8352cb 100644
--- a/addons/chan_ooh323.c
+++ b/addons/chan_ooh323.c
@@ -3752,10 +3752,10 @@ static int load_module(void)
.onMediaChanged = (cb_OnMediaChanged) setup_rtp_remote,
};
if (!(gCap = ast_format_cap_alloc())) {
- return AST_MODULE_LOAD_FAILURE;
+ return AST_MODULE_LOAD_DECLINE;
}
if (!(ooh323_tech.capabilities = ast_format_cap_alloc())) {
- return AST_MODULE_LOAD_FAILURE;
+ return AST_MODULE_LOAD_DECLINE;
}
ast_format_cap_add(gCap, ast_format_set(&tmpfmt, AST_FORMAT_ULAW, 0));
ast_format_cap_add_all(ooh323_tech.capabilities);
@@ -3787,13 +3787,13 @@ static int load_module(void)
if (OO_OK != ooH323EpInitialize(OO_CALLMODE_AUDIOCALL, gLogFile)) {
ast_log(LOG_ERROR, "Failed to initialize OOH323 endpoint-"
"OOH323 Disabled\n");
- return AST_MODULE_LOAD_FAILURE;
+ return AST_MODULE_LOAD_DECLINE;
}
/* Make sure we can register our OOH323 channel type */
if (ast_channel_register(&ooh323_tech)) {
ast_log(LOG_ERROR, "Unable to register channel class %s\n", type);
- return AST_MODULE_LOAD_FAILURE;
+ return AST_MODULE_LOAD_DECLINE;
}
ast_rtp_glue_register(&ooh323_rtp);
ast_udptl_proto_register(&ooh323_udptl);
@@ -3899,7 +3899,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;
--
GitLab