From 937ceb79f8b229271d0ee7aac209e003a7f88abe Mon Sep 17 00:00:00 2001 From: russell Date: Tue, 30 Jun 2009 17:18:18 +0000 Subject: [PATCH] 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 --- addons/chan_ooh323.c | 8 ++++++-- configs/{ooh323.conf.sample => chan_ooh323.conf.sample} | 0 2 files changed, 6 insertions(+), 2 deletions(-) rename configs/{ooh323.conf.sample => chan_ooh323.conf.sample} (100%) 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) { 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