Postfix FT_NONE fields with "_element" string to reduce number of incompatible filters in ASN.1 dissectors

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2402

svn path=/trunk/; revision=49599

1 files changed, 20 insertions, 20 deletions

diff --git a/epan/dissectors/packet-pres.c b/epan/dissectors/packet-pres.c
index d95aaa1f12..ec1cbbb5da 100644
--- a/epan/dissectors/packet-pres.c
+++ b/epan/dissectors/packet-pres.c
@@ -1532,19 +1532,19 @@ void proto_register_pres(void) {
 /*--- Included file: packet-pres-hfarr.c ---*/
 #line 1 "../../asn1/pres/packet-pres-hfarr.c"
     { &hf_pres_UD_type_PDU,
-      { "UD-type", "pres.UD_type",
+      { "UD-type", "pres.UD_type_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pres_mode_selector,
-      { "mode-selector", "pres.mode_selector",
+      { "mode-selector", "pres.mode_selector_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pres_x410_mode_parameters,
-      { "x410-mode-parameters", "pres.x410_mode_parameters",
+      { "x410-mode-parameters", "pres.x410_mode_parameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RTORQapdu", HFILL }},
     { &hf_pres_normal_mode_parameters,
-      { "normal-mode-parameters", "pres.normal_mode_parameters",
+      { "normal-mode-parameters", "pres.normal_mode_parameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pres_protocol_version,
@@ -1564,7 +1564,7 @@ void proto_register_pres(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_pres_default_context_name,
-      { "default-context-name", "pres.default_context_name",
+      { "default-context-name", "pres.default_context_name_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pres_presentation_requirements,
@@ -1584,7 +1584,7 @@ void proto_register_pres(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         "Presentation_context_identifier", HFILL }},
     { &hf_pres_extensions,
-      { "extensions", "pres.extensions",
+      { "extensions", "pres.extensions_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pres_user_data,
@@ -1592,11 +1592,11 @@ void proto_register_pres(void) {
         FT_UINT32, BASE_DEC, VALS(pres_User_data_vals), 0,
         NULL, HFILL }},
     { &hf_pres_cPR_PPDU_x400_mode_parameters,
-      { "x410-mode-parameters", "pres.x410_mode_parameters",
+      { "x410-mode-parameters", "pres.x410_mode_parameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RTOACapdu", HFILL }},
     { &hf_pres_cPU_PPDU_normal_mode_parameters,
-      { "normal-mode-parameters", "pres.normal_mode_parameters",
+      { "normal-mode-parameters", "pres.normal_mode_parameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_CPA_PPDU_normal_mode_parameters", HFILL }},
     { &hf_pres_responding_presentation_selector,
@@ -1612,11 +1612,11 @@ void proto_register_pres(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         "Presentation_context_identifier", HFILL }},
     { &hf_pres_cPU_PPDU_x400_mode_parameters,
-      { "x400-mode-parameters", "pres.x400_mode_parameters",
+      { "x400-mode-parameters", "pres.x400_mode_parameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RTORJapdu", HFILL }},
     { &hf_pres_cPR_PPDU_normal_mode_parameters,
-      { "normal-mode-parameters", "pres.normal_mode_parameters",
+      { "normal-mode-parameters", "pres.normal_mode_parameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_CPR_PPDU_normal_mode_parameters", HFILL }},
     { &hf_pres_default_context_result,
@@ -1632,15 +1632,15 @@ void proto_register_pres(void) {
         FT_UINT32, BASE_DEC, VALS(pres_ARU_PPDU_vals), 0,
         NULL, HFILL }},
     { &hf_pres_arp_ppdu,
-      { "arp-ppdu", "pres.arp_ppdu",
+      { "arp-ppdu", "pres.arp_ppdu_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pres_aRU_PPDU_x400_mode_parameters,
-      { "x400-mode-parameters", "pres.x400_mode_parameters",
+      { "x400-mode-parameters", "pres.x400_mode_parameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RTABapdu", HFILL }},
     { &hf_pres_aRU_PPDU_normal_mode_parameters,
-      { "normal-mode-parameters", "pres.normal_mode_parameters",
+      { "normal-mode-parameters", "pres.normal_mode_parameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_ARU_PPDU_normal_mode_parameters", HFILL }},
     { &hf_pres_presentation_context_identifier_list,
@@ -1656,11 +1656,11 @@ void proto_register_pres(void) {
         FT_INT32, BASE_DEC, VALS(pres_Event_identifier_vals), 0,
         NULL, HFILL }},
     { &hf_pres_acPPDU,
-      { "acPPDU", "pres.acPPDU",
+      { "acPPDU", "pres.acPPDU_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AC_PPDU", HFILL }},
     { &hf_pres_acaPPDU,
-      { "acaPPDU", "pres.acaPPDU",
+      { "acaPPDU", "pres.acaPPDU_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ACA_PPDU", HFILL }},
     { &hf_pres_ttdPPDU,
@@ -1684,7 +1684,7 @@ void proto_register_pres(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_pres_Context_list_item,
-      { "Context-list item", "pres.Context_list_item",
+      { "Context-list item", "pres.Context_list_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pres_presentation_context_identifier,
@@ -1720,11 +1720,11 @@ void proto_register_pres(void) {
         FT_INT32, BASE_DEC, VALS(pres_Presentation_context_deletion_result_list_item_vals), 0,
         NULL, HFILL }},
     { &hf_pres_Presentation_context_identifier_list_item,
-      { "Presentation-context-identifier-list item", "pres.Presentation_context_identifier_list_item",
+      { "Presentation-context-identifier-list item", "pres.Presentation_context_identifier_list_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pres_Result_list_item,
-      { "Result-list item", "pres.Result_list_item",
+      { "Result-list item", "pres.Result_list_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pres_result,
@@ -1744,7 +1744,7 @@ void proto_register_pres(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_pres_Fully_encoded_data_item,
-      { "PDV-list", "pres.PDV_list",
+      { "PDV-list", "pres.PDV_list_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pres_presentation_data_values,
@@ -1752,7 +1752,7 @@ void proto_register_pres(void) {
         FT_UINT32, BASE_DEC, VALS(pres_T_presentation_data_values_vals), 0,
         NULL, HFILL }},
     { &hf_pres_single_ASN1_type,
-      { "single-ASN1-type", "pres.single_ASN1_type",
+      { "single-ASN1-type", "pres.single_ASN1_type_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_pres_octet_aligned,