Commit 3b0185b3 authored by pintar's avatar pintar
Browse files

corrections due to validation of STF346 from week 42

parent 428ccf0c

LibIms_Steps.ttcn

+10 −6
Original line number Diff line number Diff line
@@ -42,6 +42,8 @@ module LibIms_Steps 
		  vc_from := f_initFromHeader(vc_userprofile.id, f_getRndTag()); // init of vc_from using userProfile identifier

        

		  vc_requestUri := f_initSipUrl(p_to_user); // Request URI of Invite is identical with To header

		  vc_route 		:= f_route(); 		// update the route header field depending on vc_boo_route

		  vc_recordRoute := f_recordroute(); // update the route header field depending on vc_boo_route

		

		  LibSip_Steps.f_setHeadersBYE(p_cSeq_s);
@@ -809,7 +811,7 @@ module LibIms_Steps 
				  {

					tc_ack.stop;

					// set headers via, cseq and authorization

					f_setHeaders_2ndREGISTER();

					f_setHeaders_2ndREGISTER(p_cSeq_s);

					f_SendREGISTER(m_REGISTER_Request_IMS(vc_requestUri, vc_callId, vc_cSeq, vc_from, vc_to, vc_via_REG, vc_contact, m_add_Authorization_digest(vc_authorization,{c_Integrity_protected_yes}))); //LibSip

	            

					// awaiting 200 OK REGISTER
@@ -902,7 +904,7 @@ module LibIms_Steps 
		* @param p_cSeq_s		  	cseq parameter

		* @param p_register		register template

		*/

		function f_IMS_preamble_withRegistration (in integer p_userprofile, inout CSeq p_cSeq_s, template REGISTER_Request p_register) runs on ImsComponent

		function f_IMS_preamble_withRegistration (in integer p_userprofile, inout CSeq p_cSeq_s, out template REGISTER_Request p_register) runs on ImsComponent

		{

		

			//Variables & defaults initialization
@@ -911,7 +913,9 @@ module LibIms_Steps 
			//Preamble

			f_Registration(p_cSeq_s, p_register, PX_SIP_REGISTER_AUTHENTICATION_ENABLED);

			

			f_Subscription(p_cSeq_s, m_SUBSCRIBE_Request_UE(vc_requestUri, vc_callId, p_cSeq_s, vc_from, vc_to, vc_via, vc_contact));

			f_setHeaders_SUBSCRIBE(p_cSeq_s);

			f_Subscription(p_cSeq_s, m_SUBSCRIBE_Request_UE(vc_requestUri, vc_callId, p_cSeq_s, vc_from, vc_to, vc_via, vc_contact, vc_route_REG));



		}	



		/*
@@ -929,8 +933,8 @@ module LibIms_Steps 
	

			//Preamble

   			f_Registration_IMS(p_cSeq_s, PX_SIP_REGISTER_AUTHENTICATION_ENABLED);

			

			f_Subscription(p_cSeq_s, m_SUBSCRIBE_Request_UE(vc_requestUri, vc_callId, p_cSeq_s, vc_from, vc_to, vc_via, vc_contact));

			f_setHeaders_SUBSCRIBE(p_cSeq_s);

			f_Subscription(p_cSeq_s, m_SUBSCRIBE_Request_UE(vc_requestUri, vc_callId, p_cSeq_s, vc_from, vc_to, vc_via, vc_contact, vc_route_REG));

		}			

		

	} // end group preambles

LibIms_Templates.ttcn

+4 −3
Original line number Diff line number Diff line
@@ -1552,7 +1552,7 @@ group request_send { 
			{

			  msgHeader :=

			  {

				contentLength	:= {fieldName := CONTENT_LENGTH_E, len:= f_TextPlainLength(valueof(m_MBody_longPlainText))},

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

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

				pAccessNetworkInfo := m_pAccessNetworkInfo_IEEE_11a,

				require := p_require,
@@ -1683,7 +1683,7 @@ group request_send { 
	}

	

	template SUBSCRIBE_Request m_SUBSCRIBE_Request_UE (SipUrl p_requestUri, CallId p_callId, 

		CSeq p_cSeq, From p_from, To p_to, Via p_via, Contact p_contact)  modifies m_SUBSCRIBE_Request_Base :=

		CSeq p_cSeq, From p_from, To p_to, Via p_via, Contact p_contact, template Route p_route)  modifies m_SUBSCRIBE_Request_Base :=

	{

		requestLine	:=

		{
@@ -1696,7 +1696,8 @@ group request_send { 
			contact	:= p_contact,

			cSeq	:= {fieldName:=CSEQ_E, seqNumber:= p_cSeq.seqNumber, method:= "SUBSCRIBE"},

			event	:= m_Event_reg,

			expires	:= m_Expires_600000

			expires	:= m_Expires_600000,

			route   := p_route

		}

	}