Commit c28a847e authored by borowski's avatar borowski
Browse files

changed Type system accordingly to the standard

parent 2cc69307

LibGtp/ttcn/LibGtp_Templates.ttcn3

+78 −63
Original line number Diff line number Diff line 
/**

 * @author STF 443

 * @version $Id: LibGtp_TypesAndValues.ttcn 459 2012-04-16 08:53:33Z pintar $

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

 * @desc

 *     This module defines message, header, structured and simple GTP

 *               types as well constants used by LipDiameter constructs. <br>

 *               Note that any changes made to the definitions in this module

 *               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

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

 *            Existing message or header types shall not be changed or removed 

 * @remark

 *     Adding of new message and header types is ok; Existing message or header types shall not be

 *     changed or removed

 */

module LibGtp_Templates {

    

	import from LibCommon_BasicTypesAndValues all;

	import from LibCommon_DataStrings all;

	import from LibCommon_AbstractData all;
@@ -22,9 +23,14 @@ module LibGtp_Templates { 


	template GTPv1_MSG m_gtp_v1_dummy := {

		header := {

    		version := '001'B,

			version := '1'B,

			PT := '1'B,

			spare := '0'B,

			E := '0'B,

			S := '0'B,

			PN := '0'B,

			messagetype := '01'O,

    		len := '10'O,

			len := '0010'O,

			teid := PX_TEID,

			seqnum := omit,

			npdu_num := omit,
@@ -36,9 +42,14 @@ module LibGtp_Templates { 


	template GTPv1_MSG m_gtp_v1(octetstring p_messagetype) := {

		header := {

            version := '0001'B,

			version := '1'B,

			PT := '0'B,

			spare := '0'B,

			E := '1'B,

			S := '0'B,

			PN := '0'B,

			messagetype := p_messagetype,

            len := '10'O,

			len := '0010'O,

			teid := PX_TEID,

			seqnum := omit,

			npdu_num := omit,
@@ -51,6 +62,11 @@ module LibGtp_Templates { 
	template GTPv1_MSG mw_gtp_v1(octetstring p_messagetype) := {

		header := {

			version := ?,

			PT := ?,

			spare := ?,

			E := ?,

			S := ?,

			PN := ?,

			messagetype := p_messagetype,

			len := ?,

			teid := ?,
@@ -60,5 +76,4 @@ module LibGtp_Templates { 
		},

		body := *

	}



}
 
 No newline at end of file

LibGtp/ttcn/LibGtp_TypesAndValues.ttcn3

+45 −42
Original line number Diff line number Diff line 
/**

 * @author STF 443

 * @version $Id: LibGtp_TypesAndValues.ttcn 459 2012-04-16 08:53:33Z pintar $

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

 * @desc

 *     This module defines message, header, structured and simple GTP

 *             types as well constants used by LipDiameter constructs. <br>

 *             Note that any changes made to the definitions in this module

 *             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

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

 *            Existing message or header types shall not be changed or removed 

 * @remark

 *     Adding of new message and header types is ok; Existing message or header types shall not be

 *     changed or removed

 */

module LibGtp_TypesAndValues {

    

	import from LibCommon_BasicTypesAndValues all;

	import from LibCommon_DataStrings all;

	import from LibCommon_AbstractData all;
@@ -25,19 +26,21 @@ module LibGtp_TypesAndValues { 
	 * @reference ETSI TS 129281 v10.3.0, section 5.1

	 */

	type record GTPv1_Header {

    bitstring version,

    octetstring messagetype,

    octetstring len,

    octetstring teid,

    octetstring seqnum optional,

    octetstring npdu_num optional,

    octetstring extensionheader optional

		Bit1 version,

		Bit1 PT,

		Bit1 spare,

		Bit1 E,

		Bit1 S,

		Bit1 PN,

		Oct1 messagetype,

		Oct2 len,

		Oct4 teid,

		Oct2 seqnum optional,

		Oct1 npdu_num optional,

		Oct1 extensionheader optional

	}



	type record GTPv1_MSG {

        GTPv1_Header  header,

        octetstring	  body optional

		GTPv1_Header header, octetstring body optional

	}





}
 
 No newline at end of file