Commit e0312c61 authored by pintar's avatar pintar
Browse files

corrections due to week 9/2010 validation

parent ae5c3abb

SIPAts/ttcn/SIPI_SIP_EncapsISUP.ttcn

+20 −17
Original line number Diff line number Diff line
@@ -1618,7 +1618,7 @@ group TP303_Sending_ACM { 
		/*function with default mwIAM message*/	

		f_mwIAM();

		

		f_mACM_v(m_ACM_OBCI(c_BCI_cldPstatInd_subFree, m_OBCI_cDivMay));

		f_mACM_v(m_ACM_OBCI(c_BCI_cldPstatInd_noInd, m_OBCI_cDivMay));

		

		f_mCPG_v(m_CPG_EVI(c_EVI_eventInd_alert));
@@ -4531,10 +4531,10 @@ group TP4140_UUS1 { 
	

	function f_EncapsIsup_TC_414_004() runs on SipComponent {

		

		f_mwIAM_v(mw_IAM_UUI_UUIF_ENC(m_UUID_req_S1(c_UUI_service_req_ess), m_UUIF_ServDat(PX_ISUP_TX_UUI_userInfo_S1)));

		f_mwIAM_v(mw_IAM_UUI_UUIF(m_UUID_req_S1(c_UUI_service_req_ess), m_UUIF_ServDat(PX_ISUP_TX_UUI_userInfo_S1)));

			

		/*function with default mwACM, mwANM, mREL and mwRLC messages*/	

		f_mwACM_mwANM_mREL_mwRLC();

		/*function with default mACM, mANM, mwREL and mRLC messages*/	

		f_mACM_mANM_mwREL_mRLC();

		

	}
@@ -4558,8 +4558,8 @@ group TP4140_UUS1 { 
			

		f_mACM_v(m_ACM_UUID_UUIF(omit, m_UUIF_ServDat(PX_ISUP_TX_UUI_userInfo_S1)));

		

		/*function with default receive ANM messages*/	

		f_mwANM();

		/*function with default sent ANM messages*/	

		f_mANM();

		

		/*function with default mwREL and mRLC messages*/	

		f_mwREL_mRLC();
@@ -4571,8 +4571,9 @@ group TP4140_UUS1 { 
		

		f_mwACM_v(mw_ACM_UUID_UUIF(*, mw_UUIF_PAR_tlv(PX_ISUP_TX_UUI_userInfo_S1)));

		

		/*function with default sent ANM messages*/	

		f_mANM();

		/*function with default receive ANM messages*/	

		f_mwANM();

		

			

		/*function with default mREL and mwRLC messages*/	

		f_mREL_mwRLC();
@@ -4584,8 +4585,8 @@ group TP4140_UUS1 { 
			

		f_mACM_v(m_ACM_UUID_UUIF(m_UUID_resp_S1(c_UUI_service_rsp_notProv, c_UUI_netwDiscInd_discarded), omit));

		

		/*function with default receive ANM messages*/	

		f_mwANM();

		/*function with default sent ANM messages*/	

		f_mANM();

		

		/*function with default mwREL and mRLC messages*/	

		f_mwREL_mRLC();
@@ -4598,8 +4599,8 @@ group TP4140_UUS1 { 
			

		f_mwACM_v(mw_ACM_UUI(mw_UUID_S1(c_UUI_service_rsp_notProv)));

		

		/*function with default sent ANM messages*/	

		f_mANM();

		/*function with default receive ANM messages*/	

		f_mwANM();

		

		/*function with default mREL and mwRLC messages*/	

		f_mREL_mwRLC();
@@ -4612,8 +4613,8 @@ group TP4140_UUS1 { 
			

		f_mACM_v(m_ACM_UUID_UUIF(m_UUID_resp_S1(c_UUI_service_rsp_notProv, c_UUI_netwDiscInd_discarded), m_UUIF_ServDat(PX_ISUP_TX_UUI_userInfo_S1)));

		

		/*function with default receive ANM messages*/	

		f_mwANM();

		/*function with default send ANM messages*/	

		f_mANM();

		

		/*function with default mwREL and mRLC messages*/	

		f_mwREL_mRLC();
@@ -4688,8 +4689,10 @@ group TP4141_UUS2 { 
		

		f_mIAM_v(m_IAM_UUI_UUIF_ENC(m_UUID_req_S2(c_UUI_service_req_notEss), m_UUIF_ServDat(PX_ISUP_TX_UUI_userInfo_S2)));

			

		/*function with default receive ACM and ANM messages*/	

		f_mwACM_mwANM();

		f_mwACM_v(mw_ACM_UUID_UUIF(mw_UUID_S2(c_UUI_service_rsp_notProv), omit));

		

		/*function with default receive ANM messages*/	

		f_mwANM();

		

		/*function with default mREL and mwRLC messages*/	

		f_mREL_mwRLC();

SIPAts/ttcn/SIPI_SIP_Steps.ttcn

+130 −49
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import from SIPI_ISUP_MsgTemplates all; 
import from SIPI_ISUP_ParamTemplates all;

import from SIPI_ISUP_Constants all;

import from SIPI_ISUP_MsgTypes all;

import from SIPI_SIP_EncapsISUP all;





import from LibCommon_Sync all;
@@ -361,7 +362,8 @@ import from LibCommon_VerdictControl all; 
		if (ischosen(loc_INVITE_Request.messageBody.sdpMessageBody)){

		  vc_SDP_remote := loc_INVITE_Request.messageBody.sdpMessageBody;

		  vc_SDP_remote_is_valid := true;

		  		f_prepareSDPanswer(false);};

		  f_prepareSDPanswer(false);

		};

		if (ischosen(loc_INVITE_Request.messageBody.mimeMessageBody)){

		  for (var integer i := 0; i<sizeof(loc_INVITE_Request.messageBody.mimeMessageBody.mimeEncapsulatedParts); i:=i+1)

    	  {
@@ -386,6 +388,12 @@ import from LibCommon_VerdictControl all; 
		}

	  };

		

	  if (vc_first_recv == false) {

    	vc_requestINVITE := loc_INVITE_Request;

    	vc_requestINVITE.msgHeader.toField := vc_caller_To;

    	vc_first_recv := true;

	  }

		      

    } // end f_setHeadersOnReceiptOfInvite

    

    function f_setHeadersOnReceiptOfInvite_wo_CSeq(Request loc_INVITE_Request)
@@ -1020,14 +1028,15 @@ group externalfunctions { 
		  var Request v_INVITE_Request;

      

		  TWait.start(PX_SIP_TWAIT);

		  vc_callee := true;

		  alt

		  {

			[]SIPP.receive	(p_Request) -> value v_INVITE_Request sender sent_label

			  {

				TWait.stop;

				vc_ignore_invite := true;

				vc_first_recv:= true; // communication has started

				f_setHeadersOnReceiptOfInvite(v_INVITE_Request);

				vc_cSeqInvite := vc_cSeq;

				if(p_do100)

					{SIPP.send(m_Response_100_1(vc_callId, vc_cSeq, vc_from, vc_to, vc_via )) to sent_label;}

			  }
@@ -1066,14 +1075,15 @@ group externalfunctions { 
		  var Request v_INVITE_Request;

      

		  TWait.start(PX_SIP_TWAIT);

		  vc_callee := true;

		  alt

		  {

			[]SIPP.receive	(mw_INVITE_Request_3) -> value v_INVITE_Request sender sent_label

			  {

				TWait.stop;

				vc_ignore_invite := true;

				vc_first_recv:= true; // communication has started

				f_setHeadersOnReceiptOfInvite(v_INVITE_Request);

				vc_cSeqInvite := vc_cSeq;

				SIPP.send(m_Response_100_1(vc_callId, vc_cSeq, vc_from, vc_to, vc_via )) to sent_label; //axr

			  }

			[] SIPP.receive
@@ -1926,6 +1936,7 @@ group externalfunctions { 
        [] SIPP.receive(mw_ACK_Request_1(vc_callId)) -> value v_ACK_Request

          {

            TAck.stop;

            vc_dialog_callee:=true; // set flag to informs about dialog phase (completion of early dialog)            

          }

        // INVITE may be repeated and shall be ignored

        []SIPP.receive(mw_INVITE_Request_1)
@@ -2166,7 +2177,8 @@ group SendMessage { 
	  else

	  {

		SIPP.send(m_ACK_Request_1(vc_reqHostPort, vc_callId, p_cSeq_s,vc_from, vc_to, vc_via)) to sent_label;

	  }

	  };

		vc_dialog_caller:=true; // set flag to informs about dialog phase (completion of early dialog)

	}



	/**
@@ -2205,12 +2217,26 @@ group SendMessage { 
		else {if (not p_noencaps ) // without SDP

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

					(vc_callId, vc_cSeq, vc_caller_From, vc_caller_To, vc_via, 

					 m_MBody_ISUP(p_ISUP_BICC))) to sent_label;}

					 m_MBody_ISUP(p_ISUP_BICC),m_Contact_ETS)) to sent_label;}

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

					(vc_callId, vc_cSeq, vc_caller_From, vc_caller_To, vc_via )) to sent_label;}; 

		}

	}



	/**

	* 

	* @desc  send 180 response with encapsulated ISUP message

	* @param p_sdp_flag set to true if SDP should be sent

	* @param p_noencaps  set to false if encaps not requiered

	* @param p_ISUP_BICC ISUP message to encapsulate

	*/

	function f_send180_100rel_Encaps (in template (value) ISUP_BICC_MSG p_ISUP_BICC) runs on SipComponent

	{	

		SIPP.send(m_Response_180_100rel_ISUP // no SDP but ISUP

					(vc_callId, vc_cSeq, vc_caller_From, vc_caller_To, vc_via, 

						m_MBody_ISUP(p_ISUP_BICC),m_Contact_ETS)) to sent_label;

	}

    

	/**

	 * 

	 * @desc  send 183 response
@@ -2248,9 +2274,22 @@ group SendMessage { 
	 */

	function f_send486_awaitACK()  runs on SipComponent

	{

		vc_cSeq.method:="INVITE";

		SIPP.send(m_Response_486_1(vc_callId, vc_cSeq,  //to reject the call

				vc_callee_From, vc_callee_To, vc_via)) to sent_label;  // sends BUSY HERE

		var To callee_To := {

			fieldName := TO_E,

        	addressField := vc_requestINVITE.msgHeader.fromField.addressField,

        	toParams := vc_requestINVITE.msgHeader.fromField.fromParams

        };

          

		var From callee_From := {

			fieldName := FROM_E,

        	addressField := vc_requestINVITE.msgHeader.toField.addressField,

        	fromParams := vc_requestINVITE.msgHeader.toField.toParams

        };

        

		SIPP.send(m_Response_486_1(

				valueof(vc_requestINVITE.msgHeader.callId), valueof(vc_requestINVITE.msgHeader.cSeq),  //to reject the call

				callee_From, callee_To, 

				vc_requestINVITE.msgHeader.via)) to sent_label;  // sends BUSY HERE

		f_awaitingAckRequest(vc_cSeq);

	}
@@ -3092,7 +3131,7 @@ group SendMessage { 
	 *		but without route parameter

	 */

	function f_sendBYE_noroute_cause_MIME(CallId p_callid, inout CSeq p_cSeq_s, From p_from,

	  To p_to, HostPort p_reqHostPort, MessageBody p_MB) runs on SipComponent

	  To p_to, HostPort p_reqHostPort, template (omit) MessageBody p_MB) runs on SipComponent

	{

      

	  // New Cseq
@@ -3408,7 +3447,7 @@ group GlobalSteps { 
		* @param p_MB message body for outgoing BYE

		*/

		function f_terminateCall(CallId p_callid, inout CSeq p_cSeq_s, From p_from,

		  To p_to, HostPort p_reqHostPort, MessageBody p_MB) runs on SipComponent

		  To p_to, HostPort p_reqHostPort, template (omit) MessageBody p_MB) runs on SipComponent

		{

		  // Sending of a BYE request to release the call and expect a final response

		  // f_sendBYE_noroute_cause(p_callid, p_cSeq_s, p_from, p_to,p_reqHostPort );
@@ -4240,6 +4279,7 @@ group Postambles { 


	}





	/**

	 * 

	 * @desc function wait for BYE and send response
@@ -4402,6 +4442,7 @@ group DefaultsTestStep 
		 */	

		altstep a_clearRegistration() runs on SipComponent

		{

			

		  [] any timer.timeout 

		    {

		      setverdict(fail);
@@ -4494,11 +4535,51 @@ group DefaultsTestStep 
				repeat

			  }



			[vc_dialog_caller] SIPP.receive(Request:?)-> value vc_request sender sent_label // dialog has been established

			{

				f_setHeadersOnReceiptOfRequest(vc_request);

				f_send200OK();

				setverdict(fail);

				f_SIP_postamble_release_active( // [REL/RLC encapsulated]

						vc_callId,

						vc_cSeq,

						vc_caller_From,

						vc_caller_To,

						vc_reqHostPort);

				f_RemoveRegistration(vc_cSeq);

				syncPort.send(m_syncClientStop);

				stop

			}

			[vc_dialog_callee] SIPP.receive(Request:?)-> value vc_request sender sent_label // dialog has been established

			{

				f_setHeadersOnReceiptOfRequest(vc_request);

				f_send200OK();

				setverdict(fail);

				f_mREL_mwRLC();

				f_SIP_postamble_release_active( // [REL/RLC encapsulated]

						vc_callId,

						vc_cSeq,

						vc_callee_From,

						vc_callee_To,

						vc_reqHostPort);

				f_RemoveRegistration(vc_cSeq);

				syncPort.send(m_syncClientStop);

				stop

			}

			[vc_callee] SIPP.receive(Request:?)-> value vc_request sender sent_label // dialog has been established

			{	

				f_setHeadersOnReceiptOfRequest(vc_request);

				f_send200OK();

				setverdict(fail);

				f_send486_awaitACK();

				syncPort.send(m_syncClientStop);

				stop

			}

		 	[] SIPP.receive

			{

			  // all timer.stop;

			  setverdict(fail);

			  //f_cancelCall(vc_callId, vc_cSeq, vc_from, vc_cancel_To, vc_reqHostPort, vc_via); // 

			  //f_cancelCall(vc_callId, vc_cSeq, vc_from, vc_cancel_To, vc_reqHostPort, vc_via);					

			  f_cancelCall_cause();

			  f_RemoveRegistration(vc_cSeq);

			  syncPort.send(m_syncClientStop);

SIPAts/ttcn/SIPI_SIP_TCFunctions.ttcn

+108 −65

File changed.

Preview size limit exceeded, changes collapsed.

SIPAts/ttcn/SIPI_SIP_Templates.ttcn

+23 −3
Original line number Diff line number Diff line
@@ -2747,7 +2747,7 @@ group Responses 
	  }



	template Response m_Response_180_ISUP (CallId loc_CallId, CSeq loc_CSeq,

	From loc_From, To loc_To, Via loc_Via, MessageBody loc_MB)

	From loc_From, To loc_To, Via loc_Via, MessageBody loc_MB, template (omit) Contact p_contact)

	modifies m_Response_200_1

	// (loc_CallId, loc_CSeq)  // original params

	:=
@@ -2756,7 +2756,27 @@ group Responses 
		msgHeader :=

		{

    		contentLength	:= {fieldName := CONTENT_LENGTH_E, len:=  f_MessageBodyLength(loc_MB)},

    		contentType := m_IsupContentType

    		contentType := m_IsupContentType,

    		contact := p_contact

		},

		messageBody := loc_MB

	}





	template Response m_Response_180_100rel_ISUP (CallId loc_CallId, CSeq loc_CSeq,

	From loc_From, To loc_To, Via loc_Via, MessageBody loc_MB, Contact p_contact)

	modifies m_Response_200_1

	// (loc_CallId, loc_CSeq)  // original params

	:=

	{

		statusLine := {sipVersion := SIP_NAME_VERSION, statusCode := 180, reasonPhrase := "Ringing"},

		msgHeader :=

		{

			require:={fieldName:=REQUIRE_E, optionsTags:={TAG_100rel}},

			rSeq := {fieldName:=RSEQ_E, responseNum:=1},

			contentLength	:= {fieldName := CONTENT_LENGTH_E, len:=  f_MessageBodyLength(loc_MB)},

			contentType := m_IsupContentType,

			contact := p_contact

		},

		messageBody := loc_MB

	}
@@ -3793,7 +3813,7 @@ group SDP_Messages { 
				connections := *,

				bandwidth := *,

				key := *,						

				attributes := superset(loc_attribute)

				attributes := superset(valueof(loc_attribute))

			}

		}

	};