Rename mobile.conf to chan_mobile.conf, make module support old name, too

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

diff --git a/addons/chan_mobile.c b/addons/chan_mobile.c
index 415ca617efdfaec3addeb09810aaa05d478226b9..95aed48fdc5ac0c506a93ef9c338d8e198bd4c49 100644 (file)
--- a/addons/chan_mobile.c
+++ b/addons/chan_mobile.c
@@ -64,7 +64,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/manager.h"
 #include "asterisk/io.h"
 
-#define MBL_CONFIG "mobile.conf"
+#define MBL_CONFIG "chan_mobile.conf"
+#define MBL_CONFIG_OLD "mobile.conf"
 
 #define DEVICE_FRAME_SIZE 48
 #define DEVICE_FRAME_FORMAT AST_FORMAT_SLINEAR
@@ -4075,6 +4076,9 @@ static int mbl_load_config(void)
        struct ast_flags config_flags = { 0 };
 
        cfg = ast_config_load(MBL_CONFIG, config_flags);
+       if (!cfg) {
+               cfg = ast_config_load(MBL_CONFIG_OLD, config_flags);
+       }
        if (!cfg)
                return -1;
 

diff --git a/configs/mobile.conf.sample b/configs/chan_mobile.conf.sample
similarity index 99%
rename from configs/mobile.conf.sample
rename to configs/chan_mobile.conf.sample
index 7555a17e5766a4e03252e9ef0c766d54577090c3..a96d2aba482be7a6d7169ca8261177a2afa714e9 100644 (file)
--- a/configs/mobile.conf.sample
+++ b/configs/chan_mobile.conf.sample
@@ -1,5 +1,5 @@
 ;
-; mobile.conf
+; chan_mobile.conf
 ; configuration file for chan_mobile
 ;