Regenerate dissector with -X and -T directives.

svn path=/trunk/; revision=21895

4 files changed, 15 insertions, 636 deletions

diff --git a/asn1/ftam/Makefile b/asn1/ftam/Makefile
index 59a2464ec8..33e6611e3f 100644
--- a/asn1/ftam/Makefile
+++ b/asn1/ftam/Makefile
@@ -7,7 +7,7 @@ all: generate_dissector
 generate_dissector: $(DISSECTOR_FILES)
 
 $(DISSECTOR_FILES): ../../tools/asn2wrs.py ISO8571-FTAM.asn packet-ftam-template.c packet-ftam-template.h ftam.cnf
-	python ../../tools/asn2wrs.py -b -e -p ftam -c ftam.cnf -s packet-ftam-template ISO8571-FTAM.asn
+	python ../../tools/asn2wrs.py -b -X -T -e -p ftam -c ftam.cnf -s packet-ftam-template ISO8571-FTAM.asn
 
 clean:
 	rm -f parsetab.py $(DISSECTOR_FILES)
diff --git a/asn1/ftam/Makefile.nmake b/asn1/ftam/Makefile.nmake
index a321302916..052901c4f4 100644
--- a/asn1/ftam/Makefile.nmake
+++ b/asn1/ftam/Makefile.nmake
@@ -15,7 +15,7 @@ generate_dissector: $(DISSECTOR_FILES)
 
 $(DISSECTOR_FILES): ../../tools/asn2wrs.py ISO8571-FTAM.asn packet-$(PROTOCOL_NAME)-template.c packet-$(PROTOCOL_NAME)-template.h $(PROTOCOL_NAME).cnf
 !IFDEF PYTHON
-	$(PYTHON) "../../tools/asn2wrs.py" -b -e -p $(PROTOCOL_NAME) -c $(PROTOCOL_NAME).cnf -s packet-$(PROTOCOL_NAME)-template ISO8571-FTAM.asn
+	$(PYTHON) "../../tools/asn2wrs.py" -b -X -T -e -p $(PROTOCOL_NAME) -c $(PROTOCOL_NAME).cnf -s packet-$(PROTOCOL_NAME)-template ISO8571-FTAM.asn
 !ELSE
 	@echo Error: You need Python to use asn2wrs.py
 	@exit 1
diff --git a/asn1/ftam/ftam-exp.cnf b/asn1/ftam/ftam-exp.cnf
index bcf2635805..1a6defe412 100644
--- a/asn1/ftam/ftam-exp.cnf
+++ b/asn1/ftam/ftam-exp.cnf
@@ -1,7 +1,7 @@
 # Do not modify this file.
 # It is created automatically by the ASN.1 to Wireshark dissector compiler
 # .\ftam-exp.cnf
-# ../../tools/asn2wrs.py -b -e -p ftam -c ftam.cnf -s packet-ftam-template ISO8571-FTAM.asn
+# ../../tools/asn2wrs.py -b -X -T -e -p ftam -c ftam.cnf -s packet-ftam-template ISO8571-FTAM.asn
 
 #.MODULE
 ISO8571-FTAM  ftam
diff --git a/asn1/ftam/ftam.cnf b/asn1/ftam/ftam.cnf
index 8b1d47f3e6..f065d72694 100644
--- a/asn1/ftam/ftam.cnf
+++ b/asn1/ftam/ftam.cnf
@@ -25,35 +25,32 @@ F-OPEN-request/recovery-mode	T_request_recovery_mode
 F-OPEN-response/recovery-mode	T_response_recovery_mode
 Access-Control-Change-Attribute/actual-values	T_actual_values1
 
+Contents-Type-List/_untag/_item Contents_Type_List_item
+Charging/_untag/_item Charging_item
+Diagnostic/_untag/_item Diagnostic_item
+Scope/_untag/_item Scope_item
+Path-Access-Passwords/_untag/_item Path_Access_Passwords_item
+
 #.FIELD_RENAME
 F-OPEN-request/recovery-mode	request_recovery_mode
 F-OPEN-response/recovery-mode	response_recovery_mode
-Concurrency-Control/replace	replace_lock
 Concurrency-Access/replace	replace_key
