corrections due to validation in weeks 4 and 5 - STF467 (f4c612a0) · Commits · TTCN-3 Libraries / LibSip

ttcn/LibSip_Steps.ttcn

+29 −4

Original line number	Diff line number	Diff line
		@@ -1687,6 +1687,11 @@ group SetHeaders {
		vc_boo_recordRoute:=true;
		vc_recordRoute := p_Request.msgHeader.recordRoute;
		}
		if (ispresent(p_Request.msgHeader.route))
		{
		//used in case when route header is received (isc interface)
		vc_route := p_Request.msgHeader.route;
		}
		} // end f_setHeadersOnReceiptOfRequest

		/**
		@@ -1720,15 +1725,26 @@ group SetHeaders {
		else
		{
		if (ischosen(vc_to.addressField.nameAddr))
		{
		if (ischosen(vc_to.addressField.nameAddr.addrSpec.components.sip))
		{
		vc_reqHostPort := vc_to.addressField.nameAddr.addrSpec.components.sip.hostPort;
		vc_requestUri := vc_to.addressField.nameAddr.addrSpec;
		}
		}
		else
		{
		if (ischosen(vc_to.addressField.addrSpecUnion.components.sip))
		{
		vc_reqHostPort := vc_to.addressField.addrSpecUnion.components.sip.hostPort;
		vc_requestUri := vc_to.addressField.addrSpecUnion;
		}
		else
		{
		vc_requestUri := vc_to.addressField.addrSpecUnion;
		log("vc_reqHostPort not set due to no contact header and due to To header which is either tel or urn type.");
		}
		}
		}

		vc_callee_To:={fieldName := TO_E,
		@@ -2972,6 +2988,7 @@ group AwaitingMessage {
		{
		[] SIPP.receive(p_ACK) -> value v_ACK_Request
		{
		f_setHeadersOnReceiptOfRequest(v_ACK_Request);
		tc_ack.stop;
		}
		}
		@@ -4320,6 +4337,14 @@ group DefaultsTestStep
		repeat
		}

		//awaiting of PRACK message
		[] SIPP.receive(mw_PRACK_Request_Base(vc_callId))->value v_request sender vc_sent_label
		{
		f_setHeadersOnReceiptOfRequest(v_request);
		f_send200OK();
		repeat
		}

		// unexpected BYE is acknowledged to avoid retransmissions
		[] SIPP.receive(mw_BYE_Request_Base(?))-> value v_request sender vc_sent_label
		{