forked from osmocom/wireshark
ITS: decode MAP a SPAT v1
Change-Id: I6e0ba0ccc92339b0f43a0fc1f2c040c4baf8482c Reviewed-on: https://code.wireshark.org/review/37990 Petri-Dish: Tomáš Kukosa <keksa@email.cz> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
This commit is contained in:
Tomas Kukosa
Anders Broman
parent
898b00c9a1
commit
4b0f6b7060
|
|
@ -125,7 +125,9 @@ static int proto_its_tistpg = -1;
|
|||
static int proto_its_ssem = -1;
|
||||
static int proto_its_srem = -1;
|
||||
static int proto_its_rtcmem = -1;
|
||||
static int proto_its_mapemv1 = -1;
|
||||
static int proto_its_mapem = -1;
|
||||
static int proto_its_spatemv1 = -1;
|
||||
static int proto_its_spatem = -1;
|
||||
static int proto_addgrpc = -1;
|
||||
|
||||
|
|
@ -622,7 +624,9 @@ void proto_register_its(void)
|
|||
proto_its_denmv1 = proto_register_protocol_in_name_only("ITS message - DENMv1", "DENMv1", "its.message.denmv1", proto_its, FT_BYTES);
|
||||
proto_its_cam = proto_register_protocol_in_name_only("ITS message - CAM", "CAM", "its.message.cam", proto_its, FT_BYTES);
|
||||
proto_its_camv1 = proto_register_protocol_in_name_only("ITS message - CAMv1", "CAMv1", "its.message.camv1", proto_its, FT_BYTES);
|
||||
proto_its_spatemv1 = proto_register_protocol_in_name_only("ITS message - SPATEMv1", "SPATEMv1", "its.message.spatemv1", proto_its, FT_BYTES);
|
||||
proto_its_spatem = proto_register_protocol_in_name_only("ITS message - SPATEM", "SPATEM", "its.message.spatem", proto_its, FT_BYTES);
|
||||
proto_its_mapemv1 = proto_register_protocol_in_name_only("ITS message - MAPEMv1", "MAPEMv1", "its.message.mapemv1", proto_its, FT_BYTES);
|
||||
proto_its_mapem = proto_register_protocol_in_name_only("ITS message - MAPEM", "MAPEM", "its.message.mapem", proto_its, FT_BYTES);
|
||||
proto_its_ivimv1 = proto_register_protocol_in_name_only("ITS message - IVIMv1", "IVIMv1", "its.message.ivimv1", proto_its, FT_BYTES);
|
||||
proto_its_ivim = proto_register_protocol_in_name_only("ITS message - IVIM", "IVIM", "its.message.ivim", proto_its, FT_BYTES);
|
||||
|
|
@ -651,7 +655,9 @@ void proto_register_its(void)
|
|||
#define ITS_CAM_PROT_VERv1 1
|
||||
#define ITS_DENM_PROT_VER 2
|
||||
#define ITS_DENM_PROT_VERv1 1
|
||||
#define ITS_SPATEM_PROT_VERv1 1
|
||||
#define ITS_SPATEM_PROT_VER 2
|
||||
#define ITS_MAPEM_PROT_VERv1 1
|
||||
#define ITS_MAPEM_PROT_VER 2
|
||||
#define ITS_IVIM_PROT_VERv1 1
|
||||
#define ITS_IVIM_PROT_VER 2
|
||||
|
|
@ -678,7 +684,9 @@ void proto_reg_handoff_its(void)
|
|||
dissector_add_uint("its.msg_id", (ITS_DENM_PROT_VERv1 << 16) + ITS_DENM, create_dissector_handle( dissect_denmv1_DecentralizedEnvironmentalNotificationMessageV1_PDU, proto_its_denmv1 ));
|
||||
dissector_add_uint("its.msg_id", (ITS_CAM_PROT_VER << 16) + ITS_CAM, create_dissector_handle( dissect_cam_CoopAwareness_PDU, proto_its_cam ));
|
||||
dissector_add_uint("its.msg_id", (ITS_CAM_PROT_VERv1 << 16) + ITS_CAM, create_dissector_handle( dissect_camv1_CoopAwarenessV1_PDU, proto_its_camv1));
|
||||
dissector_add_uint("its.msg_id", (ITS_SPATEM_PROT_VERv1 << 16) + ITS_SPATEM, create_dissector_handle( dissect_dsrc_SPAT_PDU, proto_its_spatemv1 ));
|
||||
dissector_add_uint("its.msg_id", (ITS_SPATEM_PROT_VER << 16) + ITS_SPATEM, create_dissector_handle( dissect_dsrc_SPAT_PDU, proto_its_spatem ));
|
||||
dissector_add_uint("its.msg_id", (ITS_MAPEM_PROT_VERv1 << 16) + ITS_MAPEM, create_dissector_handle( dissect_dsrc_MapData_PDU, proto_its_mapemv1 ));
|
||||
dissector_add_uint("its.msg_id", (ITS_MAPEM_PROT_VER << 16) + ITS_MAPEM, create_dissector_handle( dissect_dsrc_MapData_PDU, proto_its_mapem ));
|
||||
dissector_add_uint("its.msg_id", (ITS_IVIM_PROT_VERv1 << 16) + ITS_IVIM, create_dissector_handle( dissect_ivi_IviStructure_PDU, proto_its_ivimv1 ));
|
||||
dissector_add_uint("its.msg_id", (ITS_IVIM_PROT_VER << 16) + ITS_IVIM, create_dissector_handle( dissect_ivi_IviStructure_PDU, proto_its_ivim ));
|
||||
|
|
|
|||
|
|
@ -133,7 +133,9 @@ static int proto_its_tistpg = -1;
|
|||
static int proto_its_ssem = -1;
|
||||
static int proto_its_srem = -1;
|
||||
static int proto_its_rtcmem = -1;
|
||||
static int proto_its_mapemv1 = -1;
|
||||
static int proto_its_mapem = -1;
|
||||
static int proto_its_spatemv1 = -1;
|
||||
static int proto_its_spatem = -1;
|
||||
static int proto_addgrpc = -1;
|
||||
|
||||
|
|
@ -1782,7 +1784,7 @@ static int hf_evrsr_SupportedPaymentTypes_contract = -1;
|
|||
static int hf_evrsr_SupportedPaymentTypes_externalIdentification = -1;
|
||||
|
||||
/*--- End of included file: packet-its-hf.c ---*/
|
||||
#line 284 "./asn1/its/packet-its-template.c"
|
||||
#line 286 "./asn1/its/packet-its-template.c"
|
||||
|
||||
// CauseCode/SubCauseCode management
|
||||
static int hf_its_trafficConditionSubCauseCode = -1;
|
||||
|
|
@ -2337,7 +2339,7 @@ static gint ett_evrsr_RechargingType = -1;
|
|||
static gint ett_evrsr_SupportedPaymentTypes = -1;
|
||||
|
||||
/*--- End of included file: packet-its-ett.c ---*/
|
||||
#line 314 "./asn1/its/packet-its-template.c"
|
||||
#line 316 "./asn1/its/packet-its-template.c"
|
||||
|
||||
// Deal with cause/subcause code management
|
||||
struct { CauseCodeType_enum cause; int* hf; } cause_to_subcause[] = {
|
||||
|
|
@ -17376,7 +17378,7 @@ static int dissect_evrsr_EV_RSR_MessageBody_PDU(tvbuff_t *tvb _U_, packet_info *
|
|||
|
||||
|
||||
/*--- End of included file: packet-its-fn.c ---*/
|
||||
#line 356 "./asn1/its/packet-its-template.c"
|
||||
#line 358 "./asn1/its/packet-its-template.c"
|
||||
|
||||
static int
|
||||
dissect_its_PDU(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data)
|
||||
|
|
@ -23197,7 +23199,7 @@ void proto_register_its(void)
|
|||
NULL, HFILL }},
|
||||
|
||||
/*--- End of included file: packet-its-hfarr.c ---*/
|
||||
#line 392 "./asn1/its/packet-its-template.c"
|
||||
#line 394 "./asn1/its/packet-its-template.c"
|
||||
|
||||
{ &hf_its_roadworksSubCauseCode,
|
||||
{ "roadworksSubCauseCode", "its.subCauseCode",
|
||||
|
|
@ -23925,7 +23927,7 @@ void proto_register_its(void)
|
|||
&ett_evrsr_SupportedPaymentTypes,
|
||||
|
||||
/*--- End of included file: packet-its-ettarr.c ---*/
|
||||
#line 595 "./asn1/its/packet-its-template.c"
|
||||
#line 597 "./asn1/its/packet-its-template.c"
|
||||
};
|
||||
|
||||
static ei_register_info ei[] = {
|
||||
|
|
@ -23956,7 +23958,9 @@ void proto_register_its(void)
|
|||
proto_its_denmv1 = proto_register_protocol_in_name_only("ITS message - DENMv1", "DENMv1", "its.message.denmv1", proto_its, FT_BYTES);
|
||||
proto_its_cam = proto_register_protocol_in_name_only("ITS message - CAM", "CAM", "its.message.cam", proto_its, FT_BYTES);
|
||||
proto_its_camv1 = proto_register_protocol_in_name_only("ITS message - CAMv1", "CAMv1", "its.message.camv1", proto_its, FT_BYTES);
|
||||
proto_its_spatemv1 = proto_register_protocol_in_name_only("ITS message - SPATEMv1", "SPATEMv1", "its.message.spatemv1", proto_its, FT_BYTES);
|
||||
proto_its_spatem = proto_register_protocol_in_name_only("ITS message - SPATEM", "SPATEM", "its.message.spatem", proto_its, FT_BYTES);
|
||||
proto_its_mapemv1 = proto_register_protocol_in_name_only("ITS message - MAPEMv1", "MAPEMv1", "its.message.mapemv1", proto_its, FT_BYTES);
|
||||
proto_its_mapem = proto_register_protocol_in_name_only("ITS message - MAPEM", "MAPEM", "its.message.mapem", proto_its, FT_BYTES);
|
||||
proto_its_ivimv1 = proto_register_protocol_in_name_only("ITS message - IVIMv1", "IVIMv1", "its.message.ivimv1", proto_its, FT_BYTES);
|
||||
proto_its_ivim = proto_register_protocol_in_name_only("ITS message - IVIM", "IVIM", "its.message.ivim", proto_its, FT_BYTES);
|
||||
|
|
@ -23985,7 +23989,9 @@ void proto_register_its(void)
|
|||
#define ITS_CAM_PROT_VERv1 1
|
||||
#define ITS_DENM_PROT_VER 2
|
||||
#define ITS_DENM_PROT_VERv1 1
|
||||
#define ITS_SPATEM_PROT_VERv1 1
|
||||
#define ITS_SPATEM_PROT_VER 2
|
||||
#define ITS_MAPEM_PROT_VERv1 1
|
||||
#define ITS_MAPEM_PROT_VER 2
|
||||
#define ITS_IVIM_PROT_VERv1 1
|
||||
#define ITS_IVIM_PROT_VER 2
|
||||
|
|
@ -24012,7 +24018,9 @@ void proto_reg_handoff_its(void)
|
|||
dissector_add_uint("its.msg_id", (ITS_DENM_PROT_VERv1 << 16) + ITS_DENM, create_dissector_handle( dissect_denmv1_DecentralizedEnvironmentalNotificationMessageV1_PDU, proto_its_denmv1 ));
|
||||
dissector_add_uint("its.msg_id", (ITS_CAM_PROT_VER << 16) + ITS_CAM, create_dissector_handle( dissect_cam_CoopAwareness_PDU, proto_its_cam ));
|
||||
dissector_add_uint("its.msg_id", (ITS_CAM_PROT_VERv1 << 16) + ITS_CAM, create_dissector_handle( dissect_camv1_CoopAwarenessV1_PDU, proto_its_camv1));
|
||||
dissector_add_uint("its.msg_id", (ITS_SPATEM_PROT_VERv1 << 16) + ITS_SPATEM, create_dissector_handle( dissect_dsrc_SPAT_PDU, proto_its_spatemv1 ));
|
||||
dissector_add_uint("its.msg_id", (ITS_SPATEM_PROT_VER << 16) + ITS_SPATEM, create_dissector_handle( dissect_dsrc_SPAT_PDU, proto_its_spatem ));
|
||||
dissector_add_uint("its.msg_id", (ITS_MAPEM_PROT_VERv1 << 16) + ITS_MAPEM, create_dissector_handle( dissect_dsrc_MapData_PDU, proto_its_mapemv1 ));
|
||||
dissector_add_uint("its.msg_id", (ITS_MAPEM_PROT_VER << 16) + ITS_MAPEM, create_dissector_handle( dissect_dsrc_MapData_PDU, proto_its_mapem ));
|
||||
dissector_add_uint("its.msg_id", (ITS_IVIM_PROT_VERv1 << 16) + ITS_IVIM, create_dissector_handle( dissect_ivi_IviStructure_PDU, proto_its_ivimv1 ));
|
||||
dissector_add_uint("its.msg_id", (ITS_IVIM_PROT_VER << 16) + ITS_IVIM, create_dissector_handle( dissect_ivi_IviStructure_PDU, proto_its_ivim ));
|
||||
|
|
|
|||
Loading…
Reference in New Issue