]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Setup timer before set_config().
authorPaul Belanger <paul.belanger@polybeacon.com>
Tue, 21 Sep 2010 22:22:43 +0000 (22:22 +0000)
committerPaul Belanger <paul.belanger@polybeacon.com>
Tue, 21 Sep 2010 22:22:43 +0000 (22:22 +0000)
(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/branches/1.6.2@288147 65c4cc65-6c06-0410-ace0-fbb531ad65f3

channels/chan_iax2.c

index ebab901907259985405e06b910f24c00f6b9b452..c2b40f7604e7b1bbdbb586fb53408a052fc9c45f 100644 (file)
@@ -13876,6 +13876,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) {
@@ -13896,10 +13900,6 @@ static int load_module(void)
        ast_manager_register( "IAXnetstats", EVENT_FLAG_SYSTEM | EVENT_FLAG_REPORTING, manager_iax2_show_netstats, "Show IAX Netstats" );
        ast_manager_register( "IAXregistry", EVENT_FLAG_SYSTEM | EVENT_FLAG_REPORTING, manager_iax2_show_registry, "Show IAX registrations");
 
-       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();