kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-12 15:45:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

new installations should be using DAHDI instead of Zaptel, so the sample config file is now chan_dahdi.conf instead of zapata.conf

Browse Source 
also, convert remaining references to zapata.conf in various places



git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@130042 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin P. Fleming
2008-07-11 16:08:03 +00:00
parent 2ea77b3508
commit 92ef406265
12 changed files with 45 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
channels/chan_dahdi.c
View File

@@ -163,8 +163,6 @@ static const char tdesc[] = "DAHDI Telephony Driver"
#endif
;
static const char config[] = "chan_dahdi.conf";
#define SIG_EM DAHDI_SIG_EM
#define SIG_EMWINK (0x0100000 | DAHDI_SIG_EM)
#define SIG_FEATD (0x0200000 | DAHDI_SIG_EM)
@@ -11371,16 +11369,16 @@ static int setup_dahdi(int reload)
#endif
#ifdef HAVE_ZAPTEL
cfg = ast_config_load("zapata.conf");
#else
cfg = ast_config_load(config);
#endif
/* Error if we have no config file... */
if (!cfg) {
ast_log(LOG_ERROR, "Unable to load either config %s or zapata.conf\n", config);
return 0;
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;
}
#endif
/* It's a little silly to lock it, but we mind as well just to be sure */
ast_mutex_lock(&iflock);
#ifdef HAVE_PRI