Merged revisions 164525 via svnmerge from

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

........
r164525 | russell | 2008-12-15 16:25:46 -0600 (Mon, 15 Dec 2008) | 6 lines

Open a timer before loading configuration so that the trunking configuration option
will take effect.

(closes issue #14082)
Reported by: seandarcy

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@164527 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2008-12-15 22:27:19 +00:00
parent a0258d8f1b
commit 791523697d

View File

@@ -12443,14 +12443,15 @@ static int load_module(void)
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" );
if(set_config(config, 0) == -1)
return AST_MODULE_LOAD_DECLINE;
timingfd = ast_timer_open();
if (timingfd > -1) {
ast_timer_set_rate(timingfd, trunkfreq);
}
if (set_config(config, 0) == -1) {
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();