Some more changes after mail from Anouk on 19/03/10 (e2711249) · Commits · INT - Core Network and Interoperability Testing / IMS / IMS_NIT

AtsNIT_SipSip/ttcn/AtsNIT_SipSip_BC_TCFunctions.ttcn

+45 −41

Original line number	Diff line number	Diff line
		@@ -1999,15 +1999,6 @@ module AtsNIT_SipSip_BC_TCFunctions {
		// await 200 OK PRACK response
		f_awaitingOkResponse(vc_cSeq);

		// await 180 response without
		// f_awaitingResponse(mw_Response_Base(
		// c_statusLine180,
		// vc_callId,
		// v_INVITE_CSeq
		// ));
		//
		// // await 200 OK INVITE response
		// f_awaitingOkResponse(v_INVITE_CSeq);

		tc_resp.start(PX_SIP_TRESP);
		alt
		@@ -2025,9 +2016,6 @@ module AtsNIT_SipSip_BC_TCFunctions {
		}
		}




		// send ACK
		f_SendACK(m_ACK_Request_Base(
		vc_requestUri,
		@@ -3578,8 +3566,8 @@ module AtsNIT_SipSip_BC_TCFunctions {
		// await 180 response
		f_awaitingResponse(v_response);

		// send PRACK
		f_SendPRACK();
		// send PRACK with sdp answer
		f_SendPRACK_sdp(m_MBody_SDP(vc_sdp_local));

		// await 200 OK PRACK response
		f_awaitingOkResponse(vc_cSeq);
		@@ -3665,13 +3653,13 @@ module AtsNIT_SipSip_BC_TCFunctions {
		valueof(m_MBody_SDP(vc_sdp_local))
		);

		v_response.msgHeader.allow := m_Allow({"UPDATE"});
		v_response.msgHeader.allow := m_Allow({"INVITE, ACK, OPTIONS, CANCEL, BYE, UPDATE, PRACK"});

		f_sendResponse(v_response);

		// await PRACK
		f_awaitingPRACK_sendReply(
		mw_PRACK_Request_Base(vc_callId)
		mw_PRACK_Request_sdp(vc_callId, mw_MBody_SDP(?))
		);

		f_SendUPDATE(m_UPDATE_Request_Base(
		@@ -3769,8 +3757,8 @@ module AtsNIT_SipSip_BC_TCFunctions {
		// await 180 response
		f_awaitingResponse(v_response);

		// send PRACK
		f_SendPRACK();
		// send PRACK with sdp answer
		f_SendPRACK_sdp(m_MBody_SDP(vc_sdp_local));

		// await 200 OK PRACK response
		f_awaitingOkResponse(vc_cSeq);
		@@ -3862,7 +3850,7 @@ module AtsNIT_SipSip_BC_TCFunctions {
		valueof(m_MBody_SDP(vc_sdp_local))
		);

		v_response.msgHeader.allow := m_Allow({"UPDATE"});
		v_response.msgHeader.allow := m_Allow({"INVITE, ACK, OPTIONS, CANCEL, BYE, UPDATE, PRACK"});

		f_sendResponse(v_response);

		@@ -3872,7 +3860,7 @@ module AtsNIT_SipSip_BC_TCFunctions {

		// await PRACK
		f_awaitingPRACK_sendReply(
		mw_PRACK_Request_Base(vc_callId)
		mw_PRACK_Request_sdp(vc_callId, mw_MBody_SDP(?))
		);

		f_selfOrClientSyncAndVerdict(c_sync1, f_getVerdict());
		@@ -4202,12 +4190,30 @@ module AtsNIT_SipSip_BC_TCFunctions {
		m_MBody_SDP(vc_sdp_local)
		));

		alt
		{ // 180 response is optional
		[] SIPP.receive(mw_Response_Base(c_statusLine180, vc_callId, vc_cSeq)) -> value vc_response
		{
		f_setHeadersOnReceiptOfResponse(vc_cSeq, vc_response);
		repeat
		}
		[] SIPP.receive(mw_Response_Base(c_statusLine408, vc_callId, vc_cSeq)) -> value vc_response
		{
		f_setHeadersOnReceiptOfResponse(vc_cSeq, vc_response);
		setverdict(pass);
		}
		[] SIPP.receive(mw_Response_Base(c_statusLine480, vc_callId, vc_cSeq)) -> value vc_response
		{
		f_setHeadersOnReceiptOfResponse(vc_cSeq, vc_response);
		setverdict(pass);
		}
		}
		// await 480 or 408 response
		f_awaitingResponse(mw_Response_Base(
		{c_sipNameVersion, (408, 480), ?},
		vc_callId,
		vc_cSeq
		));
		// f_awaitingResponse(mw_Response_Base(
		// {c_sipNameVersion, (408, 480), ?},
		// vc_callId,
		// vc_cSeq
		// ));

		// send ACK
		f_SendACK(m_ACK_Request_Base(
		@@ -4886,19 +4892,19 @@ module AtsNIT_SipSip_BC_TCFunctions {
		f_setHeadersOnReceiptOfResponse(vc_cSeq, vc_response);
		setverdict(pass);
		// send ACK
		f_SendACK(m_ACK_Request_Base(
		vc_requestUri,
		vc_callId,
		vc_cSeq,
		vc_from,
		vc_to,
		vc_via
		));
		}
		[] SIPP.receive (mw_Response_Base(c_statusLine480, vc_callId, vc_cSeq)) -> value vc_response {
		f_setHeadersOnReceiptOfResponse(vc_cSeq, vc_response);
		setverdict(pass);
		// send ACK
		}
		[] SIPP.receive (mw_Response_Base(c_statusLine487, vc_callId, vc_cSeq)) -> value vc_response {
		f_setHeadersOnReceiptOfResponse(vc_cSeq, vc_response);
		setverdict(pass);
		// send ACK
		}
		}

		f_SendACK(m_ACK_Request_Base(
		vc_requestUri,
		vc_callId,
		@@ -4907,8 +4913,6 @@ module AtsNIT_SipSip_BC_TCFunctions {
		vc_to,
		vc_via
		));
		}
		}

		f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());

AtsNIT_SipSip/ttcn/AtsNIT_SipSip_SS_TCFunctions.ttcn

+20 −20

Original line number	Diff line number	Diff line
		@@ -7748,7 +7748,7 @@ module AtsNIT_SipSip_SS_TCFunctions {
		vc_contact,
		omit,
		vc_route_REG,
		omit,
		m_supported_histinfo,
		m_MBody_SDP(vc_sdp_local)
		));

		@@ -7889,7 +7889,7 @@ module AtsNIT_SipSip_SS_TCFunctions {
		vc_contact,
		omit,
		vc_route_REG,
		omit,
		m_supported_histinfo,
		m_MBody_SDP(vc_sdp_local)
		));

		@@ -7982,7 +7982,7 @@ module AtsNIT_SipSip_SS_TCFunctions {
		vc_contact,
		omit,
		vc_route_REG,
		omit,
		m_supported_histinfo,
		m_MBody_SDP(vc_sdp_local)
		));

		@@ -8560,7 +8560,7 @@ module AtsNIT_SipSip_SS_TCFunctions {
		vc_contact,
		omit,
		vc_route_REG,
		omit,
		m_supported_histinfo,
		m_MBody_SDP(vc_sdp_local)
		));

		@@ -8838,7 +8838,7 @@ module AtsNIT_SipSip_SS_TCFunctions {
		vc_contact,
		omit,
		vc_route_REG,
		omit,
		m_supported_histinfo,
		m_MBody_SDP(vc_sdp_local)
		));

		@@ -8945,7 +8945,7 @@ module AtsNIT_SipSip_SS_TCFunctions {
		vc_contact,
		omit,
		vc_route_REG,
		omit,
		m_supported_histinfo,
		m_MBody_SDP(vc_sdp_local)
		));

		@@ -9331,7 +9331,7 @@ module AtsNIT_SipSip_SS_TCFunctions {
		vc_contact,
		omit,
		vc_route_REG,
		omit,
		m_supported_histinfo,
		m_MBody_SDP(vc_sdp_local)
		));

		@@ -9429,7 +9429,7 @@ module AtsNIT_SipSip_SS_TCFunctions {
		vc_contact,
		omit,
		vc_route_REG,
		omit,
		m_supported_histinfo,
		m_MBody_SDP(vc_sdp_local)
		));

		@@ -9888,7 +9888,7 @@ module AtsNIT_SipSip_SS_TCFunctions {
		vc_contact,
		omit,
		vc_route_REG,
		omit,
		m_supported_histinfo,
		m_MBody_SDP(vc_sdp_local)
		));

		@@ -10086,7 +10086,7 @@ module AtsNIT_SipSip_SS_TCFunctions {
		vc_contact,
		omit,
		vc_route_REG,
		omit,
		m_supported_histinfo,
		m_MBody_SDP(vc_sdp_local)
		));

		@@ -10191,7 +10191,7 @@ module AtsNIT_SipSip_SS_TCFunctions {
		vc_contact,
		omit,
		vc_route_REG,
		omit,
		m_supported_histinfo,
		m_MBody_SDP(vc_sdp_local)
		));

		@@ -10858,7 +10858,7 @@ module AtsNIT_SipSip_SS_TCFunctions {
		vc_contact,
		omit,
		vc_route_REG,
		omit,
		m_supported_histinfo,
		m_MBody_SDP(vc_sdp_local)
		));

		@@ -11000,7 +11000,7 @@ module AtsNIT_SipSip_SS_TCFunctions {
		vc_contact,
		omit,
		vc_route_REG,
		omit,
		m_supported_histinfo,
		m_MBody_SDP(vc_sdp_local)
		));

		@@ -11090,7 +11090,7 @@ module AtsNIT_SipSip_SS_TCFunctions {
		vc_contact,
		omit,
		vc_route_REG,
		omit,
		m_supported_histinfo,
		m_MBody_SDP(vc_sdp_local)
		));

		@@ -15741,7 +15741,7 @@ module AtsNIT_SipSip_SS_TCFunctions {
		vc_contact,
		omit,
		vc_route_REG,
		omit,
		m_supported_histinfo,
		m_MBody_SDP(vc_sdp_local)
		));

		@@ -15883,7 +15883,7 @@ module AtsNIT_SipSip_SS_TCFunctions {
		vc_contact,
		omit,
		vc_route_REG,
		omit,
		m_supported_histinfo,
		m_MBody_SDP(vc_sdp_local)
		));

		@@ -15973,7 +15973,7 @@ module AtsNIT_SipSip_SS_TCFunctions {
		vc_contact,
		omit,
		vc_route_REG,
		omit,
		m_supported_histinfo,
		m_MBody_SDP(vc_sdp_local)
		));

		@@ -16560,7 +16560,7 @@ module AtsNIT_SipSip_SS_TCFunctions {
		vc_contact,
		omit,
		vc_route_REG,
		omit,
		m_supported_histinfo,
		m_MBody_SDP(vc_sdp_local)
		));

		@@ -16748,7 +16748,7 @@ module AtsNIT_SipSip_SS_TCFunctions {
		vc_contact,
		omit,
		vc_route_REG,
		omit,
		m_supported_histinfo,
		m_MBody_SDP(vc_sdp_local)
		));

		@@ -16844,7 +16844,7 @@ module AtsNIT_SipSip_SS_TCFunctions {
		vc_contact,
		omit,
		vc_route_REG,
		omit,
		m_supported_histinfo,
		m_MBody_SDP(vc_sdp_local)
		));