[svn-commits] mmichelson: branch 1.6.1 r151602 - in /branches/1.6.1: ./ channels/chan_dahdi.c

[SVN commits to the Digium repositories]

Author: mmichelson
Date: Wed Oct 22 15:05:45 2008
New Revision: 151602

URL: http://svn.digium.com/view/asterisk?view=rev&rev=151602
Log:
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)


........

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/channels/chan_dahdi.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/channels/chan_dahdi.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.1/channels/chan_dahdi.c?view=diff&rev=151602&r1=151601&r2=151602
==============================================================================
--- branches/1.6.1/channels/chan_dahdi.c (original)
+++ branches/1.6.1/channels/chan_dahdi.c Wed Oct 22 15:05:45 2008
@@ -13759,11 +13759,14 @@
 #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 @@
 			} 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]) {