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 8a1a9193679acb2c550e3e0de6a9a92c0d0f8a0c..f400136b939a3e29633c0d00e2cd68cfde7a6c35 100644 (file)
--- 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;
                                }