Commit 6b3191c4 authored by rennoch's avatar rennoch
Browse files

Inputs from TTCN-3 users added by STF471

parent 17233f48

ttcn/LibSip_Interface.ttcn

+6 −3
Original line number Diff line number Diff line 
/*

 *	@author 	STF 346, STF366, STF368, STF369, STF450

 *	@author 	STF 346, STF366, STF368, STF369, STF450, STF471

 *  @version    $Id$

 *	@desc		This module provides the types used by the test component 

 *              for SIP-IMS tests. Module become from STF306 and STF334-336

 *              This module is part of LibSipV2.

 *              This module is part of LibSipV3.

 */



module LibSip_Interface
@@ -97,6 +97,8 @@ module LibSip_Interface 
	  // SIP message header fields (for building next message)

	  var CallId	vc_callId    	:= c_empty_CallId;

	  var CallId	vc_callIdReg 	:= c_empty_CallId;

	  // TODO: TT change

      var CallId	vc_callIdSub 	:= c_empty_CallId;

	  var From		vc_from      	:= c_empty_From;

	  var To		vc_to        	:= c_empty_To;

	  var To		vc_cancel_To 	:= c_empty_To;	// used for next CANCEL
@@ -169,7 +171,8 @@ module LibSip_Interface 
  	  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



	  // TODO: TT change

      var boolean vc_subscribed := false;

	  // ETS address

      var address v_ets_label := { host := PX_SIP_TS1_IPADDR, portField := PX_SIP_TS1_PORT};

ttcn/LibSip_PIXITS.ttcn

+15 −3
Original line number Diff line number Diff line 
/*

 *	@author 	STF 346, STF366, STF368, STF369, STF450

 *	@author 	STF 346, STF366, STF368, STF369, STF450, STF471

 *  @version    $Id$

 *	@desc		This module provides the types used by the test component 

 *              for SIP-IMS tests. Module become from STF306 and STF334-336

 *              This module is part of LibSipV2.

 *              This module is part of LibSipV3.

 *  NOTE:		PIXITS in folowing groups can be ignored if this information

 *   			is provided in other modules of the ATS that uses this SIP library

 *				- Ports_and_addresses_of_the_SUT
@@ -282,7 +282,7 @@ module LibSip_PIXITS //MRO 
	  */

	  modulepar charstring PX_SIP_SUT_UE1_PASSWD := "1234";



	  /** @desc	charstring for RFC 2617  3-2-1 qop options:

	  /** @desc	charstring for RFC 2617 clause 3-2-1 qop options:

	  * Quoted string of one or more tokens indicating the "quality of protection" values supported by the server. The

	  * value "auth" indicates authentication; the value "auth-int" indicates authentication with integrity protection.

	  */
@@ -346,5 +346,17 @@ module LibSip_PIXITS //MRO 
	  */

	  modulepar float        PX_TRespRetention := 1.0;

  }//group SIP_Timers

  

  // TODO STF471 addition

  group MimePart {

      /** @desc charstring for delimiter value used in mime multipart message to separate message body parts

      */

      modulepar charstring PX_SIP_MIME_Boundary := "boundary1";



      /** @desc charstring for content type value of mime xml message body part

      */

      modulepar charstring PX_SIP_ISUP_ContentType := "application/vnd.etsi.cug+xml"; // application/vnd.etsi.simservs+xml

  } // group MimePart  

  

  } //group SIP_PIXITparameters

} // end module LibSip_PIXITS

ttcn/LibSip_SDPTypes.ttcn

+2 −2
Original line number Diff line number Diff line 
/**

 *  @author   STF 346, STF366, STF368, STF369, STF450

 *  @author   STF 346, STF366, STF368, STF369, STF450, STF471

 *  @version  $Id$

 *  @desc     This module defines message, attribute, structured and simple

 *            SDP types as well constants used by LipSip constructs. <br>
@@ -7,7 +7,7 @@ 
 *            may be overwritten by future releases of this library

 *            End users are encouraged to contact the distributers of this

 *            module regarding their modifications or additions

 *            This module is part of LibSipV2.

 *            This module is part of LibSipV3.

 *  @remark   Adding of new attributes types is ok;

 *            Adding of new optional attributes in @see SDP_attribute type

 *            is ok;

ttcn/LibSip_SIPTypesAndValues.ttcn

+11 −7
Original line number Diff line number Diff line 
/**

 *  @author   STF 346, STF366, STF368, STF369, STF450

 *  @author   STF 346, STF366, STF368, STF369, STF450, STF471

 *  @version  $Id$

 *  @desc     This module defines message, header, structured and simple SIP

 *            types as well constants used by LipSip constructs. <br>
@@ -7,7 +7,7 @@ 
 *            may be overwritten by future releases of this library

 *            End users are encouraged to contact the distributers of this

 *            module regarding their modifications or additions

 *            This module is part of LibSipV2.

 *            This module is part of LibSipV3.

 *  @remark   Adding of new message and header types is ok;

 *            Adding of new optional header fields in @see MessageHeader type

 *            is ok but should be done at same time as dummy template updates;
@@ -18,6 +18,7 @@ 
module LibSip_SIPTypesAndValues

{

  import from LibSip_MessageBodyTypes all;

  import from LibSip_PIXITS all;



group Constants

{
@@ -78,7 +79,8 @@ group SimpleConstants 
      const charstring c_xmlreginfoAplication := "application/reginfo+xml";



      // MIME name application

      const charstring c_mimeMultipart := "multipart/mixed";

      //TODO TT change: added boundary delimiter

      const charstring c_mimeMultipart := "multipart/mixed;boundary=""" & PX_SIP_MIME_Boundary & """";



      // IMS 3GPP name application

      const charstring c_ims3gppAplication := "application/3gpp-ims+xml";
@@ -1385,6 +1387,8 @@ group SubTypes{// Subtypes 
      //[3455/5.6]

      type record PChargingVector {

        FieldName fieldName(P_CHARGING_VECTOR_E),

        //TODO STF471 change: icidValue is mandatory

        charstring icidValue,

        SemicolonParam_List chargeParams optional

      }

      }//end group RFC33455HeaderFieldTypes
@@ -1479,12 +1483,12 @@ group SubTypes{// Subtypes 


      type record of HistoryInfoEntry HistoryInfo_List;





      type record of charstring StringList;

      //TODO STF471 change

      type record of integer IntegerList;



      type record HistoryInfoEntry {

          NameAddr nameAddr,

          StringList hiIndex optional,

          IntegerList hiIndex optional,

          SemicolonParam_List hiExtention optional

      }

      }//end group RFC4244HeaderFieldTypes
@@ -1921,4 +1925,4 @@ group SubTypes{// Subtypes 
  }// end group MSGTypes

}// end group Types



} with {encode "LibSip V2"} // end module LibSip_TypesAndValues
 
} with {encode "LibSip V3"} // end module LibSip_TypesAndValues

ttcn/LibSip_Steps.ttcn

+492 −75

File changed.

Preview size limit exceeded, changes collapsed.