diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-03-30 16:10:41 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-03-30 16:10:41 +0000 |
| commit | b72f91c7d9773148ee86b91c498397e28834d74f (patch) | |
| tree | f53504eeb0945e9d2551615e005b9656a005e323 /pbx | |
| parent | ab48055b09bd2a99cd0791d442b1e77aecb2c9ae (diff) | |
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: http://svn.digium.com/svn/asterisk/branches/1.6.1@255325 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'pbx')
| -rw-r--r-- | pbx/pbx_dundi.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pbx/pbx_dundi.c b/pbx/pbx_dundi.c index 3afedcf1e..641d23aa7 100644 --- a/pbx/pbx_dundi.c +++ b/pbx/pbx_dundi.c @@ -4837,7 +4837,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; @@ -4846,12 +4846,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"); @@ -4859,7 +4859,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)); |