kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-06 18:03:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 151600 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/trunk

........
r151600 | mmichelson | 2008-10-22 15:05:14 -0500 (Wed, 22 Oct 2008) | 10 lines

Change some logical ands to bitwise ands and add
messages alerting that a channel is being ignored
if the PROC_DAHDI_NOCHAN option is set in process_dahdi.

(closes issue #13759)
Reported by: smurfix
Patches:
      dahdi.patch uploaded by smurfix (license 547)


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@151602 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Michelson
2008-10-22 20:05:45 +00:00
parent 9642500c8b
commit 439956b118
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
channels/chan_dahdi.c
View File

@@ -13759,11 +13759,14 @@ static int process_dahdi(struct dahdi_chan_conf *confp, const char *cat, struct
#endif #endif
) { ) {
int iscrv; int iscrv;
if (options && PROC_DAHDI_OPT_NOCHAN) if (options & PROC_DAHDI_OPT_NOCHAN) {
ast_log(LOG_WARNING, "Channel '%s' ignored.\n", v->value);
continue; continue;
}
iscrv = !strcasecmp(v->name, "crv"); iscrv = !strcasecmp(v->name, "crv");
if (build_channels(confp, iscrv, v->value, reload, v->lineno, &found_pseudo)) if (build_channels(confp, iscrv, v->value, reload, v->lineno, &found_pseudo))
return -1; return -1;
ast_log(LOG_DEBUG, "Channel '%s' configured.\n", v->value);
} else if (!strcasecmp(v->name, "buffers")) { } else if (!strcasecmp(v->name, "buffers")) {
int res; int res;
char policy[21] = ""; char policy[21] = "";
@@ -14533,7 +14536,7 @@ static int process_dahdi(struct dahdi_chan_conf *confp, const char *cat, struct
} else if (!strcasecmp(v->name, "mwilevel")) { } else if (!strcasecmp(v->name, "mwilevel")) {
mwilevel = atoi(v->value); mwilevel = atoi(v->value);
} }
} else if (!(options && PROC_DAHDI_OPT_NOWARN) ) } else if (!(options & PROC_DAHDI_OPT_NOWARN) )
ast_log(LOG_WARNING, "Ignoring %s at line %d.\n", v->name, v->lineno); ast_log(LOG_WARNING, "Ignoring %s at line %d.\n", v->name, v->lineno);
} }
if (dahdichan[0]) { if (dahdichan[0]) {