-Concurrency-Control/read-attribute	read_attribute_lock
 Concurrency-Access/read-attribute	read_attribute_key
-Concurrency-Control/read	read_lock
 Concurrency-Access/read		read_key
-Concurrency-Control/insert	insert_lock
 Concurrency-Access/insert	insert_key
-Concurrency-Control/extend	extend_lock
 Concurrency-Access/extend	extend_key
-Concurrency-Control/erase	erase_lock
 Concurrency-Access/erase	erase_key
-Concurrency-Control/change-attribute	change_attribute_lock
 Concurrency-Access/change-attribute	change_attribute_key
-Concurrency-Control/delete-Object	delete_Object_lock
 Concurrency-Access/delete-Object	delete_Object_key
 F-READ-request/access-context		read_access_context
-Change-Attributes/path-access-control	change_path_access_control
-Create-Attributes/path-access-control	create_path_access_control
+Change-Attributes/_untag/path-access-control	change_path_access_control
 Attribute-Extensions-Pattern/_item/extension-set-attribute-Patterns/_item/extension-attribute-identifier	attribute_extension_attribute_identifier
 F-OPEN-request/contents-type		open_contents_type
 F-READ-ATTRIB-response/attributes	read_attributes
 F-READ-LINK-ATTRIB-response/attributes	read_link_attributes
 F-SELECT-request/attributes		select_attributes
 F-SELECT-response/attributes		select_attributes
-Change-Attributes/access-control	change_attributes_access_control
+Change-Attributes/_untag/access-control	change_attributes_access_control
 Access-Control-Change-Attribute/actual-values	actual_values1
 Account-Attribute/actual-values	actual_values2
 Access-Control-Attribute/actual-values	actual_values3
@@ -84,616 +81,7 @@ Legal-Qualification-Attribute/actual-values	actual_values9
 #.FN_BODY AE-qualifier
 	/* XXX have no idea about this one */
 
