From: Mark Michelson <mmichelson@digium.com>
Date: Fri, 5 Jun 2009 13:51:51 +0000 (+0000)
Subject: Merged revisions 199227 via svnmerge from
X-Git-Tag: 1.6.1.3-rc1~174
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=64097edf92eceeecf8bcfb8b52680cc84801976e;p=thirdparty%2Fasterisk.git

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
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@199229 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c
index 8a1a919367..f400136b93 100644
--- a/channels/chan_dahdi.c
+++ b/channels/chan_dahdi.c
@@ -12683,7 +12683,7 @@ static char *dahdi_show_channels(struct ast_cli_entry *e, int cmd, struct ast_cl
 		if (filtertype) {
 			switch(filtertype) {
 			case 1: /* dahdi show channels group <group> */
-				if (tmp->group != targetnum) {
+				if (!(tmp->group & targetnum)) {
 					tmp = tmp->next;
 					continue;
 				}