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/trunk@151600 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c
index bc4a0125c96584a3c5504b2aebf1030d449e5042..951219d2223f2b231c825ff408359fde18e58d86 100644 (file)
--- a/channels/chan_dahdi.c
+++ b/channels/chan_dahdi.c
@@ -13741,11 +13741,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] = "";
@@ -14525,7 +14528,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]) {