[asterisk-commits] russell: branch 1.6.1 r255325 - in /branches/1.6.1: ./ pbx/pbx_dundi.c

[SVN commits to the Asterisk project]

Author: russell
Date: Tue Mar 30 11:10:41 2010
New Revision: 255325

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=255325
Log:
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.
  ........
................

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/pbx/pbx_dundi.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/pbx/pbx_dundi.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.1/pbx/pbx_dundi.c?view=diff&rev=255325&r1=255324&r2=255325
==============================================================================
--- branches/1.6.1/pbx/pbx_dundi.c (original)
+++ branches/1.6.1/pbx/pbx_dundi.c Tue Mar 30 11:10:41 2010
@@ -4837,7 +4837,7 @@
 	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 @@
 	
 	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 @@
 	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));