From: Jason Parker <jparker@digium.com>
Date: Thu, 24 Jul 2014 16:50:41 +0000 (+0000)
Subject: Don't cause Asterisk to exit if ooh323.conf not found.
X-Git-Tag: 12.5.0-rc1~38
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3ded0141ec6d1f376525cc55005be439a9d61ac6;p=thirdparty%2Fasterisk.git

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/12@419376 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/addons/chan_ooh323.c b/addons/chan_ooh323.c
index acea19519c..55ef3e1f89 100644
--- a/addons/chan_ooh323.c
+++ b/addons/chan_ooh323.c
@@ -3739,10 +3739,10 @@ static int load_module(void)
 		.onMediaChanged = (cb_OnMediaChanged) setup_rtp_remote,
 	};
 	if (!(gCap = ast_format_cap_alloc(0))) {
-		return AST_MODULE_LOAD_FAILURE; 
+		return AST_MODULE_LOAD_DECLINE; 
 	}
 	if (!(ooh323_tech.capabilities = ast_format_cap_alloc(0))) {
-		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);
@@ -3774,13 +3774,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_cli_register_multiple(cli_ooh323, sizeof(cli_ooh323) / sizeof(struct ast_cli_entry));
@@ -3885,7 +3885,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;