Commit cc376623 authored by rennoch's avatar rennoch
Browse files

corrections due to application of TAU tester

parent 8de667a3

CommonAts/ttcn/SIPI_PIXITS.ttcn

+0 −7
Original line number Diff line number Diff line
@@ -1420,11 +1420,4 @@ group MessagePar { 
	

}//end of module ISUP_PIXITparameters



group ISDN_PIXITparameters{

	modulepar{

	

	

	}

}//end of module ISDN_PIXITparameters



}// end module SipIsup_PIXITS
 
 No newline at end of file

CommonAts/ttcn/SIPI_TestCases.ttcn

+1 −1
Original line number Diff line number Diff line
@@ -11046,7 +11046,7 @@ 
	} // end group SupplementaryServices

	

	group ISDN_SIP_Interworking {

		group BasicCall {

		group BasicCall_ISDN_SIP {

			group TP5_InterworkingFromSIPtoISDN {

				group TP501_Sending_SETUP {

					/*

ISUPAts/ttcn/SIPI_ISUP_MsgTemplates.ttcn

+1 −1
Original line number Diff line number Diff line
@@ -1327,7 +1327,7 @@ group SipIsup_ISUP_Encaps_Transmit_Msgs_Templ 
		calledPartyNumber := m_CDN_PAR_ENC_Def		  

	}

	

	template IAM_MSG m_IAM_OCN_RDGN_RDNI_ENC(template OCN_PAR_tlv p_OCN, template RDN_PAR_tlv p_RDN, template RDI_PAR_tlv p_RDI)

	template IAM_MSG m_IAM_OCN_RDGN_RDNI_ENC(template OCN_PAR_tlv p_OCN, template RDN_PAR_tlv p_RDGN, template RDI_PAR_tlv p_RDNI)

	modifies m_IAM_OCN_RDGN_RDNI

				:=

	{

ISUPAts/ttcn/SIPI_ISUP_TCFunctions.ttcn

+2 −2
Original line number Diff line number Diff line
@@ -22384,7 +22384,7 @@ group TP4142_UUS3 { 


group ISDN_SIP_Interworking {

	

group BasicCall {

group BasicCall_ISDN_SIP {

group TP5_InterworkingFromSIPtoISDN {

	group TP501_SendingSETUP {} // end group TP501_SendingSETUP

	group TP502_SendingINFO {} // end group TP502_SendingINFO
@@ -22403,7 +22403,7 @@ group TP6_InterworkingFromISDNtoSIP { 
	group TP606_Receipt_BYE_Backward_Resp_CANCEL {} // end group TP606_Receipt_BYE_Backward_Resp_CANCEL

	group TP607_Autonomous_release {} // end group TP607_Autonomous_release

} // end group TP6_InterworkingFromISDNtoSIP

} // BasicCall

} // BasicCall_ISDN_SIP

	

group TP7_SupplementaryServices {

	group TP701_CLIP {} // end group TP701_CLIP

SIPAts/ttcn/SIPI_SIP_Steps.ttcn

+16 −15
Original line number Diff line number Diff line
@@ -1806,19 +1806,20 @@ group SendMessage { 




	function f_send180_Encaps(in boolean loc_sdp_flag, in boolean noencaps, in template ISUP_BICC_MSG loc_ISUP) runs on SipComponent

	{

	{	var MessageBody v_messagebody := {sdpMessageBody:=v_SDP_local};

		if(v_SDP_remote_is_valid and loc_sdp_flag)

			{if (not noencaps)

				{SIPP.send(m_Response_180_2 // SDP and ISUP

					(v_CallId, v_CSeq, caller_From, caller_To, v_Via, 

					 m_MBody_SDP_ISUP_s_1( v_SDP_local,loc_ISUP))) to sent_label;}

					 valueof(m_MBody_SDP_ISUP_s_1( v_SDP_local,loc_ISUP)))) to sent_label;}

				else {SIPP.send(m_Response_180_2

					(v_CallId, v_CSeq, caller_From, caller_To, v_Via, {sdpMessageBody:=v_SDP_local})) to sent_label;}; // SDP only			

					(v_CallId, v_CSeq, caller_From, caller_To, v_Via, v_messagebody)) to sent_label;}; // SDP only			

//					(v_CallId, v_CSeq, caller_From, caller_To, v_Via, valueof({sdpMessageBody:=v_SDP_local}))) to sent_label;}; // SDP only			

			}

		else {if (not noencaps) // without SDP

				{SIPP.send(m_Response_180_2 // no SDP but ISUP

					(v_CallId, v_CSeq, caller_From, caller_To, v_Via, 

					 m_MBody_SDP_ISUP_s_2(loc_ISUP))) to sent_label;}

					 valueof(m_MBody_SDP_ISUP_s_2(loc_ISUP)))) to sent_label;}

				else {SIPP.send(m_Response_180_1 // no SDP no ISUP

					(v_CallId, v_CSeq, caller_From, caller_To, v_Via )) to sent_label;}; 

		}
@@ -1837,7 +1838,7 @@ group SendMessage { 
	{

		if (not noencaps) 

			{SIPP.send(m_Response_183_2

				(v_CallId, v_CSeq, caller_From, caller_To, v_Via, m_MBody_SDP_ISUP_s_2(loc_ISUP))) to sent_label;}

				(v_CallId, v_CSeq, caller_From, caller_To, v_Via, valueof(m_MBody_SDP_ISUP_s_2(loc_ISUP)))) to sent_label;}

			else {SIPP.send(m_Response_183_1

				(v_CallId, v_CSeq, caller_From, caller_To, v_Via )) to sent_label;};

	}
@@ -1877,12 +1878,12 @@ group SendMessage { 
			if (v_BOO_RecordRoute)

			{

			  SIPP.send(m_Response_200_Invite_WithRoute_1(v_CallId, v_CSeq,

				caller_From, caller_To, v_Via, m_MBody_SDP_ISUP_s_1(v_SDP_local, loc_ISUP), v_RecordRoute)) to sent_label;

				caller_From, caller_To, v_Via, valueof(m_MBody_SDP_ISUP_s_1(v_SDP_local, loc_ISUP)), v_RecordRoute)) to sent_label;

			}

			else

			{

			  SIPP.send(m_Response_200_Invite_WithRoute_1(v_CallId, v_CSeq,

				caller_From, caller_To, v_Via, m_MBody_SDP_ISUP_s_1(v_SDP_local, loc_ISUP), omit )) to sent_label;

				caller_From, caller_To, v_Via, valueof(m_MBody_SDP_ISUP_s_1(v_SDP_local, loc_ISUP)), omit )) to sent_label;

			};

		}

		else
@@ -1890,12 +1891,12 @@ group SendMessage { 
			if (v_BOO_RecordRoute)

				{

				  SIPP.send(m_Response_200_Invite_WithRoute_1(v_CallId, v_CSeq,

					caller_From, caller_To, v_Via, m_MBody_SDP_ISUP_s_2(loc_ISUP), v_RecordRoute)) to sent_label;

					caller_From, caller_To, v_Via, valueof(m_MBody_SDP_ISUP_s_2(loc_ISUP)), v_RecordRoute)) to sent_label;

				}

				else

				{

				  SIPP.send(m_Response_200_Invite_WithRoute_1(v_CallId, v_CSeq,

					caller_From, caller_To, v_Via, m_MBody_SDP_ISUP_s_2(loc_ISUP), omit )) to sent_label;

					caller_From, caller_To, v_Via, valueof(m_MBody_SDP_ISUP_s_2(loc_ISUP)), omit )) to sent_label;

				};

		}
@@ -1943,15 +1944,15 @@ group SendMessage { 
		};

	}



	function f_send200OKwithSDP(SDP_Message loc_sdp) runs on SipComponent

	{

	function f_send200OKwithSDP(template SDP_Message loc_sdp) runs on SipComponent

	{ var MessageBody v_messagebody := {sdpMessageBody:=valueof(loc_sdp)};

	  if (v_BOO_RecordRoute)

	  {

		SIPP.send(m_Response_200_SDPwithRoute_1(v_CallId, v_CSeq, v_From, v_To, v_Via, {sdpMessageBody:=loc_sdp}, v_RecordRoute)) to sent_label;

		SIPP.send(m_Response_200_SDPwithRoute_1(v_CallId, v_CSeq, v_From, v_To, v_Via, v_messagebody, v_RecordRoute)) to sent_label;

	  }

	  else

	  {

		SIPP.send(m_Response_200_SDP_1(v_CallId, v_CSeq, v_From, v_To, v_Via, {sdpMessageBody:=loc_sdp} )) to sent_label;

		SIPP.send(m_Response_200_SDP_1(v_CallId, v_CSeq, v_From, v_To, v_Via, v_messagebody )) to sent_label;

	  };

	}
@@ -2012,7 +2013,7 @@ group SendMessage { 
	*/

	function f_SendRespUPDATE0_8() runs on SipComponent

	{

		v_SDP_local := m_SDP(m_media_PT0_PT8_attr({m_attribute_curr_s,m_attribute_des_sr}));

		v_SDP_local := valueof(m_SDP(m_media_PT0_PT8_attr({m_attribute_curr_s,m_attribute_des_sr})));

		f_SendRespUPDATE()

	}
@@ -2022,7 +2023,7 @@ group SendMessage { 
	*/

	function f_SendRespUPDATE8() runs on SipComponent

	{

		v_SDP_local := m_SDP(m_media_PT8_attr({m_attribute_curr_s,m_attribute_des_sr}));

		v_SDP_local := valueof(m_SDP(m_media_PT8_attr({m_attribute_curr_s,m_attribute_des_sr})));

		f_SendRespUPDATE()

	}