[svn-commits] mattf: branch mattf/bug13495 r161486 - /team/mattf/bug13495/channels/

[SVN commits to the Digium repositories]

Author: mattf
Date: Fri Dec  5 16:12:43 2008
New Revision: 161486

URL: http://svn.digium.com/view/asterisk?view=rev&rev=161486
Log:
Add support for GRS and GRA of ANSI length

Modified:
    team/mattf/bug13495/channels/chan_dahdi.c

Modified: team/mattf/bug13495/channels/chan_dahdi.c
URL: http://svn.digium.com/view/asterisk/team/mattf/bug13495/channels/chan_dahdi.c?view=diff&rev=161486&r1=161485&r2=161486
==============================================================================
--- team/mattf/bug13495/channels/chan_dahdi.c (original)
+++ team/mattf/bug13495/channels/chan_dahdi.c Fri Dec  5 16:12:43 2008
@@ -411,6 +411,7 @@
 	struct ss7 *ss7;
 	struct dahdi_pvt *pvts[MAX_CHANNELS];				/*!< Member channel pvt structs */
 	int flags;							/*!< Linkset flags */
+	int ss7type;
 };
 
 static struct dahdi_ss7 linksets[NUM_SPANS];
@@ -9804,6 +9805,13 @@
 {
 	int i, startcic = -1, endcic, dpc;
 	struct dahdi_pvt *p;
+	int maxrange;
+
+	if (linkset->ss7type == SS7_ITU)
+		maxrange = 31;
+	else
+		maxrange = 24;
+
 
 	if (linkset->numchans <= 0)
 		return;
@@ -9814,7 +9822,7 @@
 	dpc = linkset->pvts[0]->dpc;
 
 	for (i = 0; i < linkset->numchans; i++) {
-		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)) {
+		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 < maxrange)) {
 			continue;
 		} else {
 			endcic = linkset->pvts[i]->cic;
@@ -14072,8 +14080,10 @@
 		return -1;
 	}
 
-	if (!link->ss7)
+	if (!link->ss7) {
 		link->ss7 = ss7_new(cur_ss7type);
+		link->ss7type = cur_ss7type;
+	}
 
 	if (!link->ss7) {
 		ast_log(LOG_ERROR, "Can't create new SS7!\n");