[libss7-commits] mattf: trunk r83 - in /trunk: isup.c mtp3.c

[libss7-commits at lists.digium.com]

Author: mattf
Date: Tue May 15 14:59:43 2007
New Revision: 83

URL: http://svn.digium.com/view/libss7?view=rev&rev=83
Log:
Let's try to make the SLS field more correct in ITU networks.

Modified:
    trunk/isup.c
    trunk/mtp3.c

Modified: trunk/isup.c
URL: http://svn.digium.com/view/libss7/trunk/isup.c?view=diff&rev=83&r1=82&r2=83
==============================================================================
--- trunk/isup.c (original)
+++ trunk/isup.c Tue May 15 14:59:43 2007
@@ -887,7 +887,12 @@
 
 	rlptr = ss7_msg_userpart(msg);
 	rl.opc = ss7->pc;
-	rl.sls = sls_next(ss7);
+
+	if (ss7->switchtype == SS7_ANSI) {
+		rl.sls = sls_next(ss7);
+	} else
+		rl.sls = c->cic & 0xf;
+
 	/* use CIC's DPC instead of linkset's DPC */
 	/* rl.dpc = ss7->def_dpc; */
 	rl.dpc = c->dpc;

Modified: trunk/mtp3.c
URL: http://svn.digium.com/view/libss7/trunk/mtp3.c?view=diff&rev=83&r1=82&r2=83
==============================================================================
--- trunk/mtp3.c (original)
+++ trunk/mtp3.c Tue May 15 14:59:43 2007
@@ -85,7 +85,10 @@
 unsigned char sls_next(struct ss7 *ss7)
 {
 	unsigned char res = ss7->sls;
-	ss7->sls = (ss7->sls + 1) % 16;
+	if (ss7->switchtype == SS7_ITU)
+		ss7->sls = (ss7->sls + 1) % ss7->numlinks;
+	else
+		ss7->sls = (ss7->sls + 1) % 256;
 	return res;
 }