From a86c5f7cae7ec9a3398300555a0b644689d946a1 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Thu, 19 Sep 2024 06:14:53 +0200 Subject: Merging upstream version 4.4.0. Signed-off-by: Daniel Baumann --- epan/dissectors/packet-its.h | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) (limited to 'epan/dissectors/packet-its.h') diff --git a/epan/dissectors/packet-its.h b/epan/dissectors/packet-its.h index f7f2baef..7a53da1c 100644 --- a/epan/dissectors/packet-its.h +++ b/epan/dissectors/packet-its.h @@ -1,7 +1,7 @@ /* Do not modify this file. Changes will be overwritten. */ /* Generated automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-its.h */ -/* asn2wrs.py -L -o its -c ./its.cnf -s ./packet-its-template -D . -O ../.. ETSI-ITS-CDD.asn ITS-ContainerV1.asn ISO_TS_14816.asn ISO_TS_14906_Application.asn ISO_TS_19091.asn GDD.asn ISO19321IVIv2.asn ETSI_TS_103301.asn CAMv1.asn CAM-PDU-Descriptions.asn DENMv1.asn DENM-PDU-Descriptions.asn TIS_TPG_Transactions_Descriptions.asn EVCSN-PDU-Descriptions.asn EV-RSR-PDU-Descriptions.asn CPM-OriginatingStationContainers.asn CPM-PDU-Descriptions.asn CPM-PerceivedObjectContainer.asn CPM-PerceptionRegionContainer.asn CPM-SensorInformationContainer.asn VAM-PDU-Descriptions.asn IMZM-PDU-Descriptions.asn */ +/* asn2wrs.py -q -L -o its -c ./its.cnf -s ./packet-its-template -D . -O ../.. ETSI-ITS-CDD.asn ITS-ContainerV1.asn ISO_TS_14816.asn ISO_TS_14906_Application.asn ISO_TS_19091.asn GDD.asn ISO19321IVIv2.asn ETSI_TS_103301.asn CAMv1.asn CAM-PDU-Descriptions.asn DENMv1.asn DENM-PDU-Descriptions.asn TIS_TPG_Transactions_Descriptions.asn EVCSN-PDU-Descriptions.asn EV-RSR-PDU-Descriptions.asn CPM-OriginatingStationContainers.asn CPM-PDU-Descriptions.asn CPM-PerceivedObjectContainer.asn CPM-PerceptionRegionContainer.asn CPM-SensorInformationContainer.asn VAM-PDU-Descriptions.asn IMZM-PDU-Descriptions.asn */ /* packet-its-template.h * @@ -111,7 +111,6 @@ typedef enum _CauseCodeType_enum { - reserved = 0, trafficCondition = 1, accident = 2, roadworks = 3, @@ -130,6 +129,7 @@ typedef enum _CauseCodeType_enum { violence = 20, slowVehicle = 26, dangerousEndOfQueue = 27, + publicTransportVehicleApproaching = 28, vehicleBreakdown = 91, postCrash = 92, humanProblem = 93, @@ -145,12 +145,12 @@ typedef enum _CauseCodeType_enum { /* enumerated values for MessageId */ #define ITS_DENM 1 #define ITS_CAM 2 -#define ITS_POI 3 +#define ITS_POIM 3 #define ITS_SPATEM 4 #define ITS_MAPEM 5 #define ITS_IVIM 6 -#define ITS_EV_RSR 7 -#define ITS_TISTPGTRANSACTION 8 +#define ITS_RFU1 7 +#define ITS_RFU2 8 #define ITS_SREM 9 #define ITS_SSEM 10 #define ITS_EVCSN 11 @@ -264,12 +264,15 @@ typedef enum _RegionId_enum { typedef struct its_header { - guint32 version; - guint32 msgId; - guint32 stationId; - guint32 CpmContainerId; + uint32_t version; + uint32_t msgId; + uint32_t stationId; + uint32_t CpmContainerId; } its_header_t; + + + enum regext_type_enum { Reg_AdvisorySpeed, Reg_ComputedLane, -- cgit v1.2.3