Skip to content
Snippets Groups Projects
Commit c52ad624 authored by tepelmann's avatar tepelmann
Browse files

Aligned to Draft ETSI TS 102 636-4-1 V0.0.8.

parent 63f59061
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
ttcn/GeoNetworking/LibItsGeoNetworking_TypesAndValues.ttcn
+ 39
− 53
View file @ c52ad624
/**
* @author ETSI / STF405
* @version $URL$
* $Id$
* @desc Module containing types and values for GeoNetworking Protocol
* @author ETSI / STF405
* @version $URL$
* $Id$
* @desc Module containing types and values for GeoNetworking Protocol
*
*/
module LibItsGeoNetworking_TypesAndValues {
......@@ -97,15 +97,15 @@ module LibItsGeoNetworking_TypesAndValues {
} // end geoConfigurationTypes
group geoNwValues {
group geoNwHeaderConstants {
const UInt4 c_geoNwProtocolVersion := 0;
const UInt8 c_hopLimit1 := 1;
group geoNwValues {
group geoNwHeaderConstants {
const UInt4 c_geoNwProtocolVersion := 0;
const UInt8 c_hopLimit1 := 1;
const UInt8 c_defaultHopLimit := 10;
} // end geoNwHeaderConstants
} // end geoNwHeaderConstants
} // end geoNwValues
group geoNetworkingPdus {
......@@ -113,7 +113,7 @@ module LibItsGeoNetworking_TypesAndValues {
/**
* @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 gnSecHeader
......@@ -132,7 +132,7 @@ module LibItsGeoNetworking_TypesAndValues {
/**
* @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 gnExtHeader
......@@ -171,7 +171,7 @@ module LibItsGeoNetworking_TypesAndValues {
/**
* @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
*/
......@@ -182,7 +182,7 @@ module LibItsGeoNetworking_TypesAndValues {
/**
* @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 seqNumber
......@@ -213,7 +213,7 @@ module LibItsGeoNetworking_TypesAndValues {
/**
* @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 seqNumber
......@@ -232,7 +232,7 @@ module LibItsGeoNetworking_TypesAndValues {
/**
* @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 seqNumber
......@@ -253,15 +253,13 @@ module LibItsGeoNetworking_TypesAndValues {
/**
* @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 seqNumber
* @member lifetime
* @member reserved
* @member srcPosVector
*
* @remark Added DEPV: http://t-ort.etsi.org/view.php?id=5674
*/
type record LSReplyHeader {
CommonHeader commonHeader,
......@@ -269,13 +267,13 @@ module LibItsGeoNetworking_TypesAndValues {
Lifetime lifetime,
UInt8 reserved,
LongPosVector srcPosVector,
LongPosVector dstPosVector
ShortPosVector dstPosVector
}
/**
* @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 seqNumber
......@@ -297,7 +295,7 @@ module LibItsGeoNetworking_TypesAndValues {
* @desc TODO clarify the values for header type and header subtype
* 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
*/
......@@ -308,7 +306,7 @@ module LibItsGeoNetworking_TypesAndValues {
/**
* @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 seqNumber
......@@ -361,7 +359,7 @@ module LibItsGeoNetworking_TypesAndValues {
* +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
* </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 nextHeader
......@@ -379,7 +377,7 @@ module LibItsGeoNetworking_TypesAndValues {
NextHeader nextHeader,
HeaderTST headerTST,
UInt8 reserved,
Flags flags,
Bit8 flags,
UInt16 plLength,
TrafficClass trafficClass,
UInt8 hopLimit,
......@@ -525,7 +523,7 @@ module LibItsGeoNetworking_TypesAndValues {
* +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
* </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 timestamp
......@@ -604,7 +602,7 @@ module LibItsGeoNetworking_TypesAndValues {
* +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
* </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 timestamp
......@@ -636,13 +634,13 @@ module LibItsGeoNetworking_TypesAndValues {
* 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
* +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
* |M| S_T |S| R | S_CC | S_LAC | M_ID |
* |M| S_T |S| R | S_CC | M_ID |
* +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
* | M_ID |
* +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
* </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 stationType
......@@ -662,18 +660,6 @@ module LibItsGeoNetworking_TypesAndValues {
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).
*/
......@@ -835,15 +821,15 @@ module LibItsGeoNetworking_TypesAndValues {
group geoNwPicsTypes {
type enumerated GeoUnicastForwardingAlgorithm {
e_unspecified(0),
e_greedy(1)
}
type enumerated GeoBroadcastForwardingAlgorithm {
e_unspecified(0),
e_simple(1)
}
type enumerated GeoUnicastForwardingAlgorithm {
e_unspecified(0),
e_greedy(1)
}
type enumerated GeoBroadcastForwardingAlgorithm {
e_unspecified(0),
e_simple(1)
}
} // end geoNwPicsTypes
......@@ -877,7 +863,7 @@ module LibItsGeoNetworking_TypesAndValues {
}
type record GenerateGeoBroadcastMessage {
GeoArea area,
charstring area,
Payload payload optional
}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment