Commit 55161056 authored by petersenj's avatar petersenj
Browse files

Removed some TODO and updates some INVITE header settings

parent 1106983a

AtsCommon/SS_Ims_TCFunctions.ttcn

+24 −28
Original line number Diff line number Diff line
@@ -595,7 +595,6 @@ module SS_Ims_TCFunctions { 
				// set Privacy

				v_Privacy := m_Privacy(c_privacy_id);

				

				//TODO check if this is correct ""reg""

				// Request-Uri refers to home network (SUT)

				f_IMS_preamble_woRegistration(c_userProfile_SCSCFwithHomeUE, p_cSeq_s); // LibSip
@@ -603,7 +602,7 @@ module SS_Ims_TCFunctions { 
				// Testbody

    

				// 	INVITE to AS1@IMS

				LibIms_Steps.f_setHeadersINVITE(vc_cSeq, c_userProfile_AS1);// TODO check if this is correct 

				LibIms_Steps.f_setHeadersINVITE(vc_cSeq, c_userProfile_UE2atSUThome);

				f_SendINVITE(m_INVITE_Request_IMS(vc_requestUri, vc_callId, vc_cSeq, vc_from, vc_to, vc_via, vc_contact, omit, vc_route, vc_recordRoute, m_Supported_fromChange, omit, omit));

    				

				f_awaitingINVITE(mw_INVITE_Request_Base);
@@ -667,7 +666,6 @@ module SS_Ims_TCFunctions { 
				v_PrivacySend := m_Privacy(c_privacy_none);

				v_PrivacyReceive := m_Privacy(c_privacy_id);

				

				//TODO check if this is correct ""reg""

				// Request-Uri refers to home network (SUT)

				f_IMS_preamble_woRegistration(c_userProfile_SCSCFwithHomeUE, p_cSeq_s); // LibSip
@@ -675,7 +673,7 @@ module SS_Ims_TCFunctions { 
				// Testbody

    

				// 	INVITE to AS1@IMS

				LibIms_Steps.f_setHeadersINVITE(vc_cSeq, c_userProfile_AS1);// TODO check if this is correct 

				LibIms_Steps.f_setHeadersINVITE(vc_cSeq, c_userProfile_UE2atSUThome); 

				f_SendINVITE(m_INVITE_Request_IMS(vc_requestUri, vc_callId, vc_cSeq, vc_from, vc_to, vc_via, vc_contact, omit, vc_route, vc_recordRoute, m_Supported_fromChange, omit, omit));

    				

				f_awaitingINVITE(mw_INVITE_Request_Base);
@@ -740,7 +738,7 @@ module SS_Ims_TCFunctions { 


				f_selfOrClientSyncAndVerdict(c_prDone, f_getVerdict());



				LibIms_Steps.f_setHeadersINVITE(vc_cSeq, c_userProfile_UE1atSUThome);

				LibIms_Steps.f_setHeadersINVITE(vc_cSeq, c_userProfile_UE2atSUThome);

				f_SendINVITE(m_INVITE_Request_IMS(vc_requestUri, vc_callId, vc_cSeq, vc_from, vc_to, vc_via, vc_contact, omit, vc_route, vc_recordRoute, m_Supported_fromChange, omit, m_MBody_SDP(vc_sdp_local)));

				f_awaitingINVITE(mw_INVITE_Request_supported(omit));
@@ -762,7 +760,7 @@ module SS_Ims_TCFunctions { 
				f_IMS_preamble_woRegistration(c_userProfile_SCSCFwithHomeUE, p_cSeq_s); // LibSip



				// send invite

				LibIms_Steps.f_setHeadersINVITE(vc_cSeq, c_userProfile_UE1atSUThome);

				LibIms_Steps.f_setHeadersINVITE(vc_cSeq, c_userProfile_UE2atSUThome);

				f_SendINVITE(m_INVITE_Request_IMS(vc_requestUri, vc_callId, vc_cSeq, vc_from, vc_to, vc_via, vc_contact, omit, vc_route, vc_recordRoute, m_Supported_fromChange, omit, m_MBody_SDP(vc_sdp_local)));

				// receive invite

				f_awaitingINVITE(mw_INVITE_Request_Base);
@@ -782,9 +780,8 @@ module SS_Ims_TCFunctions { 
				// testbody

				f_selfOrClientSyncAndVerdict(c_prDone, f_getVerdict());

				

				//send UPDATE TODO fix this

				vc_requestUri := f_initSipUrl(c_userProfile_UE3atSUThome); // Request URI of Invite is diffent than To header

				// TODO the following should be changed to another connected id instead, like c_userProfile_UE1atSUThome_PRIVATE or c_userProfile_UE1atSUThome_connected which will require new PIXIT value

				// Note: the following could be changed to another connected id instead, like c_userProfile_UE1atSUThome_PRIVATE or c_userProfile_UE1atSUThome_connected which will require new PIXIT value

				

				f_SendUPDATE(m_UPDATE_Request_fromChange(vc_callId, m_From_SipUrl(vc_requestUri)));

				//receive UPDATE
@@ -820,8 +817,8 @@ module SS_Ims_TCFunctions { 
				f_selfOrClientSyncAndVerdict(c_prDone, f_getVerdict());

				// Testbody

				

				// 	INVITE to AS1@IMS

				LibIms_Steps.f_setHeadersINVITE(vc_cSeq, c_userProfile_AS1);// TODO check if this is correct 

				// 	INVITE to UE2

				LibIms_Steps.f_setHeadersINVITE(vc_cSeq, c_userProfile_UE2atSUThome); 

				f_SendINVITE(m_INVITE_Request_IMS(vc_requestUri, vc_callId, vc_cSeq, vc_from, vc_to, vc_via, vc_contact, omit, vc_route, vc_recordRoute, m_Supported_fromChange, omit, omit));

    				

				f_awaitingINVITE(mw_INVITE_Request_Base);
@@ -892,8 +889,8 @@ module SS_Ims_TCFunctions { 
				f_selfOrClientSyncAndVerdict(c_prDone, f_getVerdict());

				// Testbody

				

				// 	INVITE to AS1@IMS

				LibIms_Steps.f_setHeadersINVITE(vc_cSeq, c_userProfile_AS1);// TODO check if this is correct 

				// 	INVITE to UE2

				LibIms_Steps.f_setHeadersINVITE(vc_cSeq, c_userProfile_UE2atSUThome);

				f_SendINVITE(m_INVITE_Request_IMS(vc_requestUri, vc_callId, vc_cSeq, vc_from, vc_to, vc_via, vc_contact, omit, vc_route, vc_recordRoute, m_Supported_fromChange, omit, omit));

    				

				f_awaitingINVITE(mw_INVITE_Request_Base);
@@ -964,8 +961,8 @@ module SS_Ims_TCFunctions { 
				f_selfOrClientSyncAndVerdict(c_prDone, f_getVerdict());

				// Testbody

				

				// 	INVITE to AS1@IMS

				LibIms_Steps.f_setHeadersINVITE(vc_cSeq, c_userProfile_AS1);// TODO check if this is correct 

				// 	INVITE to UE2

				LibIms_Steps.f_setHeadersINVITE(vc_cSeq, c_userProfile_UE2atSUThome);

				f_SendINVITE(m_INVITE_Request_IMS(vc_requestUri, vc_callId, vc_cSeq, vc_from, vc_to, vc_via, vc_contact, omit, vc_route, vc_recordRoute, m_Supported_fromChange, omit, omit));

    				

				f_awaitingINVITE(mw_INVITE_Request_Base);
@@ -1107,7 +1104,7 @@ module SS_Ims_TCFunctions { 
				f_awaitingResponse(v_Response);

				

				v_divertedUserUri := f_initSipUrl(c_userProfile_UE3atSUThome);

				// TODO get URI of UE2



				if (f_checkHeaderInfoURI(vc_response, v_divertedUserUri)) {

					setverdict(fail);

				}
@@ -1168,12 +1165,12 @@ module SS_Ims_TCFunctions { 
				f_selfOrClientSyncAndVerdict(c_prDone, f_getVerdict());

				// Testbody



				f_awaitingINVITE(mw_INVITE_Request_Base); // TODO eventually check the receiver is UE3 and not UE2

				f_awaitingINVITE(mw_INVITE_Request_Base); 

				

				select(PX_TC_VA){ // PIXIT for TC VARIANT

					case (1) {

						// 180  Ringing

						f_sendResponse(m_Response_PAsserted_Privacy(c_statusLine180, vc_callId, vc_cSeq, vc_caller_From, vc_caller_To, vc_via, omit, omit)); // TODO check if the response should be with a set PAssertedIdentity

						f_sendResponse(m_Response_PAsserted_Privacy(c_statusLine180, vc_callId, vc_cSeq, vc_caller_From, vc_caller_To, vc_via, omit, omit)); 

						

						f_selfOrClientSyncAndVerdict(c_sync1, f_getVerdict());

						f_sendResponse(m_Response_mbody(c_statusLine200, vc_callId, vc_cSeq, vc_caller_From, vc_caller_To, vc_via, valueof( m_MBody_SDP(vc_sdp_local))));
@@ -1181,7 +1178,7 @@ module SS_Ims_TCFunctions { 
					} 

					case (2) {

						// 183 Session in Progress

						f_sendResponse(m_Response_PAsserted_Privacy(c_statusLine183, vc_callId, vc_cSeq, vc_caller_From, vc_caller_To, vc_via, omit, omit));// TODO check if the response should be with a set PAssertedIdentity

						f_sendResponse(m_Response_PAsserted_Privacy(c_statusLine183, vc_callId, vc_cSeq, vc_caller_From, vc_caller_To, vc_via, omit, omit));



						f_selfOrClientSyncAndVerdict(c_sync1, f_getVerdict());

						f_sendResponse(m_Response_mbody(c_statusLine200, vc_callId, vc_cSeq, vc_caller_From, vc_caller_To, vc_via, valueof( m_MBody_SDP(vc_sdp_local))));
@@ -1189,7 +1186,7 @@ module SS_Ims_TCFunctions { 
					} 

					case else {

						// 200 OK

						f_sendResponse(m_Response_PAsserted_Privacy(c_statusLine200, vc_callId, vc_cSeq, vc_caller_From, vc_caller_To, vc_via, omit, omit));// TODO check if the response should be with a set PAssertedIdentity

						f_sendResponse(m_Response_PAsserted_Privacy(c_statusLine200, vc_callId, vc_cSeq, vc_caller_From, vc_caller_To, vc_via, omit, omit));



						f_selfOrClientSyncAndVerdict(c_sync1, f_getVerdict());
@@ -1228,7 +1225,7 @@ module SS_Ims_TCFunctions { 
				// Testbody



				// 	INVITE to UE1@IMS

				LibIms_Steps.f_setHeadersINVITE(vc_cSeq, c_userProfile_UE1atSUThome);

				LibIms_Steps.f_setHeadersINVITE(vc_cSeq, c_userProfile_UE2atSUThome);

				f_SendINVITE(m_INVITE_Request_IMS(vc_requestUri, vc_callId, vc_cSeq, vc_from, vc_to, vc_via, vc_contact, omit, vc_route, vc_recordRoute, m_Supported_fromChange, omit, m_MBody_SDP(vc_sdp_local)));



				v_Response := mw_Response_Base(c_statusLine181, vc_callId, vc_cSeq);
@@ -1294,13 +1291,13 @@ module SS_Ims_TCFunctions { 
				// Testbody



				// 	INVITE to UE1@IMS

				f_awaitingINVITE(mw_INVITE_Request_Base); // TODO eventually check the receiver is UE3 and not UE2

				f_awaitingINVITE(mw_INVITE_Request_Base);

				

				

				select(PX_TC_VA){ // PIXIT for TC VARIANT

					case (1) {

						// 180  Ringing

						f_sendResponse(m_Response_PAsserted_Privacy(c_statusLine180, vc_callId, vc_cSeq, vc_caller_From, vc_caller_To, vc_via, omit, m_Privacy(c_privacy_id))); // TODO check if the response should be with a set PAssertedIdentity

						f_sendResponse(m_Response_PAsserted_Privacy(c_statusLine180, vc_callId, vc_cSeq, vc_caller_From, vc_caller_To, vc_via, omit, m_Privacy(c_privacy_id))); 



						f_selfOrClientSyncAndVerdict(c_sync1, f_getVerdict());

						f_sendResponse(m_Response_mbody(c_statusLine200, vc_callId, vc_cSeq, vc_caller_From, vc_caller_To, vc_via, valueof( m_MBody_SDP(vc_sdp_local))));
@@ -1309,7 +1306,7 @@ module SS_Ims_TCFunctions { 
					} 

					case (2) {

						// 183 Session in Progress

						f_sendResponse(m_Response_PAsserted_Privacy(c_statusLine183, vc_callId, vc_cSeq, vc_caller_From, vc_caller_To, vc_via, omit, m_Privacy(c_privacy_id)));// TODO check if the response should be with a set PAssertedIdentity

						f_sendResponse(m_Response_PAsserted_Privacy(c_statusLine183, vc_callId, vc_cSeq, vc_caller_From, vc_caller_To, vc_via, omit, m_Privacy(c_privacy_id)));



						f_selfOrClientSyncAndVerdict(c_sync1, f_getVerdict());

						f_sendResponse(m_Response_mbody(c_statusLine200, vc_callId, vc_cSeq, vc_caller_From, vc_caller_To, vc_via, valueof( m_MBody_SDP(vc_sdp_local))));
@@ -1317,7 +1314,7 @@ module SS_Ims_TCFunctions { 
					} 

					case else {

						// 200 OK

						f_sendResponse(m_Response_PAsserted_Privacy(c_statusLine200, vc_callId, vc_cSeq, vc_caller_From, vc_caller_To, vc_via, omit, m_Privacy(c_privacy_id)));// TODO check if the response should be with a set PAssertedIdentity

						f_sendResponse(m_Response_PAsserted_Privacy(c_statusLine200, vc_callId, vc_cSeq, vc_caller_From, vc_caller_To, vc_via, omit, m_Privacy(c_privacy_id)));



						f_selfOrClientSyncAndVerdict(c_sync1, f_getVerdict());
@@ -1357,7 +1354,6 @@ module SS_Ims_TCFunctions { 
				

				v_divertedUserUri := f_initSipUrl(c_userProfile_UE3atSUThome);

				

				// TODO get URI of UE2

				if (not f_checkHeaderInfoURI(vc_response, v_divertedUserUri)) {

					setverdict(fail);

				}
@@ -1424,7 +1420,7 @@ module SS_Ims_TCFunctions { 
				select(PX_TC_VA){ // PIXIT for TC VARIANT

					case (1) {

						// 180  Ringing

						f_sendResponse(m_Response_PAsserted_Privacy(c_statusLine180, vc_callId, vc_cSeq, vc_caller_From, vc_caller_To, vc_via, omit, m_Privacy(c_privacy_none))); // TODO check if the response should be with a set PAssertedIdentity

						f_sendResponse(m_Response_PAsserted_Privacy(c_statusLine180, vc_callId, vc_cSeq, vc_caller_From, vc_caller_To, vc_via, omit, m_Privacy(c_privacy_none))); 

						

						f_selfOrClientSyncAndVerdict(c_sync1, f_getVerdict());

						f_sendResponse(m_Response_mbody(c_statusLine200, vc_callId, vc_cSeq, vc_caller_From, vc_caller_To, vc_via, valueof( m_MBody_SDP(vc_sdp_local))));
@@ -1432,7 +1428,7 @@ module SS_Ims_TCFunctions { 
					} 

					case (2) {

						// 183 Session in Progress

						f_sendResponse(m_Response_PAsserted_Privacy(c_statusLine183, vc_callId, vc_cSeq, vc_caller_From, vc_caller_To, vc_via, omit, m_Privacy(c_privacy_none)));// TODO check if the response should be with a set PAssertedIdentity

						f_sendResponse(m_Response_PAsserted_Privacy(c_statusLine183, vc_callId, vc_cSeq, vc_caller_From, vc_caller_To, vc_via, omit, m_Privacy(c_privacy_none)));



						f_selfOrClientSyncAndVerdict(c_sync1, f_getVerdict());

						f_sendResponse(m_Response_mbody(c_statusLine200, vc_callId, vc_cSeq, vc_caller_From, vc_caller_To, vc_via, valueof( m_MBody_SDP(vc_sdp_local))));
@@ -1440,7 +1436,7 @@ module SS_Ims_TCFunctions { 
					} 

					case else {

						// 200 OK

						f_sendResponse(m_Response_PAsserted_Privacy(c_statusLine200, vc_callId, vc_cSeq, vc_caller_From, vc_caller_To, vc_via, omit, m_Privacy(c_privacy_none)));// TODO check if the response should be with a set PAssertedIdentity

						f_sendResponse(m_Response_PAsserted_Privacy(c_statusLine200, vc_callId, vc_cSeq, vc_caller_From, vc_caller_To, vc_via, omit, m_Privacy(c_privacy_none)));

						f_selfOrClientSyncAndVerdict(c_sync1, f_getVerdict());



						f_awaitingACK(mw_ACK_Request_Base(vc_callId));