[svn-commits] rmudgett: branch group/new-API r304 - /team/group/new-API/mtp3.c

[SVN commits to the Digium repositories]

Author: rmudgett
Date: Tue Jul 17 14:19:08 2012
New Revision: 304

URL: http://svnview.digium.com/svn/libss7?view=rev&rev=304
Log:
  r283 | mattf | 2010-02-24 14:32:56 -0600 (Wed, 24 Feb 2010) | 1 line

  Make sure we also use the new format for replies (SLTA) messages
  ------------------------------------------------------------------------
  r282 | mattf | 2010-02-24 14:30:17 -0600 (Wed, 24 Feb 2010) | 1 line

  Make sure the new SLC placement behavior in STD_TEST messages is only for ANSI
  ------------------------------------------------------------------------
  r281 | mattf | 2010-02-22 15:13:04 -0600 (Mon, 22 Feb 2010) | 1 line

  Add support for ISUP Suspend and Resume messages.  Also, fix problem with ANSI SLC being located in a previously unexpected location (multi link ANSI nodes should work better).

Modified:
    team/group/new-API/mtp3.c

Modified: team/group/new-API/mtp3.c
URL: http://svnview.digium.com/svn/libss7/team/group/new-API/mtp3.c?view=diff&rev=304&r1=303&r2=304
==============================================================================
--- team/group/new-API/mtp3.c (original)
+++ team/group/new-API/mtp3.c Tue Jul 17 14:19:08 2012
@@ -347,7 +347,11 @@
 
 	set_h0(layer4, 1);
 	set_h1(layer4, 1);
-	layer4[1] = (testlen << 4);
+	if (ss7->switchtype == SS7_ANSI)
+		layer4[1] = (testlen << 4) | (link->slc & 0xf);
+	else
+		layer4[1] = (testlen << 4);
+
 	memcpy(&layer4[2], testmessage, testlen);
 
 	ss7_msg_userpart_len(m, rllen + testlen + 2);
@@ -1639,7 +1643,10 @@
 		/* Success! */
 		set_h0(layer4, 1);
 		set_h1(layer4, 2);
-		layer4[1] = (testpatsize << 4);
+		if (ss7->switchtype == SS7_ANSI)
+			layer4[1] = (testpatsize << 4) | (mtp2->slc & 0xf);
+		else
+			layer4[1] = (testpatsize << 4);
 		memcpy(&layer4[2], &headerptr[2], testpatsize);
 		
 		ss7_msg_userpart_len(m, rllen + testpatsize + 2);