diff options
| author | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-10-22 20:05:45 +0000 |
|---|---|---|
| committer | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-10-22 20:05:45 +0000 |
| commit | a9e019337447ee35524f347eb5389acc0a8044a1 (patch) | |
| tree | 15d83352ad9e9db161b71de04657df86d0e00f86 /channels | |
| parent | b4961f6c1ea67f98341bd0d2bc9d8ca21b0a5a70 (diff) | |
Merged revisions 151600 via svnmerge from
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: http://svn.digium.com/svn/asterisk/branches/1.6.1@151602 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/chan_dahdi.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c index b0cce0faf..5e69462ca 100644 --- a/channels/chan_dahdi.c +++ b/channels/chan_dahdi.c @@ -13759,11 +13759,14 @@ static int process_dahdi(struct dahdi_chan_conf *confp, const char *cat, struct #endif ) { 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; + } iscrv = !strcasecmp(v->name, "crv"); if (build_channels(confp, iscrv, v->value, reload, v->lineno, &found_pseudo)) return -1; + ast_log(LOG_DEBUG, "Channel '%s' configured.\n", v->value); } else if (!strcasecmp(v->name, "buffers")) { int res; 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")) { 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); } if (dahdichan[0]) { |