fix field attributes handling for tagged types

regenerate involved dissectors

svn path=/trunk/; revision=23783

5 files changed, 37 insertions, 37 deletions

diff --git a/epan/dissectors/packet-ftam.c b/epan/dissectors/packet-ftam.c
index 1a0e2e71d3..66b253a2c3 100644
--- a/epan/dissectors/packet-ftam.c
+++ b/epan/dissectors/packet-ftam.c
@@ -4950,7 +4950,7 @@ void proto_register_ftam(void) {
         "ftam.Shared_ASE_Information", HFILL }},
     { &hf_ftam_ftam_quality_of_Service,
       { "ftam-quality-of-Service", "ftam.ftam_quality_of_Service",
-        FT_INT32, BASE_DEC, NULL, 0,
+        FT_INT32, BASE_DEC, VALS(ftam_FTAM_Quality_of_Service_U_vals), 0,
         "ftam.FTAM_Quality_of_Service", HFILL }},
     { &hf_ftam_contents_type_list,
       { "contents-type-list", "ftam.contents_type_list",
@@ -4966,7 +4966,7 @@ void proto_register_ftam(void) {
         "ftam.Account", HFILL }},
     { &hf_ftam_filestore_password,
       { "filestore-password", "ftam.filestore_password",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_UINT32, BASE_DEC, VALS(ftam_Password_U_vals), 0,
         "ftam.Password", HFILL }},
     { &hf_ftam_checkpoint_window,
       { "checkpoint-window", "ftam.checkpoint_window",
@@ -4974,11 +4974,11 @@ void proto_register_ftam(void) {
         "ftam.INTEGER", HFILL }},
     { &hf_ftam_state_result,
       { "state-result", "ftam.state_result",
-        FT_INT32, BASE_DEC, NULL, 0,
+        FT_INT32, BASE_DEC, VALS(ftam_State_Result_U_vals), 0,
         "ftam.State_Result", HFILL }},
     { &hf_ftam_action_result,
       { "action-result", "ftam.action_result",
-        FT_INT32, BASE_DEC, NULL, 0,
+        FT_INT32, BASE_DEC, VALS(ftam_Action_Result_U_vals), 0,
         "ftam.Action_Result", HFILL }},
     { &hf_ftam_diagnostic,
       { "diagnostic", "ftam.diagnostic",
@@ -5138,7 +5138,7 @@ void proto_register_ftam(void) {
         "ftam.Create_Attributes", HFILL }},
     { &hf_ftam_create_password,
       { "create-password", "ftam.create_password",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_UINT32, BASE_DEC, VALS(ftam_Password_U_vals), 0,
         "ftam.Password", HFILL }},
     { &hf_ftam_attribute_names,
       { "attribute-names", "ftam.attribute_names",
@@ -5202,7 +5202,7 @@ void proto_register_ftam(void) {
         "ftam.Abstract_Syntax_Name", HFILL }},
     { &hf_ftam_degree_of_overlap,
       { "degree-of-overlap", "ftam.degree_of_overlap",
-        FT_INT32, BASE_DEC, NULL, 0,
+        FT_INT32, BASE_DEC, VALS(ftam_Degree_Of_Overlap_U_vals), 0,
         "ftam.Degree_Of_Overlap", HFILL }},
     { &hf_ftam_transfer_window,
       { "transfer-window", "ftam.transfer_window",
@@ -5262,11 +5262,11 @@ void proto_register_ftam(void) {
         "ftam.INTEGER", HFILL }},
     { &hf_ftam_file_access_data_unit_identity,
       { "file-access-data-unit-identity", "ftam.file_access_data_unit_identity",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_UINT32, BASE_DEC, VALS(ftam_FADU_Identity_U_vals), 0,
         "ftam.FADU_Identity", HFILL }},
     { &hf_ftam_fadu_lock,
       { "fadu-lock", "ftam.fadu_lock",
-        FT_INT32, BASE_DEC, NULL, 0,
+        FT_INT32, BASE_DEC, VALS(ftam_FADU_Lock_U_vals), 0,
         "ftam.FADU_Lock", HFILL }},
     { &hf_ftam_f_read_request,
       { "f-read-request", "ftam.f_read_request",
@@ -5318,7 +5318,7 @@ void proto_register_ftam(void) {
         "ftam.T_file_access_data_unit_Operation", HFILL }},
     { &hf_ftam_request_type,
       { "request-type", "ftam.request_type",
-        FT_INT32, BASE_DEC, NULL, 0,
+        FT_INT32, BASE_DEC, VALS(ftam_Request_Type_U_vals), 0,
         "ftam.Request_Type", HFILL }},
     { &hf_ftam_checkpoint_identifier,
       { "checkpoint-identifier", "ftam.checkpoint_identifier",
@@ -5334,35 +5334,35 @@ void proto_register_ftam(void) {
         "ftam.INTEGER", HFILL }},
     { &hf_ftam_read_password,
       { "read-password", "ftam.read_password",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_UINT32, BASE_DEC, VALS(ftam_Password_U_vals), 0,
         "ftam.Password", HFILL }},
     { &hf_ftam_insert_password,
       { "insert-password", "ftam.insert_password",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_UINT32, BASE_DEC, VALS(ftam_Password_U_vals), 0,
         "ftam.Password", HFILL }},
     { &hf_ftam_replace_password,
       { "replace-password", "ftam.replace_password",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_UINT32, BASE_DEC, VALS(ftam_Password_U_vals), 0,
         "ftam.Password", HFILL }},
     { &hf_ftam_extend_password,
       { "extend-password", "ftam.extend_password",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_UINT32, BASE_DEC, VALS(ftam_Password_U_vals), 0,
         "ftam.Password", HFILL }},
     { &hf_ftam_erase_password,
       { "erase-password", "ftam.erase_password",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_UINT32, BASE_DEC, VALS(ftam_Password_U_vals), 0,
         "ftam.Password", HFILL }},
     { &hf_ftam_read_attribute_password,
       { "read-attribute-password", "ftam.read_attribute_password",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_UINT32, BASE_DEC, VALS(ftam_Password_U_vals), 0,
         "ftam.Password", HFILL }},
     { &hf_ftam_change_attribute_password,
       { "change-attribute-password", "ftam.change_attribute_password",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_UINT32, BASE_DEC, VALS(ftam_Password_U_vals), 0,
         "ftam.Password", HFILL }},
     { &hf_ftam_delete_password,
       { "delete-password", "ftam.delete_password",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_UINT32, BASE_DEC, VALS(ftam_Password_U_vals), 0,
         "ftam.Password", HFILL }},
     { &hf_ftam_pass_passwords,
       { "pass-passwords", "ftam.pass_passwords",
@@ -5370,7 +5370,7 @@ void proto_register_ftam(void) {
         "ftam.Pass_Passwords", HFILL }},
     { &hf_ftam_link_password,
       { "link-password", "ftam.link_password",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_UINT32, BASE_DEC, VALS(ftam_Password_U_vals), 0,
         "ftam.Password", HFILL }},
     { &hf_ftam_pathname,
       { "pathname", "ftam.pathname",
@@ -5634,7 +5634,7 @@ void proto_register_ftam(void) {
         "ftam.Access_Passwords", HFILL }},
     { &hf_ftam_location,
       { "location", "ftam.location",
-        FT_NONE, BASE_NONE, NULL, 0,
+        FT_UINT32, BASE_DEC, VALS(acse_AE_title_vals), 0,
         "ftam.Application_Entity_Title", HFILL }},
     { &hf_ftam_read_key,
       { "read", "ftam.read",
@@ -5862,7 +5862,7 @@ void proto_register_ftam(void) {
         "ftam.BOOLEAN", HFILL }},
     { &hf_ftam_destination_file_directory,
       { "destination-file-directory", "ftam.destination_file_directory",
-        FT_NONE, BASE_NONE, NULL, 0,
+        FT_UINT32, BASE_DEC, VALS(ftam_Pathname_Attribute_vals), 0,
         "ftam.Destination_File_Directory", HFILL }},
     { &hf_ftam_attribute_value_asset_tions,
       { "attribute-value-asset-tions", "ftam.attribute_value_asset_tions",
@@ -5886,11 +5886,11 @@ void proto_register_ftam(void) {
         "ftam.INTEGER", HFILL }},
     { &hf_ftam_request_Operation_result,
       { "request-Operation-result", "ftam.request_Operation_result",
-        FT_INT32, BASE_DEC, NULL, 0,
+        FT_INT32, BASE_DEC, VALS(ftam_Request_Operation_Result_U_vals), 0,
         "ftam.Request_Operation_Result", HFILL }},
     { &hf_ftam_operation_result,
       { "operation-result", "ftam.operation_result",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_UINT32, BASE_DEC, VALS(ftam_Operation_Result_U_vals), 0,
         "ftam.Operation_Result", HFILL }},
     { &hf_ftam_error_action,
       { "error-action", "ftam.error_action",
@@ -6182,7 +6182,7 @@ void proto_register_ftam(void) {
         "ftam.GraphicString", HFILL }},
     { &hf_ftam_Pass_Passwords_item,
       { "Item", "ftam.Pass_Passwords_item",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_UINT32, BASE_DEC, VALS(ftam_Password_U_vals), 0,
         "ftam.Password", HFILL }},
     { &hf_ftam__untag_item_05,
       { "Item", "ftam._untag_item",
diff --git a/epan/dissectors/packet-ldap.c b/epan/dissectors/packet-ldap.c
index 01204f4708..0bb5e2eb74 100644
--- a/epan/dissectors/packet-ldap.c
+++ b/epan/dissectors/packet-ldap.c
@@ -4079,7 +4079,7 @@ void proto_register_ldap(void) {
         "ldap.AddResponse", HFILL }},
     { &hf_ldap_delRequest,
       { "delRequest", "ldap.delRequest",
-        FT_NONE, BASE_NONE, NULL, 0,
+        FT_STRING, BASE_NONE, NULL, 0,
         "ldap.DelRequest", HFILL }},
     { &hf_ldap_delResponse,
       { "delResponse", "ldap.delResponse",
@@ -4103,7 +4103,7 @@ void proto_register_ldap(void) {
         "ldap.CompareResponse", HFILL }},
     { &hf_ldap_abandonRequest,
       { "abandonRequest", "ldap.abandonRequest",
-        FT_NONE, BASE_NONE, NULL, 0,
+        FT_UINT32, BASE_DEC, NULL, 0,
         "ldap.AbandonRequest", HFILL }},
     { &hf_ldap_extendedReq,
       { "extendedReq", "ldap.extendedReq",
diff --git a/epan/dissectors/packet-q932.c b/epan/dissectors/packet-q932.c
index 4ca2363e11..22ce48c4ff 100644
--- a/epan/dissectors/packet-q932.c
+++ b/epan/dissectors/packet-q932.c
@@ -817,11 +817,11 @@ void proto_register_q932(void) {
         "q932.NetworkFacilityExtension", HFILL }},
     { &hf_q932_NetworkProtocolProfile_PDU,
       { "NetworkProtocolProfile", "q932.NetworkProtocolProfile",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_UINT32, BASE_DEC, VALS(q932_NetworkProtocolProfile_U_vals), 0,
         "q932.NetworkProtocolProfile", HFILL }},
     { &hf_q932_InterpretationComponent_PDU,
       { "InterpretationComponent", "q932.InterpretationComponent",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_UINT32, BASE_DEC, VALS(q932_InterpretationComponent_U_vals), 0,
         "q932.InterpretationComponent", HFILL }},
     { &hf_q932_presentationAlIowedAddress,
       { "presentationAlIowedAddress", "q932.presentationAlIowedAddress",
diff --git a/epan/dissectors/packet-tcap.c b/epan/dissectors/packet-tcap.c
index 2e4e829ec6..6a8e4318e2 100644
--- a/epan/dissectors/packet-tcap.c
+++ b/epan/dissectors/packet-tcap.c
@@ -2551,7 +2551,7 @@ proto_register_tcap(void)
         "tcap.AbortPDU", HFILL }},
     { &hf_tcap_dialoguePortion,
       { "dialoguePortion", "tcap.dialoguePortion",
-        FT_NONE, BASE_NONE, NULL, 0,
+        FT_BYTES, BASE_HEX, NULL, 0,
         "tcap.DialoguePortion", HFILL }},
     { &hf_tcap_components,
       { "components", "tcap.components",
@@ -2571,11 +2571,11 @@ proto_register_tcap(void)
         "tcap.Reason", HFILL }},
     { &hf_tcap_p_abortCause,
       { "p-abortCause", "tcap.p_abortCause",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_UINT32, BASE_DEC, VALS(tcap_P_AbortCause_U_vals), 0,
         "tcap.P_AbortCause", HFILL }},
     { &hf_tcap_u_abortCause,
       { "u-abortCause", "tcap.u_abortCause",
-        FT_NONE, BASE_NONE, NULL, 0,
+        FT_BYTES, BASE_HEX, NULL, 0,
         "tcap.DialoguePortion", HFILL }},
     { &hf_tcap__untag_item,
       { "Item", "tcap._untag_item",
@@ -2683,7 +2683,7 @@ proto_register_tcap(void)
         "tcap.T_causeInformation", HFILL }},
     { &hf_tcap_abortCause,
       { "abortCause", "tcap.abortCause",
-        FT_INT32, BASE_DEC, NULL, 0,
+        FT_INT32, BASE_DEC, VALS(tcap_P_Abort_cause_U_vals), 0,
         "tcap.P_Abort_cause", HFILL }},
     { &hf_tcap_userInformation,
       { "userInformation", "tcap.userInformation",
diff --git a/epan/dissectors/packet-x411.c b/epan/dissectors/packet-x411.c
index a1bfa075af..89001b6625 100644
--- a/epan/dissectors/packet-x411.c
+++ b/epan/dissectors/packet-x411.c
@@ -7366,7 +7366,7 @@ void proto_register_x411(void) {
         "x411.DeferredDeliveryTime", HFILL }},
     { &hf_x411_Priority_PDU,
       { "Priority", "x411.Priority",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_UINT32, BASE_DEC, VALS(x411_Priority_U_vals), 0,
         "x411.Priority", HFILL }},
     { &hf_x411_ContentLength_PDU,
       { "ContentLength", "x411.ContentLength",
@@ -7722,7 +7722,7 @@ void proto_register_x411(void) {
         "x411.ContentIdentifier", HFILL }},
     { &hf_x411_priority,
       { "priority", "x411.priority",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_UINT32, BASE_DEC, VALS(x411_Priority_U_vals), 0,
         "x411.Priority", HFILL }},
     { &hf_x411_per_message_indicators,
       { "per-message-indicators", "x411.per_message_indicators",
@@ -7850,7 +7850,7 @@ void proto_register_x411(void) {
         "x411.T_bilateral_domain", HFILL }},
     { &hf_x411_administration_domain_name,
       { "administration-domain-name", "x411.administration_domain_name",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_UINT32, BASE_DEC, VALS(x411_AdministrationDomainName_U_vals), 0,
         "x411.AdministrationDomainName", HFILL }},
     { &hf_x411_private_domain,
       { "private-domain", "x411.private_domain",
@@ -8130,7 +8130,7 @@ void proto_register_x411(void) {
         "x411.ContentLength", HFILL }},
     { &hf_x411_permissible_lowest_priority,
       { "permissible-lowest-priority", "x411.permissible_lowest_priority",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_UINT32, BASE_DEC, VALS(x411_Priority_U_vals), 0,
         "x411.Priority", HFILL }},
     { &hf_x411_permissible_content_types,
       { "permissible-content-types", "x411.permissible_content_types",
@@ -8262,7 +8262,7 @@ void proto_register_x411(void) {
         "x411.SET_OF_Priority", HFILL }},
     { &hf_x411_class_priority_item,
       { "Item", "x411.priority_item",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_UINT32, BASE_DEC, VALS(x411_Priority_U_vals), 0,
         "x411.Priority", HFILL }},
     { &hf_x411_objects,
       { "objects", "x411.objects",
@@ -8414,7 +8414,7 @@ void proto_register_x411(void) {
         "x411.ContentType", HFILL }},
     { &hf_x411_built_in,
       { "built-in", "x411.built_in",
-        FT_INT32, BASE_DEC, NULL, 0,
+        FT_INT32, BASE_DEC, VALS(x411_BuiltInContentType_U_vals), 0,
         "x411.BuiltInContentType", HFILL }},
     { &hf_x411_extended,
       { "extended", "x411.extended",