diff options
Diffstat (limited to 'channels')
-rw-r--r-- | channels/chan_dahdi.c | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c index b85e0ab38..33a0ccef7 100644 --- a/channels/chan_dahdi.c +++ b/channels/chan_dahdi.c @@ -11470,16 +11470,23 @@ static int setup_dahdi(int reload) #endif #ifdef HAVE_ZAPTEL - if (!(cfg = ast_config_load("zapata.conf"))) { - ast_log(LOG_ERROR, "Unable to load zapata.conf\n"); - return 0; - } + int load_from_zapata_conf = 1; #else - if (!(cfg = ast_config_load("chan_dahdi.conf"))) { - ast_log(LOG_ERROR, "Unable to load chan_dahdi.conf\n"); - return 0; - } + int load_from_zapata_conf = (dahdi_chan_mode == CHAN_ZAP_MODE); #endif + + if (load_from_zapata_conf) { + if (!(cfg = ast_config_load("zapata.conf"))) { + ast_log(LOG_ERROR, "Unable to load zapata.conf\n"); + return 0; + } + } else { + if (!(cfg = ast_config_load("chan_dahdi.conf"))) { + ast_log(LOG_ERROR, "Unable to load chan_dahdi.conf\n"); + return 0; + } + } + /* It's a little silly to lock it, but we mind as well just to be sure */ ast_mutex_lock(&iflock); #ifdef HAVE_PRI |