From: Russell Bryant <russell@russellbryant.com>
Date: Tue, 30 Jun 2009 17:18:18 +0000 (+0000)
Subject: Rename ooh323.conf to chan_ooh323.conf, make module support both names
X-Git-Tag: 11.0.0-beta1~4560
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1ae0291374cd028acc4a2f0c99c483a85164ba13;p=thirdparty%2Fasterisk.git

Rename ooh323.conf to chan_ooh323.conf, make module support both names


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@204428 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/addons/chan_ooh323.c b/addons/chan_ooh323.c
index 70c0f02097..9e087085f1 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) {
diff --git a/configs/ooh323.conf.sample b/configs/chan_ooh323.conf.sample
similarity index 100%
rename from configs/ooh323.conf.sample
rename to configs/chan_ooh323.conf.sample