kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-12 15:45:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 288157 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r288157 | pabelanger | 2010-09-21 18:26:15 -0400 (Tue, 21 Sep 2010) | 15 lines
  
  Merged revisions 288147 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ........
    r288147 | pabelanger | 2010-09-21 18:22:43 -0400 (Tue, 21 Sep 2010) | 9 lines
    
    Setup timer before set_config().
    
    (closes issue #18019)
    Reported by: Netview
    Patches: 
          issue_0018019.patch uploaded by pabelanger (license 224)
    Tested by: Netview
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@288158 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Paul Belanger
2010-09-21 22:28:21 +00:00
parent e100d8f649
commit b287e93101
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
channels/chan_iax2.c
View File

@@ -14553,6 +14553,10 @@ static int load_module(void)
iax_set_output(iax_debug_output);
iax_set_error(iax_error_output);
jb_setoutput(jb_error_output, jb_warning_output, NULL);
if ((timer = ast_timer_open())) {
ast_timer_set_rate(timer, trunkfreq);
}
if (set_config(config, 0) == -1) {
if (timer) {
@@ -14580,10 +14584,6 @@ static int load_module(void)
ast_manager_register_xml("IAXnetstats", EVENT_FLAG_SYSTEM | EVENT_FLAG_REPORTING, manager_iax2_show_netstats);
ast_manager_register_xml("IAXregistry", EVENT_FLAG_SYSTEM | EVENT_FLAG_REPORTING, manager_iax2_show_registry);
if ((timer = ast_timer_open())) {
ast_timer_set_rate(timer, trunkfreq);
}
if (ast_channel_register(&iax2_tech)) {
ast_log(LOG_ERROR, "Unable to register channel class %s\n", "IAX2");
__unload_module();