Commit d3e3b35d authored by garciay's avatar garciay
Browse files

Merge rev. 565/566

parent ba3c5254

ttcn/LibSip_Templates.ttcn

+5 −6
Original line number Diff line number Diff line
@@ -2160,15 +2160,14 @@ group request_send { 
	  messageBody := p_mb

	}

	

	template(value) INVITE_Request m_INVITE_Request_ResourceList

	(template(value) SipUrl p_requestUri, template(omit) CallId p_callId, template(omit) CSeq p_cSeq, template(value) From p_from, template(value) To p_to,

	  template(value) Via p_via, template(omit) Contact p_contact, template(omit) MessageBody p_mb)

	template(value) INVITE_Request m_INVITE_Request_ResourceList(template(value) SipUrl p_requestUri, template(omit) CallId p_callId, template(omit) CSeq p_cSeq, template(value) From p_from, template(value) To p_to,

	  template(value) Via p_via, template(value) Contact p_contact, template(value) MessageBody p_mb)

	modifies m_INVITE_Request_Base

	:=

	{

	  msgHeader :=

	  {

		contentLength	:= {fieldName := CONTENT_LENGTH_E, len:= f_MessageBodyLength(p_mb)},

		contentLength	:= m_contentLength(f_MessageBodyLength(p_mb)), // STF471 {fieldName := CONTENT_LENGTH_E, len:= f_MessageBodyLength(p_mb)},

		contentType := m_contentType(c_xmlresourcelistApplication), // STF471 {fieldName := CONTENT_TYPE_E, mediaType :=  "application/resource-lists+xml"},

		contentDisposition := {

			fieldName := CONTENT_DISPOSITION_E,
@@ -2443,7 +2442,7 @@ group response_send { 
	  	template(value) From p_from, 

	  	template(value) To p_to,

	  	template(value) Via p_via, 

	  	template(omit) Contact p_contact,

	  	template(value) Contact p_contact,

	  	template(value) AlertInfo p_alertInfo

	) modifies m_Response_Contact:= {

		msgHeader := {
@@ -3825,7 +3824,7 @@ group others { 
 */



  function f_merge_CommaParam_List(template(value) CommaParam_List p_list1, template(value) CommaParam_List p_list2) return template(value) CommaParam_List

  {	var template CommaParam_List p_result;

  {	var template(value) CommaParam_List p_result;

  	var integer limit1 := lengthof(p_list1);

  	for (var integer i:=0; i<limit1; i:=i+1) {

  		p_result[i] := p_list1[i]