diff options
author | Russell Bryant <russell@russellbryant.com> | 2009-06-30 17:18:18 +0000 |
---|---|---|
committer | Russell Bryant <russell@russellbryant.com> | 2009-06-30 17:18:18 +0000 |
commit | 1ae0291374cd028acc4a2f0c99c483a85164ba13 (patch) | |
tree | b9ca6b4cde4ed165a1924a4ee8b22f80a2057b7e | |
parent | 564b7aa8483cba9dc42f8f13da6dea9241bd083c (diff) |
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
-rw-r--r-- | addons/chan_ooh323.c | 8 | ||||
-rw-r--r-- | configs/chan_ooh323.conf.sample (renamed from configs/ooh323.conf.sample) | 0 |
2 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) { diff --git a/configs/ooh323.conf.sample b/configs/chan_ooh323.conf.sample index 6d14bcbc5..6d14bcbc5 100644 --- a/configs/ooh323.conf.sample +++ b/configs/chan_ooh323.conf.sample |