[svn-commits] rmudgett: branch rmudgett/ss7_27_knk r372117 - /team/rmudgett/ss7_27_knk/chan...

[SVN commits to the Digium repositories]

Author: rmudgett
Date: Fri Aug 31 14:01:24 2012
New Revision: 372117

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=372117
Log:
Fixed the group range limit for ANSI.

Reviewboard 1676 diff 14 plus some spacing changes.

Modified:
    team/rmudgett/ss7_27_knk/channels/chan_dahdi.c
    team/rmudgett/ss7_27_knk/channels/sig_ss7.c

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=372117&r1=372116&r2=372117
==============================================================================
--- team/rmudgett/ss7_27_knk/channels/chan_dahdi.c (original)
+++ team/rmudgett/ss7_27_knk/channels/chan_dahdi.c Fri Aug 31 14:01:24 2012
@@ -16839,7 +16839,8 @@
 	}
 
 	range = atoi(a->argv[6]);
-	if (range < 1 || range > 31) {	/* ITU-T Q.763 3.43 - range 0 is reserved, which makes a range of 2 CICs a minimum group */
+	/* ITU-T Q.763 3.43 - range 0 is reserved, which makes a range of 2 CICs a minimum group */
+	if (range < 1 || range > (linksets[linkset - 1].ss7.type == SS7_ANSI ? 24 : 31)) {
 		ast_cli(a->fd, "Invalid range specified!\n");
 		return CLI_SUCCESS;
 	}
@@ -16922,7 +16923,7 @@
 	}
 
 	range = atoi(a->argv[6]);
-	if (range < 1 || range > 31) {
+	if (range < 1 || range > (linksets[linkset - 1].ss7.type == SS7_ANSI ? 24 : 31)) {
 		ast_cli(a->fd, "Invalid range specified!\n");
 		return CLI_SUCCESS;
 	}

Modified: team/rmudgett/ss7_27_knk/channels/sig_ss7.c
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/ss7_27_knk/channels/sig_ss7.c?view=diff&rev=372117&r1=372116&r2=372117
==============================================================================
--- team/rmudgett/ss7_27_knk/channels/sig_ss7.c (original)
+++ team/rmudgett/ss7_27_knk/channels/sig_ss7.c Fri Aug 31 14:01:24 2012
@@ -781,7 +781,7 @@
  */
 static void ss7_reset_linkset(struct sig_ss7_linkset *linkset)
 {
-	int i, startcic = -1, endcic, dpc;
+	int i, startcic, endcic, dpc;
 	struct sig_ss7_chan *p;
 
 	if (linkset->numchans <= 0) {
@@ -797,7 +797,7 @@
 		if (linkset->pvts[i+1]
 			&& linkset->pvts[i+1]->dpc == dpc
 			&& linkset->pvts[i+1]->cic - linkset->pvts[i]->cic == 1
-			&& linkset->pvts[i]->cic - startcic < 31) {
+			&& linkset->pvts[i]->cic - startcic < (linkset->type == SS7_ANSI ? 24 : 31)) {
 			continue;
 		} else {
 			endcic = linkset->pvts[i]->cic;