[asterisk-commits] mmichelson: branch 1.6.1 r199229 - in /branches/1.6.1: ./ channels/chan_dahdi.c

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Fri Jun  5 08:51:51 2009
New Revision: 199229

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=199229
Log:
Merged revisions 199227 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r199227 | mmichelson | 2009-06-05 08:51:08 -0500 (Fri, 05 Jun 2009) | 14 lines
  
  Correct "dahdi show channels" output when specifying a group.
  
  Since a DAHDI channel may belong to multiple groups, we need to use
  a bitwise and instead of equivalence to determine whether to display
  the channel information.
  
  
  (closes issue #15248)
  Reported by: gentian
  Patches:
        15248.patch uploaded by mmichelson (license 60)
  Tested by: gentian
........

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.asterisk.org/svn-view/asterisk/branches/1.6.1/channels/chan_dahdi.c?view=diff&rev=199229&r1=199228&r2=199229
==============================================================================
--- branches/1.6.1/channels/chan_dahdi.c (original)
+++ branches/1.6.1/channels/chan_dahdi.c Fri Jun  5 08:51:51 2009
@@ -12683,7 +12683,7 @@
 		if (filtertype) {
 			switch(filtertype) {
 			case 1: /* dahdi show channels group <group> */
-				if (tmp->group != targetnum) {
+				if (!(tmp->group & targetnum)) {
 					tmp = tmp->next;
 					continue;
 				}