Commit 8de667a3 authored by rennoch's avatar rennoch
Browse files

several relocations of variable declarations

parent ad9e0e5b

ISUPAts/ttcn/SIPI_ISUP_Steps.ttcn

+3 −3
Original line number Diff line number Diff line
@@ -1872,9 +1872,9 @@ group SipIsup_ISUP_Checks 
{

	function f_IsupBicc_CheckRingingTone()	runs on IsupBiccComponent

	{

		v_Default := activate (a_IsupBicc_Def_Generic());

		var boolean v_Result;

		var charstring v_question := "confirm if ringing at IsupBicc port";

		v_Default := activate (a_IsupBicc_Def_Generic());

				

		if (PX_IsupBicc_CheckRinging) {				

			opPort_IsupBicc.call(s_IsupBicc_ringing:{v_question, -})
@@ -1892,9 +1892,9 @@ group SipIsup_ISUP_Checks 


	function f_IsupBicc_CheckConversation()	runs on IsupBiccComponent

	{

		v_Default := activate (a_IsupBicc_Def_Generic());

		var boolean v_Result;

		var charstring v_question := "confirm if conversation at IsupBicc port";

		v_Default := activate (a_IsupBicc_Def_Generic());

		

		if (PX_IsupBicc_CheckConversation) {				

			opPort_IsupBicc.call(s_IsupBicc_conversation:{v_question, -})

ISUPAts/ttcn/SIPI_ISUP_TCFunctions.ttcn

+153 −105

File changed.

Preview size limit exceeded, changes collapsed.

SIPAts/ttcn/SIPI_SIP_Steps.ttcn

+2 −1
Original line number Diff line number Diff line
@@ -3368,6 +3368,8 @@ group GlobalSteps { 
	{

		var integer mn, cn := 0, i, j, k :=0;

		var SDP_attribute_list v_mediaAttributes := {};

		var boolean v_set_direction := false;

		

		f_copySDP(); 

		//increase session version

		v_SDP_local.origin.session_version :=
@@ -3388,7 +3390,6 @@ group GlobalSteps { 
				cn := sizeof(v_SDP_local.media_list[i].attributes);

			};

		   log("axr v_SDP_local.media_list[i].attributes ", cn);

			   var boolean v_set_direction := false;

			//if (sizeof(v_SDP_local.media_list[i].media_field.fmts)>1) 

			//{log("axr1");

				// select the first one

SIPAts/ttcn/SIPI_SIP_TCFunctions.ttcn

+51 −33
Original line number Diff line number Diff line
@@ -3194,6 +3194,9 @@ module SIPI_SIP_TCFunctions { 
					// handle syncServerStop signal receipt

					// implement preamble behavior which should set return code

					var Response v_Response;

					var SipUrl v_RequestUri_i1;

					var SipUrl v_RequestUri_i2;

					

					f_SIP_preamble_00(loc_CSeq_s);



					f_EncapsIsup_TC_102_001();
@@ -3203,7 +3206,7 @@ module SIPI_SIP_TCFunctions { 


					f_setHeadersIUTInvite(v_CSeq);



					var SipUrl v_RequestUri_i1 := m_SipUrl_ofIUT_i1;

					v_RequestUri_i1 := m_SipUrl_ofIUT_i1;

					SIPP.send (

						m_INVITE_Request_MIME(

							v_RequestUri_i1,
@@ -3216,7 +3219,7 @@ module SIPI_SIP_TCFunctions { 
							valueof(m_MBody_SDP_ISUP_s_1(valueof(m_SDP(m_media_PT0)),v_iam_msg)) //[IAM encapsulated]

							)) to sent_label;



					var SipUrl v_RequestUri_i2 := m_SipUrl_ofIUT_i2;

					v_RequestUri_i2 := m_SipUrl_ofIUT_i2;



					// Synchronisation point before the second INVITE

					f_selfOrClientSyncAndVerdict(c_sync1, f_getVerdict());
@@ -3279,6 +3282,8 @@ module SIPI_SIP_TCFunctions { 
					// handle syncServerStop signal receipt

					// implement preamble behavior which should set return code

					var Response v_Response;

					var SipUrl v_RequestUri_i1;

					

					f_SIP_preamble_00(loc_CSeq_s);



					f_EncapsIsup_TC_102_002();
@@ -3300,7 +3305,7 @@ module SIPI_SIP_TCFunctions { 
							valueof(m_MBody_SDP_ISUP_s_1(valueof(m_SDP(m_media_PT0)),v_iam_msg)) //[IAM encapsulated]

							)) to sent_label;					



					var SipUrl v_RequestUri_i1 := m_SipUrl_ofIUT_i1;

					v_RequestUri_i1 := m_SipUrl_ofIUT_i1;



					// Synchronisation point before the second INVITE

					f_selfOrClientSyncAndVerdict(c_sync1, f_getVerdict());
@@ -3755,10 +3760,10 @@ module SIPI_SIP_TCFunctions { 
					// handle syncServerStop signal receipt

					// implement preamble behavior which should set return code

					var Response v_Response;

						f_SIP_preamble_00(loc_CSeq_s);

						

					var integer v_VA := PX_TC108_001_VA;

					

					f_SIP_preamble_00(loc_CSeq_s);						



					f_EncapsIsup_TC_108_001();



					f_selfOrClientSyncAndVerdict(c_prDone, f_getVerdict());
@@ -3792,10 +3797,10 @@ module SIPI_SIP_TCFunctions { 
					// handle syncServerStop signal receipt

					// implement preamble behavior which should set return code

					var Response v_Response;

						f_SIP_preamble_00(loc_CSeq_s);



					var integer v_VA := PX_TC108_002_VA;

					

					f_SIP_preamble_00(loc_CSeq_s);



					f_EncapsIsup_TC_108_002();



					f_selfOrClientSyncAndVerdict(c_prDone, f_getVerdict());
@@ -3831,10 +3836,10 @@ module SIPI_SIP_TCFunctions { 
					// handle syncServerStop signal receipt

					// implement preamble behavior which should set return code

					var Response v_Response;

						f_SIP_preamble_00(loc_CSeq_s);



					var integer v_VA := PX_TC108_003_VA;

					

					f_SIP_preamble_00(loc_CSeq_s);



					f_EncapsIsup_TC_108_003();



					f_selfOrClientSyncAndVerdict(c_prDone, f_getVerdict());
@@ -3870,10 +3875,10 @@ module SIPI_SIP_TCFunctions { 
					// handle syncServerStop signal receipt

					// implement preamble behavior which should set return code

					var Response v_Response;

						f_SIP_preamble_00(loc_CSeq_s);



					var integer v_VA := PX_TC108_004_VA;



					f_SIP_preamble_00(loc_CSeq_s);



					f_EncapsIsup_TC_108_004();



					f_selfOrClientSyncAndVerdict(c_prDone, f_getVerdict());
@@ -4070,6 +4075,8 @@ module SIPI_SIP_TCFunctions { 
					// handle syncServerStop signal receipt

					// implement preamble behavior which should set return code

					var Response v_Response;

					var SipUrl v_RequestUri_i3;

					

					f_SIP_preamble_00(loc_CSeq_s);



					f_EncapsIsup_TC_109_003();
@@ -4079,7 +4086,7 @@ module SIPI_SIP_TCFunctions { 


					f_setHeadersIUTInvite(v_CSeq);



					var SipUrl v_RequestUri_i3 := m_SipUrl_ofIUT_i3;

					v_RequestUri_i3 := m_SipUrl_ofIUT_i3;

					SIPP.send (

						m_INVITE_Request_MIME(

							v_RequestUri_i3,
@@ -4709,11 +4716,12 @@ module SIPI_SIP_TCFunctions { 
					// handle syncServerStop signal receipt

					// implement preamble behavior which should set return code

					var Response v_Response;

					f_SIP_preamble_00(loc_CSeq_s);

					

					// local variables to handle two different calls

					var CallId v_CallId1;

					

					f_SIP_preamble_00(loc_CSeq_s);



					f_EncapsIsup_TC_111_010();



					f_selfOrClientSyncAndVerdict(c_prDone, f_getVerdict());
@@ -4770,11 +4778,11 @@ module SIPI_SIP_TCFunctions { 
					// handle syncServerStop signal receipt

					// implement preamble behavior which should set return code

					var Response v_Response;

					f_SIP_preamble_00(loc_CSeq_s);

					

					// local variables to handle two different calls

					var CallId v_CallId1;



					f_SIP_preamble_00(loc_CSeq_s);

					

					f_EncapsIsup_TC_111_011();



					f_selfOrClientSyncAndVerdict(c_prDone, f_getVerdict());
@@ -5199,6 +5207,8 @@ module SIPI_SIP_TCFunctions { 
					// handle syncServerStop signal receipt

					// implement preamble behavior which should set return code

					var Response v_Response;

					var Request v_INVITE_Request;

					

					f_SIP_preamble_00(loc_CSeq_s);



					f_EncapsIsup_TC_301_004();
@@ -5206,8 +5216,6 @@ module SIPI_SIP_TCFunctions { 
					f_selfOrClientSyncAndVerdict(c_prDone, f_getVerdict());

					// implement test body behavior which should set return code	

      

					var Request v_INVITE_Request;

      

					TWait.start(PX_TOIW1);  // another timer!

					alt

					{
@@ -5574,11 +5582,12 @@ module SIPI_SIP_TCFunctions { 
					// handle syncServerStop signal receipt

					// implement preamble behavior which should set return code

					var Response v_Response;

					const StatusLine c_StatusLine[4] := 

						{StatusLine180, StatusLine181, StatusLine182, StatusLine183};

						

					f_SIP_preamble_00(loc_CSeq_s);

					

					if (PX_TC301_014_VA>3) {setverdict(inconc); stop;};

					const StatusLine c_StatusLine[4] := 

						{StatusLine180, StatusLine181, StatusLine182, StatusLine183};



					f_EncapsIsup_TC_301_014();
@@ -5642,11 +5651,12 @@ module SIPI_SIP_TCFunctions { 
					// handle syncServerStop signal receipt

					// implement preamble behavior which should set return code

					var Response v_Response;

					const StatusLine c_StatusLine[4] := 

						{StatusLine180, StatusLine181, StatusLine182, StatusLine183};



					f_SIP_preamble_00(loc_CSeq_s);

					

					if (PX_TC301_016_VA>3) {setverdict(inconc); stop;};

					const StatusLine c_StatusLine[4] := 

						{StatusLine180, StatusLine181, StatusLine182, StatusLine183};



					f_EncapsIsup_TC_301_016();
@@ -5710,11 +5720,12 @@ module SIPI_SIP_TCFunctions { 
					// handle syncServerStop signal receipt

					// implement preamble behavior which should set return code

					var Response v_Response;

					const StatusLine c_StatusLine[4] := 

						{StatusLine180, StatusLine181, StatusLine182, StatusLine183};



					f_SIP_preamble_00(loc_CSeq_s);

					

					if (PX_TC301_018_VA>3) {setverdict(inconc); stop;};

					const StatusLine c_StatusLine[4] := 

						{StatusLine180, StatusLine181, StatusLine182, StatusLine183};



					f_EncapsIsup_TC_301_018();
@@ -5774,11 +5785,12 @@ module SIPI_SIP_TCFunctions { 
					// handle syncServerStop signal receipt

					// implement preamble behavior which should set return code

					var Response v_Response;

					const StatusLine c_StatusLine[4] := 

						{StatusLine180, StatusLine181, StatusLine182, StatusLine183};



					f_SIP_preamble_00(loc_CSeq_s);



					if (PX_TC301_020_VA>3) {setverdict(inconc); stop;};

					const StatusLine c_StatusLine[4] := 

						{StatusLine180, StatusLine181, StatusLine182, StatusLine183};



					f_EncapsIsup_TC_301_020();
@@ -6197,11 +6209,12 @@ module SIPI_SIP_TCFunctions { 
					// handle syncServerStop signal receipt

					// implement preamble behavior which should set return code

					var Response v_Response;

					const StatusLine c_StatusLine[4] := 

						{StatusLine180, StatusLine181, StatusLine182, StatusLine183};



					f_SIP_preamble_00(loc_CSeq_s);



					if (PX_TC301_031_VA>3) {setverdict(inconc); stop;};

					const StatusLine c_StatusLine[4] := 

						{StatusLine180, StatusLine181, StatusLine182, StatusLine183};



					f_EncapsIsup_TC_301_031();
@@ -6261,11 +6274,12 @@ module SIPI_SIP_TCFunctions { 
					// handle syncServerStop signal receipt

					// implement preamble behavior which should set return code

					var Response v_Response;

					const StatusLine c_StatusLine[4] := 

						{StatusLine180, StatusLine181, StatusLine182, StatusLine183};



					f_SIP_preamble_00(loc_CSeq_s);

					

					if (PX_TC301_014_VA>3) {setverdict(inconc); stop;};

					const StatusLine c_StatusLine[4] := 

						{StatusLine180, StatusLine181, StatusLine182, StatusLine183};



					f_EncapsIsup_TC_301_033();
@@ -8879,6 +8893,8 @@ module SIPI_SIP_TCFunctions { 
					// handle syncServerStop signal receipt

					// implement preamble behavior which should set return code

					var Response v_Response;

					var CallId	v_CallId1; 

					var CallId	v_CallId2;       

										

					f_SIP_preamble_00(loc_CSeq_s);
@@ -8888,7 +8904,7 @@ module SIPI_SIP_TCFunctions { 
					// implement test body behavior which should set return code	



					f_awaitingInviteRequest(mw_INVITE_Request_MIME(v_iam_msg), true);

					var CallId	v_CallId1    := v_CallId;

					v_CallId1 := v_CallId;



					f_send180_Encaps(true, false, v_acm_msg);
@@ -8898,7 +8914,7 @@ module SIPI_SIP_TCFunctions { 
					f_awaitingAckRequest(v_CSeq);



					f_awaitingInviteRequest(mw_INVITE_Request_MIME(v_iam_msg), true);

					var CallId	v_CallId2    := v_CallId;

					v_CallId2 := v_CallId;



					f_send180_Encaps(true, false, v_acm_msg);
@@ -9099,6 +9115,8 @@ module SIPI_SIP_TCFunctions { 
					// handle syncServerStop signal receipt

					// implement preamble behavior which should set return code

					var Response v_Response;

					var CallId	v_CallId1;

					var CallId	v_CallId2;

										

					f_SIP_preamble_00(loc_CSeq_s);
@@ -9108,7 +9126,7 @@ module SIPI_SIP_TCFunctions { 
					// implement test body behavior which should set return code	



					f_awaitingInviteRequest(mw_INVITE_Request_MIME(v_iam_msg), true);

					var CallId	v_CallId1    := v_CallId;

					v_CallId1 := v_CallId;



					f_send180_Encaps(true, false, v_acm_msg);
@@ -9118,7 +9136,7 @@ module SIPI_SIP_TCFunctions { 
					f_awaitingAckRequest(v_CSeq);



					f_awaitingInviteRequest(mw_INVITE_Request_MIME(v_iam_msg), true);

					var CallId	v_CallId2    := v_CallId;

					v_CallId2 := v_CallId;



					f_send180_Encaps(true, false, v_acm_msg);