Fixes GeoNetworking secured packets dissection

Secured packets contain Common and Extended header.

Change-Id: I60b5ed35811c19c9596bd142c1315b341d760968
Reviewed-on: https://code.wireshark.org/review/31238
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>

1 files changed, 5 insertions, 23 deletions

diff --git a/epan/dissectors/packet-its.c b/epan/dissectors/packet-its.c
index 6a6fdf943b..71cb5c3a1f 100644
--- a/epan/dissectors/packet-its.c
+++ b/epan/dissectors/packet-its.c
@@ -106,15 +106,6 @@
 #define ITS_WKP_CRL        2015
 #define ITS_WKP_CERTIF_REQ 2016
 
-// ETSI TS 102 965 (V1.3.1)
-#define AID_CA       36
-#define AID_DEN      37
-#define AID_TLM     137
-#define AID_RLT     138
-#define AID_IVI     139
-#define AID_TLC     140
-#define AID_GN_MGMT 141
-
 /*
  * Prototypes
  */
@@ -1270,7 +1261,7 @@ static int hf_evrsr_SupportedPaymentTypes_contract = -1;
 static int hf_evrsr_SupportedPaymentTypes_externalIdentification = -1;
 
 /*--- End of included file: packet-its-hf.c ---*/
-#line 156 "./asn1/its/packet-its-template.c"
+#line 147 "./asn1/its/packet-its-template.c"
 
 // CauseCode/SubCauseCode management
 static int hf_its_trafficConditionSubCauseCode = -1;
@@ -1712,7 +1703,7 @@ static gint ett_evrsr_RechargingType = -1;
 static gint ett_evrsr_SupportedPaymentTypes = -1;
 
 /*--- End of included file: packet-its-ett.c ---*/
-#line 186 "./asn1/its/packet-its-template.c"
+#line 177 "./asn1/its/packet-its-template.c"
 
 // Deal with cause/subcause code management
 struct { CauseCodeType_enum cause; int* hf; } cause_to_subcause[] = {
@@ -12815,7 +12806,7 @@ static int dissect_evrsr_EV_RSR_MessageBody_PDU(tvbuff_t *tvb _U_, packet_info *
 
 
 /*--- End of included file: packet-its-fn.c ---*/
-#line 228 "./asn1/its/packet-its-template.c"
+#line 219 "./asn1/its/packet-its-template.c"
 
 static int
 dissect_its_PDU(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data)
@@ -17144,7 +17135,7 @@ void proto_register_its(void)
         NULL, HFILL }},
 
 /*--- End of included file: packet-its-hfarr.c ---*/
-#line 264 "./asn1/its/packet-its-template.c"
+#line 255 "./asn1/its/packet-its-template.c"
 
     { &hf_its_roadworksSubCauseCode,
       { "roadworksSubCauseCode", "its.subCauseCode",
@@ -17658,7 +17649,7 @@ void proto_register_its(void)
     &ett_evrsr_SupportedPaymentTypes,
 
 /*--- End of included file: packet-its-ettarr.c ---*/
-#line 366 "./asn1/its/packet-its-template.c"
+#line 357 "./asn1/its/packet-its-template.c"
     };
 
     proto_its = proto_register_protocol("Intelligent Transport Systems", "ITS", "its");
@@ -17713,15 +17704,6 @@ void proto_reg_handoff_its(void)
         }
     }
 
-    dissector_add_uint("geonw.sec.v1.msg_type", ITS_DENM, its_handle_);
-    dissector_add_uint("geonw.sec.v1.msg_type", ITS_CAM, its_handle_);
-    dissector_add_uint("geonw.sec.v2.app_id", AID_DEN, its_handle_);
-    dissector_add_uint("geonw.sec.v2.app_id", AID_CA, its_handle_);
-    dissector_add_uint("geonw.sec.v2.app_id", AID_TLM, its_handle_);
-    dissector_add_uint("geonw.sec.v2.app_id", AID_RLT, its_handle_);
-    dissector_add_uint("geonw.sec.v2.app_id", AID_IVI, its_handle_);
-    dissector_add_uint("geonw.sec.v2.app_id", AID_TLC, its_handle_);
-
     dissector_add_uint("its.msg_id", ITS_DENM,              create_dissector_handle( dissect_denm_DecentralizedEnvironmentalNotificationMessage_PDU, proto_its_denm ));
     dissector_add_uint("its.msg_id", ITS_CAM,               create_dissector_handle( dissect_cam_CoopAwareness_PDU, proto_its_cam ));
     dissector_add_uint("its.msg_id", ITS_SPATEM,            create_dissector_handle( dissect_dsrc_SPAT_PDU, proto_its_spatem ));