diff options
| author | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-06-05 13:51:51 +0000 |
|---|---|---|
| committer | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-06-05 13:51:51 +0000 |
| commit | fa1c5eec7495ec5d7ef708c271d39665a92f2034 (patch) | |
| tree | 1fe20e9d844e48593321b44d8f000ff20e15c1ef /channels | |
| parent | 465d40c20ea8bbbfdf48595d17f96812f714285a (diff) | |
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: http://svn.digium.com/svn/asterisk/branches/1.6.1@199229 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/chan_dahdi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c index 8a1a91936..f400136b9 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; } |