Commit 7db00935 authored by poglitsch's avatar poglitsch
Browse files

added changes for STF 406 validation

parent 5a37314e

ttcn/LibSip_Interface.ttcn

+1 −0
Original line number Diff line number Diff line
@@ -165,6 +165,7 @@ module LibSip_Interface language "TTCN-3:2005"//MRO 
	  var boolean 		vc_first_recv			:= false; 	// true after receipt of first incomming SIP message

	  var boolean 		vc_firstREGISTER_sent	:= false; 	// true after sent of first REGISTER message

  	  var boolean		vc_DeregDone 			:= false;	// true after first DeREGISTRATION trail (avoid loop)

      var boolean		vc_interface_isc		:= false;	// true if isc interface is in use

	  var boolean v_white_space := false;//MRO



	  // ETS address

ttcn/LibSip_SIPTypesAndValues.ttcn

+1 −0
Original line number Diff line number Diff line
@@ -150,6 +150,7 @@ group SimpleConstants 
	  const PrivacyValue c_privacy_header := "header";

	  const PrivacyValue c_privacy_user := "user";

	  const PrivacyValue c_privacy_critical := "critical";

      const PrivacyValue c_privacy_session := "session";

	  

	  // @ (at) sign

	  const charstring c_AT := "@";

ttcn/LibSip_Steps.ttcn

+18 −3
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ group ParameterOperations { 
		  { id := "response=""""", paramValue := omit } // already enclosed to " characters

	  }};

	      

	  return v_result;

	  return valueof(v_result);

	}
@@ -194,7 +194,7 @@ group ParameterOperations { 
		}

	  };

      

	  return v_result;

     return  valueof(v_result);

	}



	/**
@@ -2138,7 +2138,7 @@ group SDPOperations{ 
				{

					if (ischosen(vc_sdp_remote.media_list[i].attributes[j].rtpmap))

					{

						if (v_PT == regexp(vc_sdp_remote.media_list[i].attributes[j].rtpmap.attr_value,	v_mypat,	0))

						if (v_PT == regexp(vc_sdp_remote.media_list[i].attributes[j].rtpmap.attr_value,	valueof(v_mypat),	0))

						{

							v_rtpmap := vc_sdp_remote.media_list[i].attributes[j].

							rtpmap.attr_value;
@@ -2711,6 +2711,21 @@ group AwaitingMessage { 
			f_setHeadersOnReceiptOfINVITE(v_INVITE_Request);

			SIPP.send(m_Response_Base(c_statusLine100, vc_callId, vc_cSeq, vc_from, vc_to, vc_via)) to vc_sent_label;

		  }

        [vc_interface_isc]SIPP.receive	(mw_INVITE_Request_Base) -> value v_INVITE_Request sender vc_sent_label

          { 

            tc_wait.stop;

            setverdict(fail);

            f_setHeadersOnReceiptOfINVITE(v_INVITE_Request);

            SIPP.send(m_Response_Base(c_statusLine100, vc_callId, vc_cSeq, vc_from, vc_to, vc_via)) to vc_sent_label;

			//clear session - send 486 and await ACK

            f_sendResponse(m_Response_Base(c_statusLine486,vc_callId,vc_cSeq,vc_caller_From,vc_caller_To,vc_via));

            f_awaitingACK(mw_ACK_Request_Base(?));

            //await 486 which go towards and send ACK        

            f_awaitingResponse(mw_Response_Base(c_statusLine486,?,?));

            f_SendACK(m_ACK_Request_Base(vc_requestUri,vc_callId,vc_cSeq,vc_from,vc_to,vc_via));

            syncPort.send(m_syncClientStop);

            stop

          }

	  }

	} //end f_awaitingINVITE

ttcn/LibSip_XMLTypes.ttcn

+1 −2
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ 
 *              - new types RegInfo and Pidf_Lo added by STF160

 */

module LibSip_XMLTypes language "TTCN-3:2009" {

	import from XSDAUX all;



    import from http_www_w3_org_XML_1998_namespace language "XSD" all

    with {
@@ -120,4 +119,4 @@ module LibSip_XMLTypes language "TTCN-3:2009" { 
            Geopriv geopriv                     // if it is  a Presence Information Data Format Location Object

        }

    }

} /* end module LibSip_XMLTy
 
 No newline at end of file
 
}
 
 No newline at end of file