corrections (d4233c36) · Commits · TTCN-3 Libraries / LibIms

LibIms_Steps.ttcn

+37 −22

Original line number	Diff line number	Diff line
		@@ -105,6 +105,31 @@ module LibIms_Steps

		}// end f_setHeadersINVITE

		/*
		*
		* @desc sets Invite header fields (IMS addresses)
		* extension of general settings from LibSip basic function
		* @param p_cSeq_s current cSeq
		* @param p_to_user user_profile id of the user to be invited
		* @verdict
		*/
		function f_setHeadersUPDATE(inout CSeq p_cSeq_s, in integer p_to_user) runs on ImsComponent
		{
		vc_to := f_initToHeader(p_to_user); // init of vc_to using userProfile identifier

		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

		if (vc_boo_route)
		{ vc_route := valueof(m_route_interface(vc_interfaceprofile))};
		if (vc_boo_recordRoute)
		{ vc_recordRoute := valueof(m_recordRoute_currIpAddr(vc_userprofile))};

		LibSip_Steps.f_setHeadersUPDATE(p_cSeq_s);

		}// end f_setHeadersUPDATE

		/*
		*
		* @desc sets Message header fields (IMS addresses)
		@@ -174,36 +199,25 @@ module LibIms_Steps
		}// end f_setHeadersSUBSCRIBE

		/**
		* @desc sets headers for ReINVITE method on terminating side
		* @desc sets headers for ReINVITE method
		* @param p_cSeq_s current cSeq
		* @param p_orginatingSide true in case of Re-INVITE is send from the orgination endpoint otherwise false.
		*/
		function f_setHeadersReINVITE (inout CSeq p_cSeq_s) runs on ImsComponent
		function f_setHeadersReINVITE (inout CSeq p_cSeq_s, in boolean p_orginatingSide) runs on ImsComponent
		{
		f_setHeadersGeneral(p_cSeq_s, "INVITE"); // cseq, contact, branch, via

		vc_reqHostPort := vc_requestUri.hostPort;

		vc_to := vc_caller_To;

		if(p_orginatingSide) {
		vc_to := vc_caller_To;
		vc_from := vc_caller_From;

		}// end function f_setHeadersReINVITE

		/**
		* @desc sets headers for ReINVITE method on terminating side
		* @param p_cSeq_s current cSeq
		*/
		function f_setHeadersReINVITE_ (inout CSeq p_cSeq_s) runs on ImsComponent
		{
		f_setHeadersGeneral(p_cSeq_s, "INVITE"); // cseq, contact, branch, via

		vc_reqHostPort := vc_requestUri.hostPort;

		}
		else {
		vc_to := vc_callee_To;

		vc_from := vc_callee_From;

		//vc_requestUri := f_initSipUrl(p_to_user); //bpin need to be implemeted// Request URI of Invite is identical with To header
		}

		}// end function f_setHeadersReINVITE

		@@ -1053,6 +1067,7 @@ module LibIms_Steps
		function f_terminateCall_UE(SipUrl p_requestUri, CallId p_CallId, inout CSeq p_cSeq, From p_from,
		template To p_to) runs on ImsComponent
		{
		LibSip_Steps.f_setHeadersBYE(p_cSeq);
		// Sending of a BYE request to release the call and expect a final response
		f_SendBYE(m_BYE_Request_UE(p_requestUri, p_CallId, p_cSeq, p_from, valueof(p_to), vc_via, vc_route));

LibIms_Templates.ttcn

+5 −5

Original line number	Diff line number	Diff line
		@@ -1971,7 +1971,7 @@ group request_receive {
		historyInfo := p_historyInfo}
		}

		template MESSAGE_Request mw_MESSAGE_Request_noPchargingFunction_UE (template CallId p_callId)
		template MESSAGE_Request mw_MESSAGE_Request_noPchargingFunction_UE
		modifies mw_MESSAGE_Request_Base
		:=
		{
		@@ -1979,7 +1979,7 @@ group request_receive {
		pChargingVector := omit}
		}

		template MESSAGE_Request mw_MESSAGE_Request_noPchargingFunction_IMS (template CallId p_callId)
		template MESSAGE_Request mw_MESSAGE_Request_noPchargingFunction_IMS
		modifies mw_MESSAGE_Request_Base
		:=
		{
		@@ -1995,21 +1995,21 @@ group request_receive {
		}
		}

		template MESSAGE_Request mw_MESSAGE_Request_PchargingVector (template CallId p_callId,template charstring p_id, template charstring p_paramValue)
		template MESSAGE_Request mw_MESSAGE_Request_PchargingVector (template charstring p_id, template charstring p_paramValue)
		modifies mw_MESSAGE_Request_Base
		:=
		{
		msgHeader := { pChargingVector := mw_pChargingVector(p_id,p_paramValue)}
		}

		template MESSAGE_Request mw_MESSAGE_Request_noPaccessNetworkInfo (template CallId p_callId)
		template MESSAGE_Request mw_MESSAGE_Request_noPaccessNetworkInfo
		modifies mw_MESSAGE_Request_Base
		:=
		{
		msgHeader := { pAccessNetworkInfo := omit}
		}

		template MESSAGE_Request mw_MESSAGE_Request_noPMediaAuthorization (template CallId p_callId)
		template MESSAGE_Request mw_MESSAGE_Request_noPMediaAuthorization
		modifies mw_MESSAGE_Request_Base
		:=
		{