Commit cd0dad42 authored by rennoch's avatar rennoch
Browse files

extended response templates due to "forbidden" use of functions with component... 

extended response templates due to "forbidden" use of functions with component variables (error with ttwb 1.1.8)
parent a9e2b7b5

ttcn/LibSip_Templates.ttcn

+17 −49
Original line number Diff line number Diff line
@@ -1972,16 +1972,16 @@ group response_send { 
	}



	template Response m_Response_ext (StatusLine p_statusLine, CallId p_callId, CSeq p_cSeq,

	  From p_from, To p_to, Via p_via) modifies m_Response_Base:=

	  From p_from, To p_to, Via p_via, template Route p_route, template RecordRoute p_recordroute) modifies m_Response_Base:=

	{

		msgHeader :={

			route 		:= f_route(),

			recordRoute := f_recordroute()

			route 		:= p_route, //f_route(),

			recordRoute := p_recordroute //f_recordroute()

			}

	}

			

	template Response m_Response_mbody (StatusLine p_statusLine, CallId p_callId, CSeq p_cSeq,

	  From p_from, To p_to, Via p_via, MessageBody p_mb) modifies m_Response_ext:=

	  From p_from, To p_to, Via p_via,  template Route p_route, template RecordRoute p_recordroute, MessageBody p_mb) modifies m_Response_ext:=

	{

		msgHeader :=

			 {
@@ -1992,7 +1992,7 @@ group response_send { 
	}

			

	template Response m_Response_PAsserted_Privacy (StatusLine p_statusLine, CallId p_callId, CSeq p_cSeq,

			From p_from, To p_to, Via p_via, template PAssertedID p_pAssertedID, template Privacy p_privacy) modifies m_Response_ext:=

			From p_from, To p_to, Via p_via,  template Route p_route, template RecordRoute p_recordroute, template PAssertedID p_pAssertedID, template Privacy p_privacy) modifies m_Response_ext:=

	{

		msgHeader :=

				{
@@ -2014,7 +2014,7 @@ group response_send { 
	}

			

	template Response m_Response_PAsserted_Privacy_mbody (StatusLine p_statusLine, CallId p_callId, CSeq p_cSeq,

			From p_from, To p_to, Via p_via, template PAssertedID p_pAssertedID, template Privacy p_privacy, MessageBody p_mb) modifies m_Response_ext:=

			From p_from, To p_to, Via p_via,  template Route p_route, template RecordRoute p_recordroute, template PAssertedID p_pAssertedID, template Privacy p_privacy, MessageBody p_mb) modifies m_Response_ext:=

	{

		msgHeader :=

				{
@@ -3242,55 +3242,23 @@ group TemplatePreparationFunctions { 
	 * @desc Return component variable of recordRoute header if vc_boo_recordRoute is true

	 * @return component variable of recordRoute header

	 */

//TODO: clarify if function defined on SipComponent can be used in templates

//	function f_recordroute() runs on SipComponent return template RecordRoute

//	{

//	  if (vc_boo_recordRoute)

//		  {return vc_recordRoute}

//	  else {return(omit)}

//	}

	function f_recordroute() return template RecordRoute

	{

		return(omit)

	}	



	/**

	 * 

	 * @desc Return component variable of Route header if vc_boo_route is true

	 * @return component variable of recordRoute header

	 */	

//TODO: clarify if function defined on SipComponent can be used in templates

//	function f_route() runs on SipComponent return template RecordRoute

//	{

//	  if (vc_boo_route)

//		  {return vc_route} //*  TODO: Route header need to be in reverse order than RecordRoute, question of return value - RecordRoute 

//	  else {return(omit)}

//	}

	function f_route() return template RecordRoute

	function f_recordroute() runs on SipComponent return template RecordRoute

	{

		return(omit)

	}	

	/**

		* 

		* @desc Return RecordRoute (2nd parameter) if recordRoute indicator (1st parameter) is true

		* @return recordRoute header

		*/

	function f_recordroute_par(in boolean p_boo_recordRoute, in RecordRoute p_RecordRoute) return template RecordRoute

	{

			if (p_boo_recordRoute)

				{return p_RecordRoute}

	  if (vc_boo_recordRoute)

		  {return vc_recordRoute}

	  else {return(omit)}

	}

	

	/**

	 * 

		* @desc Return Route (2nd parameter) if recordRoute indicator (1st parameter) is true

		* @return Route header

	 * @desc Return component variable of Route header if vc_boo_route is true

	 * @return component variable of recordRoute header

	 */	

	function f_route_par(in boolean p_boo_recordRoute, in Route p_Route) return template Route

	function f_route() runs on SipComponent return template RecordRoute

	{

			if (p_boo_recordRoute)

				{return p_Route} //*  TODO: Route header need to be in reverse order than RecordRoute, question of return value - RecordRoute 

	  if (vc_boo_route)

		  {return vc_route} //*  TODO: Route header need to be in reverse order than RecordRoute, question of return value - RecordRoute 

	  else {return(omit)}

	}