]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Don't cause Asterisk to exit if ooh323.conf not found.
authorJason Parker <jparker@digium.com>
Thu, 24 Jul 2014 16:49:35 +0000 (16:49 +0000)
committerJason Parker <jparker@digium.com>
Thu, 24 Jul 2014 16:49:35 +0000 (16:49 +0000)
(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

index 673c5a5223e327e4a5b725b11659f0f72e106187..e34e8352cbc0325f09be4da6e7da26a70bb92d6e 100644 (file)
@@ -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;