Regenerate all asn2wrs generated dissectors.

svn path=/trunk/; revision=28379

1 files changed, 27 insertions, 27 deletions

diff --git a/epan/dissectors/packet-ftam.c b/epan/dissectors/packet-ftam.c
index 96a4157069..585b6ea9e6 100644
--- a/epan/dissectors/packet-ftam.c
+++ b/epan/dissectors/packet-ftam.c
@@ -1,7 +1,7 @@
 /* Do not modify this file.                                                   */
 /* It is created automatically by the ASN.1 to Wireshark dissector compiler   */
 /* packet-ftam.c                                                              */
-/* ../../tools/asn2wrs.py -b -p ftam -c ftam.cnf -s packet-ftam-template ISO8571-FTAM.asn */
+/* ../../tools/asn2wrs.py -b -p ftam -c ./ftam.cnf -s ./packet-ftam-template -D . ISO8571-FTAM.asn */
 
 /* Input file: packet-ftam-template.c */
 
@@ -4931,7 +4931,7 @@ void proto_register_ftam(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "ftam.Diagnostic", HFILL }},
     { &hf_ftam__untag_item,
-      { "_untag", "ftam._untag_item",
+      { "_untag item", "ftam._untag_item",
         FT_UINT32, BASE_DEC, VALS(ftam_Contents_Type_List_item_vals), 0,
         "ftam.Contents_Type_List_item", HFILL }},
     { &hf_ftam_document_type_name,
@@ -5135,7 +5135,7 @@ void proto_register_ftam(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "ftam.SET_OF_Abstract_Syntax_Name", HFILL }},
     { &hf_ftam_remove_contexts_item,
-      { "remove-contexts", "ftam.remove_contexts_item",
+      { "Abstract-Syntax-Name", "ftam.Abstract_Syntax_Name",
         FT_OID, BASE_NONE, NULL, 0,
         "ftam.Abstract_Syntax_Name", HFILL }},
     { &hf_ftam_define_contexts,
@@ -5143,7 +5143,7 @@ void proto_register_ftam(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "ftam.SET_OF_Abstract_Syntax_Name", HFILL }},
     { &hf_ftam_define_contexts_item,
-      { "define-contexts", "ftam.define_contexts_item",
+      { "Abstract-Syntax-Name", "ftam.Abstract_Syntax_Name",
         FT_OID, BASE_NONE, NULL, 0,
         "ftam.Abstract_Syntax_Name", HFILL }},
     { &hf_ftam_degree_of_overlap,
@@ -5355,7 +5355,7 @@ void proto_register_ftam(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "ftam.Attribute_Extensions", HFILL }},
     { &hf_ftam__untag_item_01,
-      { "_untag", "ftam._untag_item",
+      { "_untag item", "ftam._untag_item",
         FT_NONE, BASE_NONE, NULL, 0,
         "ftam.Charging_item", HFILL }},
     { &hf_ftam_resource_identifier,
@@ -5419,7 +5419,7 @@ void proto_register_ftam(void) {
         FT_UINT32, BASE_DEC, VALS(ftam_Access_Control_Attribute_vals), 0,
         "ftam.Access_Control_Attribute", HFILL }},
     { &hf_ftam__untag_item_02,
-      { "_untag", "ftam._untag_item",
+      { "_untag item", "ftam._untag_item",
         FT_NONE, BASE_NONE, NULL, 0,
         "ftam.Diagnostic_item", HFILL }},
     { &hf_ftam_diagnostic_type,
@@ -5467,7 +5467,7 @@ void proto_register_ftam(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "ftam.SEQUENCE_OF_Node_Name", HFILL }},
     { &hf_ftam_name_list_item,
-      { "name-list", "ftam.name_list_item",
+      { "Node-Name", "ftam.Node_Name",
         FT_NONE, BASE_NONE, NULL, 0,
         "ftam.Node_Name", HFILL }},
     { &hf_ftam_fadu_number,
@@ -5539,7 +5539,7 @@ void proto_register_ftam(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "ftam.SET_OF_Access_Control_Element", HFILL }},
     { &hf_ftam_actual_values3_item,
-      { "actual-values", "ftam.actual_values_item",
+      { "Access-Control-Element", "ftam.Access_Control_Element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ftam.Access_Control_Element", HFILL }},
     { &hf_ftam_actual_values1,
@@ -5551,7 +5551,7 @@ void proto_register_ftam(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "ftam.SET_OF_Access_Control_Element", HFILL }},
     { &hf_ftam_insert_values_item,
-      { "insert-values", "ftam.insert_values_item",
+      { "Access-Control-Element", "ftam.Access_Control_Element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ftam.Access_Control_Element", HFILL }},
     { &hf_ftam_delete_values,
@@ -5559,7 +5559,7 @@ void proto_register_ftam(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "ftam.SET_OF_Access_Control_Element", HFILL }},
     { &hf_ftam_delete_values_item,
-      { "delete-values", "ftam.delete_values_item",
+      { "Access-Control-Element", "ftam.Access_Control_Element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ftam.Access_Control_Element", HFILL }},
     { &hf_ftam_action_list,
@@ -5671,7 +5671,7 @@ void proto_register_ftam(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         "ftam.User_Identity", HFILL }},
     { &hf_ftam_Child_Objects_Attribute_item,
-      { "Child-Objects-Attribute", "ftam.Child_Objects_Attribute_item",
+      { "Child-Objects-Attribute item", "ftam.Child_Objects_Attribute_item",
         FT_STRING, BASE_NONE, NULL, 0,
         "ftam.GraphicString", HFILL }},
     { &hf_ftam_f_Change_prefix_request,
@@ -5863,7 +5863,7 @@ void proto_register_ftam(void) {
         FT_NONE, BASE_NONE, NULL, 0,
         "ftam.Read_Attributes", HFILL }},
     { &hf_ftam_Attribute_Extension_Names_item,
-      { "Attribute-Extension-Names", "ftam.Attribute_Extension_Names_item",
+      { "Attribute-Extension-Set-Name", "ftam.Attribute_Extension_Set_Name",
         FT_NONE, BASE_NONE, NULL, 0,
         "ftam.Attribute_Extension_Set_Name", HFILL }},
     { &hf_ftam_extension_set_identifier,
@@ -5875,11 +5875,11 @@ void proto_register_ftam(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "ftam.SEQUENCE_OF_Extension_Attribute_identifier", HFILL }},
     { &hf_ftam_extension_attribute_names_item,
-      { "extension-attribute-names", "ftam.extension_attribute_names_item",
+      { "Extension-Attribute-identifier", "ftam.Extension_Attribute_identifier",
         FT_OID, BASE_NONE, NULL, 0,
         "ftam.Extension_Attribute_identifier", HFILL }},
     { &hf_ftam_Attribute_Extensions_item,
-      { "Attribute-Extensions", "ftam.Attribute_Extensions_item",
+      { "Attribute-Extension-Set", "ftam.Attribute_Extension_Set",
         FT_NONE, BASE_NONE, NULL, 0,
         "ftam.Attribute_Extension_Set", HFILL }},
     { &hf_ftam_extension_set_attributes,
@@ -5887,7 +5887,7 @@ void proto_register_ftam(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "ftam.SEQUENCE_OF_Extension_Attribute", HFILL }},
     { &hf_ftam_extension_set_attributes_item,
-      { "extension-set-attributes", "ftam.extension_set_attributes_item",
+      { "Extension-Attribute", "ftam.Extension_Attribute",
         FT_NONE, BASE_NONE, NULL, 0,
         "ftam.Extension_Attribute", HFILL }},
     { &hf_ftam_extension_attribute_identifier,
@@ -5899,7 +5899,7 @@ void proto_register_ftam(void) {
         FT_NONE, BASE_NONE, NULL, 0,
         "ftam.T_extension_attribute", HFILL }},
     { &hf_ftam__untag_item_03,
-      { "_untag", "ftam._untag_item",
+      { "_untag item", "ftam._untag_item",
         FT_NONE, BASE_NONE, NULL, 0,
         "ftam.T__untag_item", HFILL }},
     { &hf_ftam_root_directory,
@@ -5911,11 +5911,11 @@ void proto_register_ftam(void) {
         FT_INT32, BASE_DEC, VALS(ftam_T_retrieval_scope_vals), 0,
         "ftam.T_retrieval_scope", HFILL }},
     { &hf_ftam_OR_Set_item,
-      { "OR-Set", "ftam.OR_Set_item",
+      { "AND-Set", "ftam.AND_Set",
         FT_UINT32, BASE_DEC, NULL, 0,
         "ftam.AND_Set", HFILL }},
     { &hf_ftam_AND_Set_item,
-      { "AND-Set", "ftam.AND_Set_item",
+      { "AND-Set item", "ftam.AND_Set_item",
         FT_UINT32, BASE_DEC, VALS(ftam_AND_Set_item_vals), 0,
         "ftam.AND_Set_item", HFILL }},
     { &hf_ftam_pathname_Pattern,
@@ -6011,7 +6011,7 @@ void proto_register_ftam(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "ftam.T_pathname_value", HFILL }},
     { &hf_ftam_pathname_value_item,
-      { "pathname-value", "ftam.pathname_value_item",
+      { "pathname-value item", "ftam.pathname_value_item",
         FT_UINT32, BASE_DEC, VALS(ftam_T_pathname_value_item_vals), 0,
         "ftam.T_pathname_value_item", HFILL }},
     { &hf_ftam_string_match,
@@ -6027,7 +6027,7 @@ void proto_register_ftam(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "ftam.T_string_value", HFILL }},
     { &hf_ftam_string_value_item,
-      { "string-value", "ftam.string_value_item",
+      { "string-value item", "ftam.string_value_item",
         FT_UINT32, BASE_DEC, VALS(ftam_T_string_value_item_vals), 0,
         "ftam.T_string_value_item", HFILL }},
     { &hf_ftam_substring_match,
@@ -6087,7 +6087,7 @@ void proto_register_ftam(void) {
         FT_NONE, BASE_NONE, NULL, 0,
         "ftam.Object_Identifier_Pattern", HFILL }},
     { &hf_ftam_Attribute_Extensions_Pattern_item,
-      { "Attribute-Extensions-Pattern", "ftam.Attribute_Extensions_Pattern_item",
+      { "Attribute-Extensions-Pattern item", "ftam.Attribute_Extensions_Pattern_item",
         FT_NONE, BASE_NONE, NULL, 0,
         "ftam.Attribute_Extensions_Pattern_item", HFILL }},
     { &hf_ftam_extension_set_attribute_Patterns,
@@ -6095,7 +6095,7 @@ void proto_register_ftam(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "ftam.T_extension_set_attribute_Patterns", HFILL }},
     { &hf_ftam_extension_set_attribute_Patterns_item,
-      { "extension-set-attribute-Patterns", "ftam.extension_set_attribute_Patterns_item",
+      { "extension-set-attribute-Patterns item", "ftam.extension_set_attribute_Patterns_item",
         FT_NONE, BASE_NONE, NULL, 0,
         "ftam.T_extension_set_attribute_Patterns_item", HFILL }},
     { &hf_ftam_attribute_extension_attribute_identifier,
@@ -6107,7 +6107,7 @@ void proto_register_ftam(void) {
         FT_NONE, BASE_NONE, NULL, 0,
         "ftam.T_extension_attribute_Pattern", HFILL }},
     { &hf_ftam__untag_item_04,
-      { "_untag", "ftam._untag_item",
+      { "Read-Attributes", "ftam.Read_Attributes",
         FT_NONE, BASE_NONE, NULL, 0,
         "ftam.Read_Attributes", HFILL }},
     { &hf_ftam_success_Object_count,
@@ -6119,19 +6119,19 @@ void proto_register_ftam(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "ftam.SEQUENCE_OF_Pathname", HFILL }},
     { &hf_ftam_success_Object_names_item,
-      { "success-Object-names", "ftam.success_Object_names_item",
+      { "Pathname", "ftam.Pathname",
         FT_UINT32, BASE_DEC, NULL, 0,
         "ftam.Pathname", HFILL }},
     { &hf_ftam_Pathname_item,
-      { "Pathname", "ftam.Pathname_item",
+      { "Pathname item", "ftam.Pathname_item",
         FT_STRING, BASE_NONE, NULL, 0,
         "ftam.GraphicString", HFILL }},
     { &hf_ftam_Pass_Passwords_item,
-      { "Pass-Passwords", "ftam.Pass_Passwords_item",
+      { "Password", "ftam.Password",
         FT_UINT32, BASE_DEC, VALS(ftam_Password_U_vals), 0,
         "ftam.Password", HFILL }},
     { &hf_ftam__untag_item_05,
-      { "_untag", "ftam._untag_item",
+      { "_untag item", "ftam._untag_item",
         FT_NONE, BASE_NONE, NULL, 0,
         "ftam.Path_Access_Passwords_item", HFILL }},
     { &hf_ftam_ap,