Merged revisions 255323 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

................
  r255323 | russell | 2010-03-30 11:07:49 -0500 (Tue, 30 Mar 2010) | 9 lines

  Merged revisions 255322 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.4

  ........
    r255322 | russell | 2010-03-30 11:06:06 -0500 (Tue, 30 Mar 2010) | 2 lines

    Don't make Asterisk not start if pbx_dundi fails to initialize.
  ........
................

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

diff --git a/pbx/pbx_dundi.c b/pbx/pbx_dundi.c
index 85b7f6b59ea4ecf893591be0cc2da374e07df371..2b7293e2bbc47d6a5ffe6ef940dc2c54f35b7a30 100644 (file)
--- a/pbx/pbx_dundi.c
+++ b/pbx/pbx_dundi.c
@@ -4879,7 +4879,7 @@ static int load_module(void)
        sched = sched_context_create();
        
        if (!io || !sched)
-               return AST_MODULE_LOAD_FAILURE;
+               return AST_MODULE_LOAD_DECLINE;
 
        if (set_config("dundi.conf", &sin, 0))
                return AST_MODULE_LOAD_DECLINE;
@@ -4888,12 +4888,12 @@ static int load_module(void)
        
        if (netsocket < 0) {
                ast_log(LOG_ERROR, "Unable to create network socket: %s\n", strerror(errno));
-               return AST_MODULE_LOAD_FAILURE;
+               return AST_MODULE_LOAD_DECLINE;
        }
        if (bind(netsocket, (struct sockaddr *) &sin, sizeof(sin))) {
                ast_log(LOG_ERROR, "Unable to bind to %s port %d: %s\n", 
                        ast_inet_ntoa(sin.sin_addr), ntohs(sin.sin_port), strerror(errno));
-               return AST_MODULE_LOAD_FAILURE;
+               return AST_MODULE_LOAD_DECLINE;
        }
        
        ast_netsock_set_qos(netsocket, tos, 0, "DUNDi");
@@ -4901,7 +4901,7 @@ static int load_module(void)
        if (start_network_thread()) {
                ast_log(LOG_ERROR, "Unable to start network thread\n");
                close(netsocket);
-               return AST_MODULE_LOAD_FAILURE;
+               return AST_MODULE_LOAD_DECLINE;
        }
        
        ast_cli_register_multiple(cli_dundi, sizeof(cli_dundi) / sizeof(*cli_dundi));