[asterisk-commits] pabelanger: branch 1.6.2 r286117 - in /branches/1.6.2: ./ channels/chan_iax2.c

[SVN commits to the Asterisk project]

Author: pabelanger
Date: Fri Sep 10 15:55:06 2010
New Revision: 286117

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=286117
Log:
Merged revisions 286114 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r286114 | pabelanger | 2010-09-10 16:35:08 -0400 (Fri, 10 Sep 2010) | 4 lines
  
  Load iax.conf before registering any functions/applications/actions.
  
  Review: https://reviewboard.asterisk.org/r/914/
........

Modified:
    branches/1.6.2/   (props changed)
    branches/1.6.2/channels/chan_iax2.c

Propchange: branches/1.6.2/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: branches/1.6.2/channels/chan_iax2.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/channels/chan_iax2.c?view=diff&rev=286117&r1=286116&r2=286117
==============================================================================
--- branches/1.6.2/channels/chan_iax2.c (original)
+++ branches/1.6.2/channels/chan_iax2.c Fri Sep 10 15:55:06 2010
@@ -13829,7 +13829,6 @@
 /*! \brief Load IAX2 module, load configuraiton ---*/
 static int load_module(void)
 {
-
 	static const char config[] = "iax.conf";
 	int x = 0;
 	struct iax2_registry *reg = NULL;
@@ -13837,14 +13836,6 @@
 	if (load_objects()) {
 		return AST_MODULE_LOAD_FAILURE;
 	}
-
-	randomcalltokendata = ast_random();
-	ast_custom_function_register(&iaxpeer_function);
-	ast_custom_function_register(&iaxvar_function);
-
-	iax_set_output(iax_debug_output);
-	iax_set_error(iax_error_output);
-	jb_setoutput(jb_error_output, jb_warning_output, NULL);
 
 	memset(iaxs, 0, sizeof(iaxs));
 
@@ -13880,10 +13871,26 @@
 	}
 	ast_netsock_init(outsock);
 
+	randomcalltokendata = ast_random();
+
+	iax_set_output(iax_debug_output);
+	iax_set_error(iax_error_output);
+	jb_setoutput(jb_error_output, jb_warning_output, NULL);
+
+	if (set_config(config, 0) == -1) {
+		if (timer) {
+			ast_timer_close(timer);
+		}
+		return AST_MODULE_LOAD_DECLINE;
+	}
+
 	ast_cli_register_multiple(cli_iax2, ARRAY_LEN(cli_iax2));
 
 	ast_register_application_xml(papp, iax2_prov_app);
-	
+
+	ast_custom_function_register(&iaxpeer_function);
+	ast_custom_function_register(&iaxvar_function);
+
 	ast_manager_register( "IAXpeers", EVENT_FLAG_SYSTEM | EVENT_FLAG_REPORTING, manager_iax2_show_peers, "List IAX Peers" );
 	ast_manager_register( "IAXpeerlist", EVENT_FLAG_SYSTEM | EVENT_FLAG_REPORTING, manager_iax2_show_peer_list, "List IAX Peers" );
 	ast_manager_register( "IAXnetstats", EVENT_FLAG_SYSTEM | EVENT_FLAG_REPORTING, manager_iax2_show_netstats, "Show IAX Netstats" );
@@ -13893,28 +13900,23 @@
 		ast_timer_set_rate(timer, trunkfreq);
 	}
 
-	if (set_config(config, 0) == -1) {
-		if (timer) {
-			ast_timer_close(timer);
-		}
-		return AST_MODULE_LOAD_DECLINE;
-	}
-
  	if (ast_channel_register(&iax2_tech)) {
 		ast_log(LOG_ERROR, "Unable to register channel class %s\n", "IAX2");
 		__unload_module();
 		return AST_MODULE_LOAD_FAILURE;
 	}
 
-	if (ast_register_switch(&iax2_switch)) 
+	if (ast_register_switch(&iax2_switch)) {
 		ast_log(LOG_ERROR, "Unable to register IAX switch\n");
+	}
 
 	if (start_network_thread()) {
 		ast_log(LOG_ERROR, "Unable to start network thread\n");
 		__unload_module();
 		return AST_MODULE_LOAD_FAILURE;
-	} else
+	} else {
 		ast_verb(2, "IAX Ready and Listening\n");
+	}
 
 	AST_LIST_LOCK(&registrations);
 	AST_LIST_TRAVERSE(&registrations, reg, entry)