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

Adds DAHDI support alongside Zaptel. DAHDI usage favored, but all Zap stuff should continue working. Release announcement to follow.

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@122314 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Jeff Peeler
2008-06-12 19:08:20 +00:00
parent 9f669a3a09
commit f9818af8dd
39 changed files with 2097 additions and 1510 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
pbx/pbx_config.c
View File

@@ -2361,7 +2361,7 @@ static void pbx_load_users(void)
{
struct ast_config *cfg;
char *cat, *chan;
const char *zapchan;
const char *dahdichan;
const char *hasexten;
char tmp[256];
char iface[256];
@@ -2397,11 +2397,21 @@ static void pbx_load_users(void)
if (hasexten && !ast_true(hasexten))
continue;
hasvoicemail = ast_true(ast_config_option(cfg, cat, "hasvoicemail"));
zapchan = ast_variable_retrieve(cfg, cat, "zapchan");
if (!zapchan)
zapchan = ast_variable_retrieve(cfg, "general", "zapchan");
if (!ast_strlen_zero(zapchan)) {
ast_copy_string(zapcopy, zapchan, sizeof(zapcopy));
dahdichan = ast_variable_retrieve(cfg, cat, "dahdichan");
if (!dahdichan)
dahdichan = ast_variable_retrieve(cfg, "general", "dahdichan");
if (!dahdichan) {
/* no dahdichan, but look for zapchan too */
dahdichan = ast_variable_retrieve(cfg, cat, "zapchan");
if (!dahdichan) {
dahdichan = ast_variable_retrieve(cfg, "general", "zapchan");
}
if (!ast_strlen_zero(dahdichan)) {
ast_log(LOG_WARNING, "Use of zapchan in users.conf is deprecated. Please update configuration to use dahdichan instead.\n");
}
}
if (!ast_strlen_zero(dahdichan)) {
ast_copy_string(zapcopy, dahdichan, sizeof(zapcopy));
c = zapcopy;
chan = strsep(&c, ",");
while (chan) {