-#.FN_BODY Implementation-Information
- gint8 class;
- gboolean pc, ind_field;
- gint32 tag;
- guint32 len1;
-
- if(!implicit_tag){
-   /* XXX  asn2wrs can not yet handle tagged assignment yes so this
-    * XXX is some conformance file magic to work around that bug
-    */
-    offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
-    offset = get_ber_length(tree, tvb, offset, &len1, &ind_field);
- }
-  offset = dissect_ber_restricted_string(TRUE, 1,
-                                         actx, tree, tvb, offset, hf_index,
-                                         NULL);
-
-#.FN_BODY Protocol-Version
- gint8 class;
- gboolean pc, ind_field;
- gint32 tag;
- guint32 len1;
-
- if(!implicit_tag){
-   /* XXX  asn2wrs can not yet handle tagged assignment yes so this
-    * XXX is some conformance file magic to work around that bug
-    */
-    offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
-    offset = get_ber_length(tree, tvb, offset, &len1, &ind_field);
- }
-  offset = dissect_ber_bitstring(TRUE, actx, tree, tvb, offset,
-                                 Protocol_Version_bits, hf_index, ett_ftam_Protocol_Version,
-                                 NULL);
-
-#.FN_BODY Service-Class
- gint8 class;
- gboolean pc, ind_field;
- gint32 tag;
- guint32 len1;
-
- if(!implicit_tag){
-   /* XXX  asn2wrs can not yet handle tagged assignment yes so this
-    * XXX is some conformance file magic to work around that bug
-    */
-    offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
-    offset = get_ber_length(tree, tvb, offset, &len1, &ind_field);
- }
-  offset = dissect_ber_bitstring(TRUE, actx, tree, tvb, offset,
-                                 Service_Class_bits, hf_index, ett_ftam_Service_Class,
-                                 NULL);
-
-#.FN_BODY Functional-Units
- gint8 class;
- gboolean pc, ind_field;
- gint32 tag;
- guint32 len1;
-
- if(!implicit_tag){
-   /* XXX  asn2wrs can not yet handle tagged assignment yes so this
-    * XXX is some conformance file magic to work around that bug
-    */
-    offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
-    offset = get_ber_length(tree, tvb, offset, &len1, &ind_field);
- }
-  offset = dissect_ber_bitstring(TRUE, actx, tree, tvb, offset,
-                                 Functional_Units_bits, hf_index, ett_ftam_Functional_Units,
-                                 NULL);
-
-
-#.FN_BODY Attribute-Groups
- gint8 class;
- gboolean pc, ind_field;
- gint32 tag;
- guint32 len1;
-
- if(!implicit_tag){
-   /* XXX  asn2wrs can not yet handle tagged assignment yes so this
-    * XXX is some conformance file magic to work around that bug
-    */
-    offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
-    offset = get_ber_length(tree, tvb, offset, &len1, &ind_field);
- }
-  offset = dissect_ber_bitstring(TRUE, actx, tree, tvb, offset,
-                                 Attribute_Groups_bits, hf_index, ett_ftam_Attribute_Groups,
-                                 NULL);
-
-
-#.FN_BODY FTAM-Quality-of-Service
- gint8 class;
- gboolean pc, ind_field;
- gint32 tag;
- guint32 len1;
-
- if(!implicit_tag){
-   /* XXX  asn2wrs can not yet handle tagged assignment yes so this
-    * XXX is some conformance file magic to work around that bug
-    */
-    offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
-    offset = get_ber_length(tree, tvb, offset, &len1, &ind_field);
- }
-  offset = dissect_ber_integer(TRUE, actx, tree, tvb, offset, hf_index,
-                                  NULL);
-
-#.FN_BODY Contents-Type-List
- gint8 class;
- gboolean pc, ind_field;
- gint32 tag;
- guint32 len1;
-
- if(!implicit_tag){
-   /* XXX  asn2wrs can not yet handle tagged assignment yes so this
-    * XXX is some conformance file magic to work around that bug
-    */
-    offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
-    offset = get_ber_length(tree, tvb, offset, &len1, &ind_field);
- }
-  offset = dissect_ber_old_sequence_of(TRUE,  actx, tree, tvb, offset,
-                                   Contents_Type_List_sequence_of, hf_index, ett_ftam_Contents_Type_List);
-
-
-#.FN_BODY Degree-Of-Overlap
- gint8 class;
- gboolean pc, ind_field;
- gint32 tag;
- guint32 len1;
-
- if(!implicit_tag){
-   /* XXX  asn2wrs can not yet handle tagged assignment yes so this
-    * XXX is some conformance file magic to work around that bug
-    */
-    offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
-    offset = get_ber_length(tree, tvb, offset, &len1, &ind_field);
- }
-  offset = dissect_ber_integer(TRUE, actx, tree, tvb, offset, hf_index,
-                                  NULL);
-
-#.FN_BODY Request-Type
- gint8 class;
- gboolean pc, ind_field;
- gint32 tag;
- guint32 len1;
-
- if(!implicit_tag){
-   /* XXX  asn2wrs can not yet handle tagged assignment yes so this
-    * XXX is some conformance file magic to work around that bug
-    */
-    offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
-    offset = get_ber_length(tree, tvb, offset, &len1, &ind_field);
- }
-  offset = dissect_ber_integer(TRUE, actx, tree, tvb, offset, hf_index,
-                                  NULL);
-
-#.FN_BODY Abstract-Syntax-Name
- gint8 class;
- gboolean pc, ind_field;
- gint32 tag;
- guint32 len1;
-
- if(!implicit_tag){
-   /* XXX  asn2wrs can not yet handle tagged assignment yes so this
-    * XXX is some conformance file magic to work around that bug
-    */
-    offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
-    offset = get_ber_length(tree, tvb, offset, &len1, &ind_field);
- }
-  offset = dissect_ber_object_identifier(TRUE, actx, tree, tvb, offset, hf_index,
-                                            NULL);
-
-
-#.FN_BODY Access-Context
- gint8 class;
- gboolean pc, ind_field;
- gint32 tag;
- guint32 len1;
-
- if(!implicit_tag){
-   /* XXX  asn2wrs can not yet handle tagged assignment yes so this
-    * XXX is some conformance file magic to work around that bug
-    */
-    offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
-    offset = get_ber_length(tree, tvb, offset, &len1, &ind_field);
- }
-  offset = dissect_ber_old_sequence(TRUE, actx, tree, tvb, offset,
-                                Access_Context_sequence, hf_index, ett_ftam_Access_Context);
-
-#.FN_BODY Access-Passwords
- gint8 class;
- gboolean pc, ind_field;
- gint32 tag;
- guint32 len1;
-
- if(!implicit_tag){
-   /* XXX  asn2wrs can not yet handle tagged assignment yes so this
-    * XXX is some conformance file magic to work around that bug
-    */
-    offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
-    offset = get_ber_length(tree, tvb, offset, &len1, &ind_field);
- }
-  offset = dissect_ber_old_sequence(TRUE, actx, tree, tvb, offset,
-                                Access_Passwords_sequence, hf_index, ett_ftam_Access_Passwords);
-
-#.FN_BODY Access-Request
- gint8 class;
- gboolean pc, ind_field;
- gint32 tag;
- guint32 len1;
-
-   if(!implicit_tag){
-     /* XXX  asn2wrs can not yet handle tagged assignment yes so this
-      * XXX is some conformance file magic to work around that bug
-      */
-      offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
-      offset = get_ber_length(tree, tvb, offset, &len1, &ind_field);
-  }
-  offset = dissect_ber_bitstring(TRUE, actx, tree, tvb, offset,
-                                 Access_Request_bits, hf_index, ett_ftam_Access_Request,
-                                 NULL);
-#.FN_BODY Account
- gint8 class;
- gboolean pc, ind_field;
- gint32 tag;
- guint32 len1;
-
- if(!implicit_tag){
-   /* XXX  asn2wrs can not yet handle tagged assignment yes so this
-    * XXX is some conformance file magic to work around that bug
-    */
-    offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
-    offset = get_ber_length(tree, tvb, offset, &len1, &ind_field);
- }
-  offset = dissect_ber_restricted_string(TRUE, 4,
-                                         actx, tree, tvb, offset, hf_index,
-                                         NULL);
-#.FN_BODY Action-Result
- gint8 class;
- gboolean pc, ind_field;
- gint32 tag;
- guint32 len1;
-
- if(!implicit_tag){
-   /* XXX  asn2wrs can not yet handle tagged assignment yes so this
-    * XXX is some conformance file magic to work around that bug
-    */
-    offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
-    offset = get_ber_length(tree, tvb, offset, &len1, &ind_field);
- }
-  offset = dissect_ber_integer(TRUE, actx, tree, tvb, offset, hf_index,
-                                  NULL);
-
-
-#.FN_BODY Activity-Identifier
- gint8 class;
- gboolean pc, ind_field;
- gint32 tag;
- guint32 len1;
-
- if(!implicit_tag){
-   /* XXX  asn2wrs can not yet handle tagged assignment yes so this
-    * XXX is some conformance file magic to work around that bug
-    */
-    offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
-    offset = get_ber_length(tree, tvb, offset, &len1, &ind_field);
- }
-  offset = dissect_ber_integer(TRUE, actx, tree, tvb, offset, hf_index,
-                                  NULL);
-
-#.FN_BODY Change-Attributes
- gint8 class;
- gboolean pc, ind_field;
- gint32 tag;
- guint32 len1;
-
- if(!implicit_tag){
-   /* XXX  asn2wrs can not yet handle tagged assignment yes so this
-    * XXX is some conformance file magic to work around that bug
-    */
-    offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
-    offset = get_ber_length(tree, tvb, offset, &len1, &ind_field);
- }
-  offset = dissect_ber_old_sequence(TRUE, actx, tree, tvb, offset,
-                                Change_Attributes_sequence, hf_index, ett_ftam_Change_Attributes);
-
-
-#.FN_BODY Charging
- gint8 class;
- gboolean pc, ind_field;
- gint32 tag;
- guint32 len1;
-
- if(!implicit_tag){
-   /* XXX  asn2wrs can not yet handle tagged assignment yes so this
-    * XXX is some conformance file magic to work around that bug
-    */
-    offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
-    offset = get_ber_length(tree, tvb, offset, &len1, &ind_field);
- }
-  offset = dissect_ber_old_sequence_of(TRUE,  actx, tree, tvb, offset,
-                                   Charging_sequence_of, hf_index, ett_ftam_Charging);
-
-
-#.FN_BODY Concurrency-Control
- gint8 class;
- gboolean pc, ind_field;
- gint32 tag;
- guint32 len1;
-
- if(!implicit_tag){
-   /* XXX  asn2wrs can not yet handle tagged assignment yes so this
-    * XXX is some conformance file magic to work around that bug
-    */
-    offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
-    offset = get_ber_length(tree, tvb, offset, &len1, &ind_field);
- }
-  offset = dissect_ber_old_sequence(TRUE, actx, tree, tvb, offset,
-                                Concurrency_Control_sequence, hf_index, ett_ftam_Concurrency_Control);
-
-
-#.FN_BODY Constraint-Set-Name
- gint8 class;
- gboolean pc, ind_field;
- gint32 tag;
- guint32 len1;
-
- if(!implicit_tag){
-   /* XXX  asn2wrs can not yet handle tagged assignment yes so this
-    * XXX is some conformance file magic to work around that bug
-    */
-    offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
-    offset = get_ber_length(tree, tvb, offset, &len1, &ind_field);
- }
-  offset = dissect_ber_object_identifier(TRUE, actx, tree, tvb, offset, hf_index,
-                                            NULL);
-
-#.FN_BODY Create-Attributes
- gint8 class;
- gboolean pc, ind_field;
- gint32 tag;
- guint32 len1;
-
- if(!implicit_tag){
-   /* XXX  asn2wrs can not yet handle tagged assignment yes so this
-    * XXX is some conformance file magic to work around that bug
-    */
-    offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
-    offset = get_ber_length(tree, tvb, offset, &len1, &ind_field);
- }
-  offset = dissect_ber_old_sequence(TRUE, actx, tree, tvb, offset,
-                                Create_Attributes_sequence, hf_index, ett_ftam_Create_Attributes);
-
-#.FN_BODY Diagnostic
- gint8 class;
- gboolean pc, ind_field;
- gint32 tag;
- guint32 len1;
-
- if(!implicit_tag){
-   /* XXX  asn2wrs can not yet handle tagged assignment yes so this
-    * XXX is some conformance file magic to work around that bug
-    */
-    offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
-    offset = get_ber_length(tree, tvb, offset, &len1, &ind_field);
- }
-  offset = dissect_ber_old_sequence_of(TRUE,  actx, tree, tvb, offset,
-                                   Diagnostic_sequence_of, hf_index, ett_ftam_Diagnostic);
-
-
-#.FN_PARS Document-Type-Name  FN_VARIANT = _str  VAL_PTR = &object_identifier_id
- 
-#.FN_BODY FADU-Lock
- gint8 class;
- gboolean pc, ind_field;
- gint32 tag;
- guint32 len1;
-
- if(!implicit_tag){
-   /* XXX  asn2wrs can not yet handle tagged assignment yes so this
-    * XXX is some conformance file magic to work around that bug
-    */
-    offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
-    offset = get_ber_length(tree, tvb, offset, &len1, &ind_field);
- }
-  offset = dissect_ber_integer(TRUE, actx, tree, tvb, offset, hf_index,
-                                  NULL);
-
-#.FN_BODY Read-Attributes
- gint8 class;
- gboolean pc, ind_field;
- gint32 tag;
- guint32 len1;
-
- if(!implicit_tag){
-   /* XXX  asn2wrs can not yet handle tagged assignment yes so this
-    * XXX is some conformance file magic to work around that bug
-    */
-    offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
-    offset = get_ber_length(tree, tvb, offset, &len1, &ind_field);
- }
-  offset = dissect_ber_old_sequence(TRUE, actx, tree, tvb, offset,
-                                Read_Attributes_sequence, hf_index, ett_ftam_Read_Attributes);
-
-#.FN_BODY Select-Attributes
- gint8 class;
- gboolean pc, ind_field;
- gint32 tag;
- guint32 len1;
-
- if(!implicit_tag){
-   /* XXX  asn2wrs can not yet handle tagged assignment yes so this
-    * XXX is some conformance file magic to work around that bug
-    */
-    offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
-    offset = get_ber_length(tree, tvb, offset, &len1, &ind_field);
- }
-  offset = dissect_ber_old_sequence(TRUE, actx, tree, tvb, offset,
-                                Select_Attributes_sequence, hf_index, ett_ftam_Select_Attributes);
-
-#.FN_BODY State-Result
- gint8 class;
- gboolean pc, ind_field;
- gint32 tag;
- guint32 len1;
-
- if(!implicit_tag){
-   /* XXX  asn2wrs can not yet handle tagged assignment yes so this
-    * XXX is some conformance file magic to work around that bug
-    */
-    offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
-    offset = get_ber_length(tree, tvb, offset, &len1, &ind_field);
- }
-  offset = dissect_ber_integer(TRUE, actx, tree, tvb, offset, hf_index,
-                                  NULL);
-
-#.FN_BODY User-Identity
- gint8 class;
- gboolean pc, ind_field;
- gint32 tag;
- guint32 len1;
-
- if(!implicit_tag){
-   /* XXX  asn2wrs can not yet handle tagged assignment yes so this
-    * XXX is some conformance file magic to work around that bug
-    */
-    offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
-    offset = get_ber_length(tree, tvb, offset, &len1, &ind_field);
- }
-  offset = dissect_ber_restricted_string(TRUE, 22,
-                                         actx, tree, tvb, offset, hf_index,
-                                         NULL);
-#.FN_BODY Scope
- gint8 class;
- gboolean pc, ind_field;
- gint32 tag;
- guint32 len1;
-
- if(!implicit_tag){
-   /* XXX  asn2wrs can not yet handle tagged assignment yes so this
-    * XXX is some conformance file magic to work around that bug
-    */
-    offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
-    offset = get_ber_length(tree, tvb, offset, &len1, &ind_field);
- }
-  offset = dissect_ber_old_sequence_of(TRUE,  actx, tree, tvb, offset,
-                                   Scope_sequence_of, hf_index, ett_ftam_Scope);
-
-#.FN_BODY Objects-Attributes-List
- gint8 class;
- gboolean pc, ind_field;
- gint32 tag;
- guint32 len1;
-
- if(!implicit_tag){
-   /* XXX  asn2wrs can not yet handle tagged assignment yes so this
-    * XXX is some conformance file magic to work around that bug
-    */
-    offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
-    offset = get_ber_length(tree, tvb, offset, &len1, &ind_field);
- }
-  offset = dissect_ber_old_sequence_of(TRUE,  actx, tree, tvb, offset,
-                                   Objects_Attributes_List_sequence_of, hf_index, ett_ftam_Objects_Attributes_List);
-
-
-#.FN_BODY Path-Access-Passwords
- gint8 class;
- gboolean pc, ind_field;
- gint32 tag;
- guint32 len1;
-
- if(!implicit_tag){
-   /* XXX  asn2wrs can not yet handle tagged assignment yes so this
-    * XXX is some conformance file magic to work around that bug
-    */
-    offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
-    offset = get_ber_length(tree, tvb, offset, &len1, &ind_field);
- }
-  offset = dissect_ber_old_sequence_of(TRUE,  actx, tree, tvb, offset,
-                                   Path_Access_Passwords_sequence_of, hf_index, ett_ftam_Path_Access_Passwords);
-
-#.FN_BODY Request-Operation-Result
- gint8 class;
- gboolean pc, ind_field;
- gint32 tag;
- guint32 len1;
-
- if(!implicit_tag){
-   /* XXX  asn2wrs can not yet handle tagged assignment yes so this
-    * XXX is some conformance file magic to work around that bug
-    */
-    offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
-    offset = get_ber_length(tree, tvb, offset, &len1, &ind_field);
- }
-  offset = dissect_ber_integer(TRUE, actx, tree, tvb, offset, hf_index,
-                                  NULL);
-
-#.FN_BODY Shared-ASE-Informatio
- gint8 class;
- gboolean pc, ind_field;
- gint32 tag;
- guint32 len1;
-
- if(!implicit_tag){
-   /* XXX  asn2wrs can not yet handle tagged assignment yes so this
-    * XXX is some conformance file magic to work around that bug
-    */
-    offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
-    offset = get_ber_length(tree, tvb, offset, &len1, &ind_field);
- }
-  offset = dissect_acse_EXTERNALt(TRUE, tvb, offset, actx->pinfo, tree, hf_index);
-
-#.FN_BODY Attribute-Value-Assertions
- gint8 class;
- gboolean pc, ind_field;
- gint32 tag;
- guint32 len1;
-
- if(!implicit_tag){
-   /* XXX  asn2wrs can not yet handle tagged assignment yes so this
-    * XXX is some conformance file magic to work around that bug
-    */
-    offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
-    offset = get_ber_length(tree, tvb, offset, &len1, &ind_field);
- }
-  offset = dissect_ftam_OR_Set(TRUE, tvb, offset, actx, tree, hf_index);
-
-#.FN_BODY Referent-Indicator
- gint8 class;
- gboolean pc, ind_field;
- gint32 tag;
- guint32 len1;
-
- if(!implicit_tag){
-   /* XXX  asn2wrs can not yet handle tagged assignment yes so this
-    * XXX is some conformance file magic to work around that bug
-    */
-    offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
-    offset = get_ber_length(tree, tvb, offset, &len1, &ind_field);
- }
-  offset = dissect_ber_boolean(TRUE, actx, tree, tvb, offset, hf_index);
-
-#.FN_BODY Password
- gint8 class;
- gboolean pc, ind_field;
- gint32 tag;
- guint32 len1;
-
- if(!implicit_tag){
-   /* XXX  asn2wrs can not yet handle tagged assignment yes so this
-    * XXX is some conformance file magic to work around that bug
-    */
-    offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
-    offset = get_ber_length(tree, tvb, offset, &len1, &ind_field);
- }
-  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
-                              Password_choice, hf_index, ett_ftam_Password, NULL);
-
-
-#.FN_BODY FADU-Identity
- gint8 class;
- gboolean pc, ind_field;
- gint32 tag;
- guint32 len1;
-
- if(!implicit_tag){
-   /* XXX  asn2wrs can not yet handle tagged assignment yes so this
-    * XXX is some conformance file magic to work around that bug
-    */
-    offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
-    offset = get_ber_length(tree, tvb, offset, &len1, &ind_field);
- }
-  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
-                              FADU_Identity_choice, hf_index, ett_ftam_FADU_Identity, NULL);
-
-#.FN_BODY Operation-Result
- gint8 class;
- gboolean pc, ind_field;
- gint32 tag;
- guint32 len1;
-
- if(!implicit_tag){
-   /* XXX  asn2wrs can not yet handle tagged assignment yes so this
-    * XXX is some conformance file magic to work around that bug
-    */
-    offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
-    offset = get_ber_length(tree, tvb, offset, &len1, &ind_field);
- }
-  offset = dissect_ber_old_choice(actx, tree, tvb, offset,
-                              Operation_Result_choice, hf_index, ett_ftam_Operation_Result, NULL);
-#.FN_PARS FTAM-Regime-PDU
-	VAL_PTR = &branch_taken
-
-#.FN_BODY FTAM-Regime-PDU
+#.FN_BODY FTAM-Regime-PDU VAL_PTR = &branch_taken
   gint branch_taken;
 
   %(DEFAULT_BODY)s
@@ -704,10 +92,7 @@ Legal-Qualification-Attribute/actual-values	actual_values9
 	}
   }
 
-#.FN_PARS File-PDU
-	VAL_PTR = &branch_taken
-
-#.FN_BODY File-PDU
+#.FN_BODY File-PDU VAL_PTR = &branch_taken
   gint branch_taken;
 
   %(DEFAULT_BODY)s
@@ -718,10 +103,7 @@ Legal-Qualification-Attribute/actual-values	actual_values9
 	}
   }
 
-#.FN_PARS Bulk-Data-PDU
-	VAL_PTR = &branch_taken
-
-#.FN_BODY Bulk-Data-PDU
+#.FN_BODY Bulk-Data-PDU VAL_PTR = &branch_taken
   gint branch_taken;
 
   %(DEFAULT_BODY)s
@@ -732,10 +114,7 @@ Legal-Qualification-Attribute/actual-values	actual_values9
 	}
   }
 
-#.FN_PARS FSM-PDU
-	VAL_PTR = &branch_taken
-
-#.FN_BODY FSM-PDU
+#.FN_BODY FSM-PDU VAL_PTR = &branch_taken
   gint branch_taken;
 
   %(DEFAULT_BODY)s