From 29113e4ad57eca2ca7be22819d9e4a0b3d224ff9 Mon Sep 17 00:00:00 2001 From: Mark Michelson Date: Fri, 5 Jun 2009 13:51:26 +0000 Subject: [PATCH] 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.0@199228 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- channels/chan_dahdi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c index 33ea1d0fe6..e71ee10741 100644 --- a/channels/chan_dahdi.c +++ b/channels/chan_dahdi.c @@ -12468,7 +12468,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 */ - if (tmp->group != targetnum) { + if (!(tmp->group & targetnum)) { tmp = tmp->next; continue; }