aboutsummaryrefslogtreecommitdiffstats
path: root/addons
diff options
context:
space:
mode:
authorrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2009-06-30 17:18:18 +0000
committerrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2009-06-30 17:18:18 +0000
commit937ceb79f8b229271d0ee7aac209e003a7f88abe (patch)
treeb9ca6b4cde4ed165a1924a4ee8b22f80a2057b7e /addons
parentc64c92ed31dea1c6ea6ccbaf070ab38120b8776f (diff)
Rename ooh323.conf to chan_ooh323.conf, make module support both names
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@204428 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'addons')
-rw-r--r--addons/chan_ooh323.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/addons/chan_ooh323.c b/addons/chan_ooh323.c
index 70c0f0209..9e087085f 100644
--- a/addons/chan_ooh323.c
+++ b/addons/chan_ooh323.c
@@ -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) {