[svn-commits] russell: trunk r204428 - in /trunk: addons/ configs/

[SVN commits to the Digium repositories]

Author: russell
Date: Tue Jun 30 12:18:18 2009
New Revision: 204428

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=204428
Log:
Rename ooh323.conf to chan_ooh323.conf, make module support both names

Added:
    trunk/configs/chan_ooh323.conf.sample
      - copied unchanged from r204421, trunk/configs/ooh323.conf.sample
Removed:
    trunk/configs/ooh323.conf.sample
Modified:
    trunk/addons/chan_ooh323.c

Modified: trunk/addons/chan_ooh323.c
URL: http://svn.asterisk.org/svn-view/asterisk/trunk/addons/chan_ooh323.c?view=diff&rev=204428&r1=204427&r2=204428
==============================================================================
--- trunk/addons/chan_ooh323.c (original)
+++ trunk/addons/chan_ooh323.c Tue Jun 30 12:18:18 2009
@@ -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 @@
 	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) {