[asterisk-commits] rmudgett: branch rmudgett/ss7_27_knk r380610 - in /team/rmudgett/ss7_27_knk: ...

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Wed Jan 30 17:08:26 2013
New Revision: 380610

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=380610
Log:
chan_dahdi: Fix "dahdi show channels group" for groups greater than 31.

The variable type used was not large enough to hold a group bit field.
........

Merged revisions 380572 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 380575 from http://svn.asterisk.org/svn/asterisk/branches/11
........

Merged revisions 380576 from http://svn.asterisk.org/svn/asterisk/trunk

Modified:
    team/rmudgett/ss7_27_knk/   (props changed)
    team/rmudgett/ss7_27_knk/channels/chan_dahdi.c

Propchange: team/rmudgett/ss7_27_knk/
------------------------------------------------------------------------------
    automerge = *

Propchange: team/rmudgett/ss7_27_knk/
------------------------------------------------------------------------------
Binary property 'branch-11-merged' - no diff available.

Propchange: team/rmudgett/ss7_27_knk/
------------------------------------------------------------------------------
--- ss7_27_knk-integrated (original)
+++ ss7_27_knk-integrated Wed Jan 30 17:08:26 2013
@@ -1,1 +1,1 @@
-/trunk:1-380566
+/trunk:1-380609

Modified: team/rmudgett/ss7_27_knk/channels/chan_dahdi.c
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/ss7_27_knk/channels/chan_dahdi.c?view=diff&rev=380610&r1=380609&r2=380610
==============================================================================
--- team/rmudgett/ss7_27_knk/channels/chan_dahdi.c (original)
+++ team/rmudgett/ss7_27_knk/channels/chan_dahdi.c Wed Jan 30 17:08:26 2013
@@ -15592,7 +15592,7 @@
 {
 #define FORMAT "%7s %-10.10s %-15.15s %-10.10s %-20.20s %-10.10s %-10.10s %-32.32s\n"
 #define FORMAT2 "%7s %-10.10s %-15.15s %-10.10s %-20.20s %-10.10s %-10.10s %-32.32s\n"
-	int targetnum = 0;
+	ast_group_t targetnum = 0;
 	int filtertype = 0;
 	struct dahdi_pvt *tmp = NULL;
 	char tmps[20];
@@ -15619,10 +15619,10 @@
 	if (a->argc == 5) {
 		if (!strcasecmp(a->argv[3], "group")) {
 			targetnum = atoi(a->argv[4]);
-			if ((targetnum < 0) || (targetnum > 63)) {
+			if (63 < targetnum) {
 				return CLI_SHOWUSAGE;
 			}
-			targetnum = 1 << targetnum;
+			targetnum = ((ast_group_t) 1) << targetnum;
 			filtertype = 1;
 		} else if (!strcasecmp(a->argv[3], "context")) {
 			filtertype = 2;