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, 19 insertions, 19 deletions

diff --git a/epan/dissectors/packet-acse.c b/epan/dissectors/packet-acse.c
index 1a3fe9f58e..2a86dd0d7e 100644
--- a/epan/dissectors/packet-acse.c
+++ b/epan/dissectors/packet-acse.c
@@ -1826,7 +1826,7 @@ void proto_register_acse(void) {
         FT_UINT32, BASE_DEC, VALS(acse_T_encoding_vals), 0,
         NULL, HFILL }},
     { &hf_acse_single_ASN1_type,
-      { "single-ASN1-type", "acse.single_ASN1_type",
+      { "single-ASN1-type", "acse.single_ASN1_type_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_acse_octet_aligned,
@@ -1838,35 +1838,35 @@ void proto_register_acse(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_acse_aarq,
-      { "aarq", "acse.aarq",
+      { "aarq", "acse.aarq_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AARQ_apdu", HFILL }},
     { &hf_acse_aare,
-      { "aare", "acse.aare",
+      { "aare", "acse.aare_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AARE_apdu", HFILL }},
     { &hf_acse_rlrq,
-      { "rlrq", "acse.rlrq",
+      { "rlrq", "acse.rlrq_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RLRQ_apdu", HFILL }},
     { &hf_acse_rlre,
-      { "rlre", "acse.rlre",
+      { "rlre", "acse.rlre_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RLRE_apdu", HFILL }},
     { &hf_acse_abrt,
-      { "abrt", "acse.abrt",
+      { "abrt", "acse.abrt_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ABRT_apdu", HFILL }},
     { &hf_acse_adt,
-      { "adt", "acse.adt",
+      { "adt", "acse.adt_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "A_DT_apdu", HFILL }},
     { &hf_acse_acrq,
-      { "acrq", "acse.acrq",
+      { "acrq", "acse.acrq_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ACRQ_apdu", HFILL }},
     { &hf_acse_acrp,
-      { "acrp", "acse.acrp",
+      { "acrp", "acse.acrp_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ACRP_apdu", HFILL }},
     { &hf_acse_aARQ_protocol_version,
@@ -2082,7 +2082,7 @@ void proto_register_acse(void) {
         FT_OID, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_acse_ASOI_tag_item,
-      { "ASOI-tag item", "acse.ASOI_tag_item",
+      { "ASOI-tag item", "acse.ASOI_tag_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_acse_qualifier,
@@ -2106,7 +2106,7 @@ void proto_register_acse(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "Default_Context_List", HFILL }},
     { &hf_acse_Context_list_item,
-      { "Context-list item", "acse.Context_list_item",
+      { "Context-list item", "acse.Context_list_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_acse_pci,
@@ -2126,7 +2126,7 @@ void proto_register_acse(void) {
         FT_OID, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_acse_Default_Context_List_item,
-      { "Default-Context-List item", "acse.Default_Context_List_item",
+      { "Default-Context-List item", "acse.Default_Context_List_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_acse_abstract_syntax_name,
@@ -2138,7 +2138,7 @@ void proto_register_acse(void) {
         FT_OID, BASE_NONE, NULL, 0,
         "TransferSyntaxName", HFILL }},
     { &hf_acse_P_context_result_list_item,
-      { "P-context-result-list item", "acse.P_context_result_list_item",
+      { "P-context-result-list item", "acse.P_context_result_list_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_acse_pcontext_result,
@@ -2162,7 +2162,7 @@ void proto_register_acse(void) {
         FT_UINT32, BASE_DEC, VALS(acse_T_acse_service_provider_vals), 0,
         NULL, HFILL }},
     { &hf_acse_Association_data_item,
-      { "Association-data", "acse.EXTERNALt",
+      { "Association-data", "acse.EXTERNALt_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "EXTERNALt", HFILL }},
     { &hf_acse_simply_encoded_data,
@@ -2170,7 +2170,7 @@ void proto_register_acse(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_acse_fully_encoded_data,
-      { "fully-encoded-data", "acse.fully_encoded_data",
+      { "fully-encoded-data", "acse.fully_encoded_data_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PDV_list", HFILL }},
     { &hf_acse_presentation_context_identifier,
@@ -2182,7 +2182,7 @@ void proto_register_acse(void) {
         FT_UINT32, BASE_DEC, VALS(acse_T_presentation_data_values_vals), 0,
         NULL, HFILL }},
     { &hf_acse_simple_ASN1_type,
-      { "simple-ASN1-type", "acse.simple_ASN1_type",
+      { "simple-ASN1-type", "acse.simple_ASN1_type_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_acse_pDVList_octet_aligned,
@@ -2194,7 +2194,7 @@ void proto_register_acse(void) {
         FT_OID, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_acse_other_mechanism_value,
-      { "other-mechanism-value", "acse.other_mechanism_value",
+      { "other-mechanism-value", "acse.other_mechanism_value_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_acse_charstring,
@@ -2206,11 +2206,11 @@ void proto_register_acse(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_acse_external,
-      { "external", "acse.external",
+      { "external", "acse.external_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "EXTERNALt", HFILL }},
     { &hf_acse_other,
-      { "other", "acse.other",
+      { "other", "acse.other_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Authentication_value_other", HFILL }},
     { &hf_acse_T_AARQ_protocol_version_version1,