Rename ooh323.conf to chan_ooh323.conf, make module support both names
authorRussell Bryant <russell@russellbryant.com>
Tue, 30 Jun 2009 17:18:18 +0000 (17:18 +0000)
committerRussell Bryant <russell@russellbryant.com>
Tue, 30 Jun 2009 17:18:18 +0000 (17:18 +0000)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@204428 65c4cc65-6c06-0410-ace0-fbb531ad65f3

addons/chan_ooh323.c
configs/chan_ooh323.conf.sample [moved from configs/ooh323.conf.sample with 100% similarity]

index 70c0f02..9e08708 100644 (file)
@@ -40,7 +40,8 @@
 /* Channel description */
 static const char type[] = "OOH323";
 static const char tdesc[] = "Objective Systems H323 Channel Driver";
-static const char config[] = "ooh323.conf";
+static const char config[] = "chan_ooh323.conf";
+static const char config_old[] = "ooh323.conf";
 
 
 /* Channel Definition */
@@ -1744,7 +1745,10 @@ int reload_config(int reload)
        if (gH323Debug)
                ast_verbose("---   reload_config\n");
 
-       cfg = ast_config_load((char*)config, config_flags);
+       cfg = ast_config_load(config, config_flags);
+       if (!cfg) {
+               cfg = ast_config_load(config_old, config_flags);
+       }
 
        /* We *must* have a config file otherwise stop immediately */
        if (!cfg) {