Commit dbf13e52 authored by garciay's avatar garciay
Browse files

STF467 corrections: 

- Correction of SetHeaders BYE to include RecordRoute
- Consideration of encrypted SDP in MessageBody
parent fd19ddf8

ttcn/LibIms_Steps.ttcn

+8 −3
Original line number Original line Diff line number Diff line
@@ -1564,11 +1564,16 @@ module LibIms_Steps 
		 * @param p_reqHostPort parameter for outgoing BYE

		 * @param p_reqHostPort parameter for outgoing BYE

		 */

		 */

		function f_terminateCall_UE(SipUrl p_requestUri, CallId p_CallId, inout CSeq p_cSeq, From p_from,

		function f_terminateCall_UE(SipUrl p_requestUri, CallId p_CallId, inout CSeq p_cSeq, From p_from,

		  template To p_to) runs on ImsComponent

		  template To p_to, template RecordRoute p_recordRoute := omit) runs on ImsComponent

		{

		{

		  LibSip_Steps.f_setHeadersBYE(p_cSeq);

		  LibSip_Steps.f_setHeadersBYE(p_cSeq);

		  // Sending of a BYE request to release the call and expect a final response

		  // Sending of a BYE request to release the call and expect a final response

		  if(ispresent(p_recordRoute)) {

		    var Route v_route := { ROUTE_E, valueof(p_recordRoute.routeBody)};

		  	f_SendBYE(m_BYE_Request_UE(p_requestUri, p_CallId, p_cSeq, p_from, valueof(p_to), vc_via, v_route));

		  } else {

		  	f_SendBYE(m_BYE_Request_UE(p_requestUri, p_CallId, p_cSeq, p_from, valueof(p_to), vc_via, vc_route));

		  	f_SendBYE(m_BYE_Request_UE(p_requestUri, p_CallId, p_cSeq, p_from, valueof(p_to), vc_via, vc_route));

		  }

		  

		  

		  tc_resp.start(PX_SIP_TRESP);

		  tc_resp.start(PX_SIP_TRESP);

		  alt

		  alt

ttcn/LibIms_Templates.ttcn

+14 −0
Original line number Original line Diff line number Diff line
@@ -1363,6 +1363,20 @@ group request_send { 
		messageBody := p_mb

		messageBody := p_mb

	  }

	  }





    template ACK_Request m_ACK_Request_Mime_IMS (SipUrl p_requestUri, CallId p_callId, CSeq p_cSeq,

    From p_from, To p_to, Via p_via,template MessageBody p_mb, template Route p_route)

      modifies m_ACK_Request_Base

      :=

      {

        msgHeader :=

        {

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

            contentType := {fieldName := CONTENT_TYPE_E, mediaType :=  c_mimeMultipart},

            route		:= p_route

        },

        messageBody := p_mb

      }

	  

    template BYE_Request m_BYE_Request_IMS

    template BYE_Request m_BYE_Request_IMS

        ( SipUrl p_requestUri, CallId p_callId, CSeq p_cSeq, From p_from, To p_to,

        ( SipUrl p_requestUri, CallId p_callId, CSeq p_cSeq, From p_from, To p_to,

        Via p_via, template Route p_route)

        Via p_via, template Route p_route)