Aligned to Draft ETSI TS 102 636-4-1 V0.0.8. (c52ad624) · Commits · TTCN-3 Libraries / LibIts

ttcn/GeoNetworking/LibItsGeoNetworking_TypesAndValues.ttcn

+39 −53

Original line number	Original line	Diff line number	Diff line
	@@ -113,7 +113,7 @@ module LibItsGeoNetworking_TypesAndValues {
	/**		/**
	* @desc GeoNetworking Packet		* @desc GeoNetworking Packet
	*		*
	* @see Draft ETSI TS 102 636-4-1 V0.0.6 (2010-06) chapter 7.2		* @see Draft ETSI TS 102 636-4-1 V0.0.8 (2010-09) chapter 8.2
	*		*
	* @member gnHeader		* @member gnHeader
	* @member gnSecHeader		* @member gnSecHeader
	@@ -132,7 +132,7 @@ module LibItsGeoNetworking_TypesAndValues {
	/**		/**
	* @desc GeoNetworking Header		* @desc GeoNetworking Header
	*		*
	* @see Draft ETSI TS 102 636-4-1 V0.0.6 (2010-06) chapter 7.3		* @see Draft ETSI TS 102 636-4-1 V0.0.8 (2010-09) chapter 8.3
	*		*
	* @member commonHeader		* @member commonHeader
	* @member gnExtHeader		* @member gnExtHeader
	@@ -171,7 +171,7 @@ module LibItsGeoNetworking_TypesAndValues {
	/**		/**
	* @desc The BEACON packet header.		* @desc The BEACON packet header.
	*		*
	* @see Draft ETSI TS 102 636-4-1 V0.0.6 (2010-06) chapter 7.6.6		* @see Draft ETSI TS 102 636-4-1 V0.0.8 (2010-09) chapter 8.6.6
	*		*
	* @member commonHeader		* @member commonHeader
	*/		*/
	@@ -182,7 +182,7 @@ module LibItsGeoNetworking_TypesAndValues {
	/**		/**
	* @desc The GEOANYCAST packet header.		* @desc The GEOANYCAST packet header.
	*		*
	* @see Draft ETSI TS 102 636-4-1 V0.0.6 (2010-06) chapter 7.6.5		* @see Draft ETSI TS 102 636-4-1 V0.0.8 (2010-09) chapter 8.6.5
	*		*
	* @member commonHeader		* @member commonHeader
	* @member seqNumber		* @member seqNumber
	@@ -213,7 +213,7 @@ module LibItsGeoNetworking_TypesAndValues {
	/**		/**
	* @desc The GEOBROADCAST packet header.		* @desc The GEOBROADCAST packet header.
	*		*
	* @see Draft ETSI TS 102 636-4-1 V0.0.6 (2010-06) chapter 7.6.5		* @see Draft ETSI TS 102 636-4-1 V0.0.8 (2010-09) chapter 8.6.5
	*		*
	* @member commonHeader		* @member commonHeader
	* @member seqNumber		* @member seqNumber
	@@ -232,7 +232,7 @@ module LibItsGeoNetworking_TypesAndValues {
	/**		/**
	* @desc The GEOUNICAST packet header.		* @desc The GEOUNICAST packet header.
	*		*
	* @see Draft ETSI TS 102 636-4-1 V0.0.6 (2010-06) chapter 7.6.2		* @see Draft ETSI TS 102 636-4-1 V0.0.8 (2010-09) chapter 8.6.2
	*		*
	* @member commonHeader		* @member commonHeader
	* @member seqNumber		* @member seqNumber
	@@ -253,15 +253,13 @@ module LibItsGeoNetworking_TypesAndValues {
	/**		/**
	* @desc The Location Service (LS) Reply packet header.		* @desc The Location Service (LS) Reply packet header.
	*		*
	* @see Draft ETSI TS 102 636-4-1 V0.0.6 (2010-06) chapter 7.6.8		* @see Draft ETSI TS 102 636-4-1 V0.0.8 (2010-09) chapter 8.6.8
	*		*
	* @member commonHeader		* @member commonHeader
	* @member seqNumber		* @member seqNumber
	* @member lifetime		* @member lifetime
	* @member reserved		* @member reserved
	* @member srcPosVector		* @member srcPosVector
	*
	* @remark Added DEPV: http://t-ort.etsi.org/view.php?id=5674
	*/		*/
	type record LSReplyHeader {		type record LSReplyHeader {
	CommonHeader commonHeader,		CommonHeader commonHeader,
	@@ -269,13 +267,13 @@ module LibItsGeoNetworking_TypesAndValues {
	Lifetime lifetime,		Lifetime lifetime,
	UInt8 reserved,		UInt8 reserved,
	LongPosVector srcPosVector,		LongPosVector srcPosVector,
	LongPosVector dstPosVector		ShortPosVector dstPosVector
	}		}

	/**		/**
	* @desc The Location Service (LS) Request packet header.		* @desc The Location Service (LS) Request packet header.
	*		*
	* @see Draft ETSI TS 102 636-4-1 V0.0.6 (2010-06) chapter 7.6.7		* @see Draft ETSI TS 102 636-4-1 V0.0.8 (2010-09) chapter 8.6.7
	*		*
	* @member commonHeader		* @member commonHeader
	* @member seqNumber		* @member seqNumber
	@@ -297,7 +295,7 @@ module LibItsGeoNetworking_TypesAndValues {
	* @desc TODO clarify the values for header type and header subtype		* @desc TODO clarify the values for header type and header subtype
	* The Single Hop Broadcast (SHB) packet header.		* The Single Hop Broadcast (SHB) packet header.
	*		*
	* @see Draft ETSI TS 102 636-4-1 V0.0.6 (2010-06) chapter 7.6.4		* @see Draft ETSI TS 102 636-4-1 V0.0.8 (2010-09) chapter 8.6.4
	*		*
	* @member commonHeader		* @member commonHeader
	*/		*/
	@@ -308,7 +306,7 @@ module LibItsGeoNetworking_TypesAndValues {
	/**		/**
	* @desc The Topologically-Scoped Broadcast (TSB) packet header.		* @desc The Topologically-Scoped Broadcast (TSB) packet header.
	*		*
	* @see Draft ETSI TS 102 636-4-1 V0.0.6 (2010-06) chapter 7.6.3		* @see Draft ETSI TS 102 636-4-1 V0.0.8 (2010-09) chapter 8.6.3
	*		*
	* @member commonHeader		* @member commonHeader
	* @member seqNumber		* @member seqNumber
	@@ -361,7 +359,7 @@ module LibItsGeoNetworking_TypesAndValues {
	* +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+		* +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
	* </pre>		* </pre>
	*		*
	* @see Draft ETSI TS 102 636-4-1 V0.0.6 (2010-06) chapter 7.4.2		* @see Draft ETSI TS 102 636-4-1 V0.0.8 (2010-09) chapter 8.4.2
	*		*
	* @member version		* @member version
	* @member nextHeader		* @member nextHeader
	@@ -379,7 +377,7 @@ module LibItsGeoNetworking_TypesAndValues {
	NextHeader nextHeader,		NextHeader nextHeader,
	HeaderTST headerTST,		HeaderTST headerTST,
	UInt8 reserved,		UInt8 reserved,
	Flags flags,		Bit8 flags,
	UInt16 plLength,		UInt16 plLength,
	TrafficClass trafficClass,		TrafficClass trafficClass,
	UInt8 hopLimit,		UInt8 hopLimit,
	@@ -525,7 +523,7 @@ module LibItsGeoNetworking_TypesAndValues {
	* +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+		* +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
	* </pre>		* </pre>
	*		*
	* @see Draft ETSI TS 102 636-4-1 V0.0.6 (2010-06) chapter 7.4.2		* @see Draft ETSI TS 102 636-4-1 V0.0.8 (2010-09) chapter 8.4.2
	*		*
	* @member gnAddr		* @member gnAddr
	* @member timestamp		* @member timestamp
	@@ -604,7 +602,7 @@ module LibItsGeoNetworking_TypesAndValues {
	* +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+		* +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
	* </pre>		* </pre>
	*		*
	* @see Draft ETSI TS 102 636-4-1 V0.0.6 (2010-06) chapter 7.4.3		* @see Draft ETSI TS 102 636-4-1 V0.0.8 (2010-09) chapter 8.4.3
	*		*
	* @member gnAddr		* @member gnAddr
	* @member timestamp		* @member timestamp
	@@ -636,13 +634,13 @@ module LibItsGeoNetworking_TypesAndValues {
	* 0 1 2 3		* 0 1 2 3
	* 0 1 2 3 4 5 6 7 0 1 2 3 4 5 6 7 0 1 2 3 4 5 6 7 0 1 2 3 4 5 6 7		* 0 1 2 3 4 5 6 7 0 1 2 3 4 5 6 7 0 1 2 3 4 5 6 7 0 1 2 3 4 5 6 7
	* +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+		* +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
	* \|M\| S_T \|S\| R \| S_CC \| S_LAC \| M_ID \|		* \|M\| S_T \|S\| R \| S_CC \| M_ID \|
	* +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+		* +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
	* \| M_ID \|		* \| M_ID \|
	* +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+		* +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
	* </pre>		* </pre>
	*		*
	* @see Draft ETSI TS 102 636-4-1 V0.0.6 (2010-06) chapter 5.2		* @see Draft ETSI TS 102 636-4-1 V0.0.8 (2010-09) chapter 6.2
	*		*
	* @member typeOfAddress		* @member typeOfAddress
	* @member stationType		* @member stationType
	@@ -662,18 +660,6 @@ module LibItsGeoNetworking_TypesAndValues {

	group geoNetworkingAddressSubtypes {		group geoNetworkingAddressSubtypes {

	/**
	* @desc Distinguishes the ITS station type.
	* @member reserved
	* @member stationType
	* @member reserved2
	*/
	type record Flags {
	UInt6 reserved,
	StationTypeIdentifier stationType,
	UInt1 reserved2
	}

	/**		/**
	* @desc Latency expresses the relative packet delivery latency in a geographical area (2Bits).		* @desc Latency expresses the relative packet delivery latency in a geographical area (2Bits).
	*/		*/
	@@ -877,7 +863,7 @@ module LibItsGeoNetworking_TypesAndValues {
	}		}

	type record GenerateGeoBroadcastMessage {		type record GenerateGeoBroadcastMessage {
	GeoArea area,		charstring area,
	Payload payload optional		Payload payload optional
	}		}

Admin message