New autogenerated ACSE dissector.

Note that the autogenerated dissector contains two bugs which i belive are asn2eth bugs.
This is why make copy_files does not work.

The comment at the top of the generated file explains which two changes one has to do manually after autogenerating the dissector, until asn2eth gets fixed.


svn path=/trunk/; revision=14699

1 files changed, 2279 insertions, 1542 deletions

diff --git a/epan/dissectors/packet-acse.c b/epan/dissectors/packet-acse.c
index 66304a322e..3d577706ca 100644
--- a/epan/dissectors/packet-acse.c
+++ b/epan/dissectors/packet-acse.c
@@ -1,1664 +1,2401 @@
-/* packet-acse.c
-*
-* Routine to dissect OSI ACSE Protocol packets
-*
-* $Id$
-*
-* Yuriy Sidelnikov <YSidelnikov@hotmail.com>
-*
-* Ethereal - Network traffic analyzer
-* By Gerald Combs <gerald@ethereal.com>
-* Copyright 1998 Gerald Combs
-*
-* This program is free software; you can redistribute it and/or
-* modify it under the terms of the GNU General Public License
-* as published by the Free Software Foundation; either version 2
-* of the License, or (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+/* Do not modify this file.                                                   */
+/* It is created automatically by the ASN.1 to Ethereal dissector compiler    */
+/* ./packet-acse.c                                                            */
+/* ../../tools/asn2eth.py -X -b -e -p acse -c acse.cnf -s packet-acse-template acse.asn */
+
+/* Input file: packet-acse-template.c */
+
+/*XXX
+  there is a bug in the generated code
+  static const ber_sequence_t Association_data_sequence_of[1] = {
+    { BER_CLASS_UNI, 8, BER_FLAGS_NOOWNTAG, dissect_Association_data_item },
+  };
+  must be changed into
+  static const ber_sequence_t Association_data_sequence_of[1] = {
+    { BER_CLASS_UNI, 8, NULL, dissect_Association_data_item },
+  };
+
+  and 
+  static int dissect_Association_data_item(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
+    int ret;
+    ret=dissect_acse_EXTERNAL(FALSE, tvb, offset, pinfo, tree, hf_acse_Association_data_item);
+    return ret;
+  }
+  must be changed into
+  static int dissect_Association_data_item(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
+    int ret;
+    ret=dissect_acse_EXTERNAL(TRUE, tvb, offset, pinfo, tree, hf_acse_Association_data_item);
+    return ret;
+  }
 */
 
+/* packet-acse.c
+ * Routines for ACSE packet dissection
+ *   Ronnie Sahlberg 2005
+ * dissect_acse() from original handwritten dissector by Sid
+ *
+ * $Id$
+ *
+ * Ethereal - Network traffic analyzer
+ * By Gerald Combs <gerald@ethereal.com>
+ * Copyright 1998 Gerald Combs
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
 
 #include <glib.h>
 #include <epan/packet.h>
+#include <epan/conversation.h>
 
 #include <stdio.h>
 #include <string.h>
 
+#include "packet-ber.h"
 #include "packet-acse.h"
-#include "packet-frame.h"
-#include <epan/prefs.h>
-
-#include <epan/strutil.h>
-
-#include <epan/asn1.h>
-#include "format-oid.h"
-
 #include "packet-ses.h"
-extern const value_string ses_vals[];
+#include "packet-x509if.h"
+
+#define PNAME  "ACSE"
+#define PSNAME "ACSE"
+#define PFNAME "acse"
+
+/* Initialize the protocol and registered fields */
+int proto_acse = -1;
+
+/*--- Included file: packet-acse-hf.c ---*/
+
+static int hf_acse_direct_reference = -1;         /* OBJECT_IDENTIFIER */
+static int hf_acse_indirect_reference = -1;       /* T_indirect_reference */
+static int hf_acse_data_value_descriptor = -1;    /* ObjectDescriptor */
+static int hf_acse_encoding = -1;                 /* T_encoding */
+static int hf_acse_single_ASN1_type = -1;         /* T_single_ASN1_type */
+static int hf_acse_octet_aligned = -1;            /* OCTET_STRING */
+static int hf_acse_arbitrary = -1;                /* BIT_STRING */
+static int hf_acse_aarq = -1;                     /* AARQ_apdu */
+static int hf_acse_aare = -1;                     /* AARE_apdu */
+static int hf_acse_rlrq = -1;                     /* RLRQ_apdu */
+static int hf_acse_rlre = -1;                     /* RLRE_apdu */
+static int hf_acse_abrt = -1;                     /* ABRT_apdu */
+static int hf_acse_adt = -1;                      /* A_DT_apdu */
+static int hf_acse_acrq = -1;                     /* ACRQ_apdu */
+static int hf_acse_acrp = -1;                     /* ACRP_apdu */
+static int hf_acse_AARQ_protocol_version = -1;    /* T_AARQ_protocol_version */
+static int hf_acse_AARQ_aSO_context_name = -1;    /* T_aSO_context_name */
+static int hf_acse_called_AP_title = -1;          /* AP_title */
+static int hf_acse_called_AE_qualifier = -1;      /* AE_qualifier */
+static int hf_acse_called_AP_invocation_identifier = -1;  /* AP_invocation_identifier */
+static int hf_acse_called_AE_invocation_identifier = -1;  /* AE_invocation_identifier */
+static int hf_acse_calling_AP_title = -1;         /* AP_title */
+static int hf_acse_calling_AE_qualifier = -1;     /* AE_qualifier */
+static int hf_acse_calling_AP_invocation_identifier = -1;  /* AP_invocation_identifier */
+static int hf_acse_calling_AE_invocation_identifier = -1;  /* AE_invocation_identifier */
+static int hf_acse_sender_acse_requirements = -1;  /* ACSE_requirements */
+static int hf_acse_mechanism_name = -1;           /* Mechanism_name */
+static int hf_acse_calling_authentication_value = -1;  /* Authentication_value */
+static int hf_acse_aSO_context_name_list = -1;    /* ASO_context_name_list */
+static int hf_acse_implementation_information = -1;  /* Implementation_data */
+static int hf_acse_p_context_definition_list = -1;  /* Syntactic_context_list */
+static int hf_acse_called_asoi_tag = -1;          /* ASOI_tag */
+static int hf_acse_calling_asoi_tag = -1;         /* ASOI_tag */
+static int hf_acse_AARQ_user_information = -1;    /* Association_data */
+static int hf_acse_AARE_protocol_version = -1;    /* T_AARE_protocol_version */
+static int hf_acse_AARE_aSO_context_name = -1;    /* T_aSO_context_name1 */
+static int hf_acse_AARE_result = -1;              /* Associate_result */
+static int hf_acse_result_source_diagnostic = -1;  /* Associate_source_diagnostic */
+static int hf_acse_responding_AP_title = -1;      /* AP_title */
+static int hf_acse_responding_AE_qualifier = -1;  /* AE_qualifier */
+static int hf_acse_responding_AP_invocation_identifier = -1;  /* AP_invocation_identifier */
+static int hf_acse_responding_AE_invocation_identifier = -1;  /* AE_invocation_identifier */
+static int hf_acse_responder_acse_requirements = -1;  /* ACSE_requirements */
+static int hf_acse_responding_authentication_value = -1;  /* Authentication_value */
+static int hf_acse_p_context_result_list = -1;    /* P_context_result_list */
+static int hf_acse_AARE_user_information = -1;    /* Association_data */
+static int hf_acse_RLRQ_reason = -1;              /* Release_request_reason */
+static int hf_acse_aso_qualifier = -1;            /* ASO_qualifier */
+static int hf_acse_asoi_identifier = -1;          /* ASOI_identifier */
+static int hf_acse_RLRQ_user_information = -1;    /* Association_data */
+static int hf_acse_RLRE_reason = -1;              /* Release_response_reason */
+static int hf_acse_RLRE_user_information = -1;    /* Association_data */
+static int hf_acse_abort_source = -1;             /* ABRT_source */
+static int hf_acse_abort_diagnostic = -1;         /* ABRT_diagnostic */
+static int hf_acse_ABRT_user_information = -1;    /* Association_data */
+static int hf_acse_a_user_data = -1;              /* User_Data */
+static int hf_acse_ACRQ_aSO_context_name = -1;    /* T_aSO_context_name2 */
+static int hf_acse_user_information = -1;         /* User_information */
+static int hf_acse_aSO_context_name = -1;         /* T_aSO_context_name3 */
+static int hf_acse_ap_title_form1 = -1;           /* AP_title_form1 */
+static int hf_acse_ap_title_form2 = -1;           /* AP_title_form2 */
+static int hf_acse_ap_title_form3 = -1;           /* AP_title_form3 */
+static int hf_acse_aso_qualifier_form1 = -1;      /* ASO_qualifier_form1 */
+static int hf_acse_aso_qualifier_form2 = -1;      /* ASO_qualifier_form2 */
+static int hf_acse_aso_qualifier_form3 = -1;      /* ASO_qualifier_form3 */
+static int hf_acse_ae_title_form1 = -1;           /* AE_title_form1 */
+static int hf_acse_ae_title_form2 = -1;           /* AE_title_form2 */
+static int hf_acse_ASOI_tag_item = -1;            /* ASOI_tag_item */
+static int hf_acse_qualifier = -1;                /* ASO_qualifier */
+static int hf_acse_identifier = -1;               /* ASOI_identifier */
+static int hf_acse_ASO_context_name_list_item = -1;  /* ASO_context_name */
+static int hf_acse_context_list = -1;             /* Context_list */
+static int hf_acse_default_contact_list = -1;     /* Default_Context_List */
+static int hf_acse_Context_list_item = -1;        /* Context_list_item */
+static int hf_acse_pci = -1;                      /* Presentation_context_identifier */
+static int hf_acse_abstract_syntax = -1;          /* Abstract_syntax_name */
+static int hf_acse_transfer_syntaxes = -1;        /* SEQUENCE_OF_TransferSyntaxName */
+static int hf_acse_transfer_syntaxes_item = -1;   /* TransferSyntaxName */
+static int hf_acse_Default_Context_List_item = -1;  /* Default_Context_List_item */
+static int hf_acse_abstract_syntax_name = -1;     /* Abstract_syntax_name */
+static int hf_acse_transfer_syntax_name = -1;     /* TransferSyntaxName */
+static int hf_acse_P_context_result_list_item = -1;  /* P_context_result_list_item */
+static int hf_acse_Pcontext_result = -1;          /* Result */
+static int hf_acse_concrete_syntax_name = -1;     /* Concrete_syntax_name */
+static int hf_acse_provider_reason = -1;          /* T_provider_reason */
+static int hf_acse_acse_service_user = -1;        /* T_acse_service_user */
+static int hf_acse_acse_service_provider = -1;    /* T_acse_service_provider */
+static int hf_acse_Association_data_item = -1;    /* EXTERNAL */
+static int hf_acse_simply_encoded_data = -1;      /* Simply_encoded_data */
+static int hf_acse_fully_encoded_data = -1;       /* PDV_list */
+static int hf_acse_presentation_context_identifier = -1;  /* Presentation_context_identifier */
+static int hf_acse_presentation_data_values = -1;  /* T_presentation_data_values */
+static int hf_acse_simple_ASN1_type = -1;         /* T_simple_ASN1_type */
+static int hf_acse_other_mechanism_name = -1;     /* T_other_mechanism_name */
+static int hf_acse_other_mechanism_value = -1;    /* T_other_mechanism_value */
+static int hf_acse_charstring = -1;               /* GraphicString */
+static int hf_acse_bitstring = -1;                /* BIT_STRING */
+static int hf_acse_external = -1;                 /* EXTERNAL */
+static int hf_acse_other = -1;                    /* Authentication_value_other */
+/* named bits */
+static int hf_acse_T_AARQ_protocol_version_version1 = -1;
+static int hf_acse_T_AARE_protocol_version_version1 = -1;
+static int hf_acse_ACSE_requirements_authentication = -1;
+static int hf_acse_ACSE_requirements_aSO_context_negotiation = -1;
+static int hf_acse_ACSE_requirements_higher_level_association = -1;
+static int hf_acse_ACSE_requirements_nested_association = -1;
+
+/*--- End of included file: packet-acse-hf.c ---*/
+
+
+/* Initialize the subtree pointers */
+static gint ett_acse = -1;
+
+/*--- Included file: packet-acse-ett.c ---*/
+
+static gint ett_acse_EXTERNAL = -1;
+static gint ett_acse_T_encoding = -1;
+static gint ett_acse_ACSE_apdu = -1;
+static gint ett_acse_AARQ_apdu = -1;
+static gint ett_acse_T_AARQ_protocol_version = -1;
+static gint ett_acse_AARE_apdu = -1;
+static gint ett_acse_T_AARE_protocol_version = -1;
+static gint ett_acse_RLRQ_apdu = -1;
+static gint ett_acse_RLRE_apdu = -1;
+static gint ett_acse_ABRT_apdu = -1;
+static gint ett_acse_A_DT_apdu = -1;
+static gint ett_acse_ACRQ_apdu = -1;
+static gint ett_acse_ACRP_apdu = -1;
+static gint ett_acse_ACSE_requirements = -1;
+static gint ett_acse_AP_title = -1;
+static gint ett_acse_ASO_qualifier = -1;
+static gint ett_acse_AE_title = -1;
+static gint ett_acse_ASOI_tag = -1;
+static gint ett_acse_ASOI_tag_item = -1;
+static gint ett_acse_ASO_context_name_list = -1;
+static gint ett_acse_Syntactic_context_list = -1;
+static gint ett_acse_Context_list = -1;
+static gint ett_acse_Context_list_item = -1;
+static gint ett_acse_SEQUENCE_OF_TransferSyntaxName = -1;
+static gint ett_acse_Default_Context_List = -1;
+static gint ett_acse_Default_Context_List_item = -1;
+static gint ett_acse_P_context_result_list = -1;
+static gint ett_acse_P_context_result_list_item = -1;
+static gint ett_acse_Associate_source_diagnostic = -1;
+static gint ett_acse_Association_data = -1;
+static gint ett_acse_User_Data = -1;
+static gint ett_acse_PDV_list = -1;
+static gint ett_acse_T_presentation_data_values = -1;
+static gint ett_acse_Authentication_value_other = -1;
+static gint ett_acse_Authentication_value = -1;
+
+/*--- End of included file: packet-acse-ett.c ---*/
+
 
-/* acse header fields             */
-static int proto_acse          = -1;
-/*   type of session envelop */
 static struct SESSION_DATA_STRUCTURE* session = NULL;
-/* acse fields defining a sub tree */
-static gint ett_acse           = -1;
-static gint ett_acse_param     = -1;
-static gint ett_acse_rc           = -1;
-static gint ett_acse_ms           = -1;
-static gint ett_acse_itm           = -1;
 
-/*
-----------------------------------------------------------------------------------------------------------*/
-/* Subdissector tables */ 
-static dissector_table_t application_dissector_table; 
-static dissector_handle_t app_handle = NULL;
-static int hf_acse_type        = -1;
-static int hf_cp_type_message_length = -1;
-static int hf_protocol_version       = -1;
+static char object_identifier_id[64]; /*64 chars should be long enough? */
+/* indirect_reference, used to pick up the signalling so we know what
+   kind of data is transferred in SES_DATA_TRANSFER_PDUs */
+static guint32 indir_ref=0;
+
+static proto_tree *top_tree=NULL;
+
+/* to keep track of presentation context identifiers and protocol-oids */
+static GMemChunk *acse_ctx_oid_chunk = NULL;
+static int acse_ctx_oid_count = 500;
+typedef struct _acse_ctx_oid_t {
+	/* XXX here we should keep track of ADDRESS/PORT as well */
+	guint32 ctx_id;
+	char *oid;
+} acse_ctx_oid_t;
+static GHashTable *acse_ctx_oid_table = NULL;
+
+static gboolean
+free_all_ctx_oid_strings(gpointer key_arg, gpointer value _U_, gpointer user_data _U_)
+{
+	acse_ctx_oid_t *aco=(acse_ctx_oid_t *)key_arg;
+	if(aco->oid){
+		g_free(aco->oid);
+		aco->oid=NULL;
+	}
+	return TRUE;
+}
+static guint
+acse_ctx_oid_hash(gconstpointer k)
+{
+	acse_ctx_oid_t *aco=(acse_ctx_oid_t *)k;
+	return aco->ctx_id;
+}
+/* XXX this one should be made ADDRESS/PORT aware */
+static gint
+acse_ctx_oid_equal(gconstpointer k1, gconstpointer k2)
+{
+	acse_ctx_oid_t *aco1=(acse_ctx_oid_t *)k1;
+	acse_ctx_oid_t *aco2=(acse_ctx_oid_t *)k2;
+	return aco1->ctx_id==aco2->ctx_id;
+}
 
+static void
+acse_init(void)
+{
+	if( acse_ctx_oid_table ){
+		g_hash_table_foreach_remove(acse_ctx_oid_table,
+			free_all_ctx_oid_strings, NULL);
+		g_hash_table_destroy(acse_ctx_oid_table);
+		acse_ctx_oid_table = NULL;
+	}
+	acse_ctx_oid_table = g_hash_table_new(acse_ctx_oid_hash,
+			acse_ctx_oid_equal);
 
+	if (acse_ctx_oid_chunk) {
+		g_mem_chunk_destroy(acse_ctx_oid_chunk);
+		acse_ctx_oid_chunk = NULL;
+	}
+	acse_ctx_oid_chunk = g_mem_chunk_new("acse_ctx_oid_chunk",
+			sizeof(acse_ctx_oid_t),
+			acse_ctx_oid_count * sizeof(acse_ctx_oid_t),
+			G_ALLOC_ONLY);
+}
 
-static const value_string acse_vals[] =
+static void
+register_ctx_id_and_oid(packet_info *pinfo _U_, guint32 idx, char *oid)
+{
+	acse_ctx_oid_t *aco, *tmpaco;
+	aco=g_mem_chunk_alloc(acse_ctx_oid_chunk);
+	aco->ctx_id=idx;
+	aco->oid=g_strdup(oid);
+
+	/* if this ctx already exists, remove the old one first */
+	tmpaco=(acse_ctx_oid_t *)g_hash_table_lookup(acse_ctx_oid_table, aco);
+	if(tmpaco){
+		g_hash_table_remove(acse_ctx_oid_table, tmpaco);
+		g_free(tmpaco->oid);
+		tmpaco->oid=NULL;
+		g_mem_chunk_free(acse_ctx_oid_chunk, tmpaco);
+	}
+	g_hash_table_insert(acse_ctx_oid_table, aco, aco);
+}
+static char *
+find_oid_by_ctx_id(packet_info *pinfo _U_, guint32 idx)
 {
-  {ACSE_AARQ,  "A-associate request" },
-  {ACSE_AARE,  "A-associate response" },
-  {ACSE_RLRQ,  "A-release request" },
-  {ACSE_RLRE,  "A-release response" },
-  {ACSE_ABRT,  "A-abort" },
-  {0,             NULL           }
+	acse_ctx_oid_t aco, *tmpaco;
+	aco.ctx_id=idx;
+	tmpaco=(acse_ctx_oid_t *)g_hash_table_lookup(acse_ctx_oid_table, &aco);
+	if(tmpaco){
+		return tmpaco->oid;
+	}
+	return NULL;
+}
+
+
+
+/*--- Included file: packet-acse-fn.c ---*/
+
+/*--- Fields for imported types ---*/
+
+
+
+
+static int
+dissect_acse_OBJECT_IDENTIFIER(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+  offset = dissect_ber_object_identifier(implicit_tag, pinfo, tree, tvb, offset, hf_index,
+                                            NULL);
+
+  return offset;
+}
+static int dissect_direct_reference(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
+  return dissect_acse_OBJECT_IDENTIFIER(FALSE, tvb, offset, pinfo, tree, hf_acse_direct_reference);
+}
+
+
+
+static int
+dissect_acse_T_indirect_reference(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+  offset = dissect_ber_integer(FALSE, pinfo, tree, tvb, offset,
+                hf_acse_indirect_reference,
+                &indir_ref);
+
+
+  return offset;
+}
+static int dissect_indirect_reference(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
+  return dissect_acse_T_indirect_reference(FALSE, tvb, offset, pinfo, tree, hf_acse_indirect_reference);
+}
+
+
+static int
+dissect_acse_ObjectDescriptor(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+  offset = dissect_ber_restricted_string(implicit_tag, BER_UNI_TAG_ObjectDescriptor,
+                                         pinfo, tree, tvb, offset, hf_index,
+                                         NULL);
+
+  return offset;
+}
+static int dissect_data_value_descriptor(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
+  return dissect_acse_ObjectDescriptor(FALSE, tvb, offset, pinfo, tree, hf_acse_data_value_descriptor);
+}
+
+
+
+static int
+dissect_acse_T_single_ASN1_type(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+  offset=call_ber_oid_callback(object_identifier_id, tvb, offset, pinfo, top_tree);
+
+
+  return offset;
+}
+static int dissect_single_ASN1_type(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
+  return dissect_acse_T_single_ASN1_type(FALSE, tvb, offset, pinfo, tree, hf_acse_single_ASN1_type);
+}
+
+
+static int
+dissect_acse_OCTET_STRING(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+  offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index,
+                                    NULL);
+
+  return offset;
+}
+static int dissect_octet_aligned_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
+  return dissect_acse_OCTET_STRING(TRUE, tvb, offset, pinfo, tree, hf_acse_octet_aligned);
+}
+
+
+static int
+dissect_acse_BIT_STRING(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+  offset = dissect_ber_bitstring(implicit_tag, pinfo, tree, tvb, offset,
+                                 NULL, hf_index, -1,
+                                 NULL);
+
+  return offset;
+}
+static int dissect_arbitrary_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
+  return dissect_acse_BIT_STRING(TRUE, tvb, offset, pinfo, tree, hf_acse_arbitrary);
+}
+static int dissect_bitstring_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
+  return dissect_acse_BIT_STRING(TRUE, tvb, offset, pinfo, tree, hf_acse_bitstring);
+}
+
+
+static const value_string acse_T_encoding_vals[] = {
+  {   0, "single-ASN1-type" },
+  {   1, "octet-aligned" },
+  {   2, "arbitrary" },
+  { 0, NULL }
 };
 
-static const value_string request_sequence_top_vals[] =
-{
-  {PROTOCOL_VERSION, "Protocol version"},
-  {APPLICATION_CONTEXT_NAME, "Application context name"},
-  {CALLED_AP_TITLE, "Called AP title"},
-  {CALLED_AE_QUALIFIER, "Called AE qualifier"},
-  {CALLED_AP_INVOKATION_ID, "Called AP invocation id"},
-  {CALLED_AE_INVOKATION_ID, "Called AE invocation id"},
-  {CALLING_AP_TITLE, "Calling AP title"},
-  {CALLING_AE_QUALIFIER, "Calling AE qualifier"},
-  {CALLING_AP_INVOKATION_ID, "Calling AP invocation id"},
-  {CALLING_AE_INVOKATION_ID, "Calling AE invocation id"},
-  {IMPLEMENTATION_INFORMATION,"Implementation information"},
-  {USER_INFORMATION,"User information"},
-  {0, NULL}
+static const ber_choice_t T_encoding_choice[] = {
+  {   0, BER_CLASS_CON, 0, 0, dissect_single_ASN1_type },
+  {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_octet_aligned_impl },
+  {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_arbitrary_impl },
+  { 0, 0, 0, 0, NULL }
 };
-static const value_string response_sequence_top_vals[] =
-{
-  {PROTOCOL_VERSION, "Protocol version"},
-  {APPLICATION_CONTEXT_NAME, "Application context name"},
-  {ACSE_RESULT, "Result"},
-  {ACSE_RESULT_SOURCE_DIAGNOSTIC, "Result source diagnostic"},
-  {RESPONDING_AP_TITLE, "Responding AP title"},
-  {RESPONDING_AE_QUALIFIER, "Responding AE qualifier"},
-  {RESPONDING_AP_INVOKATION_ID, "Responding AP invocation id"},
-  {RESPONDING_AE_INVOKATION_ID, "Responding AE invocation id"},
-  {IMPLEMENTATION_INFORMATION,"Implementation information"},
-  {USER_INFORMATION,"User information"},
-  {0, NULL}
+
+static int
+dissect_acse_T_encoding(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+  offset = dissect_ber_choice(pinfo, tree, tvb, offset,
+                              T_encoding_choice, hf_index, ett_acse_T_encoding);
+
+  return offset;
+}
+static int dissect_encoding(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
+  return dissect_acse_T_encoding(FALSE, tvb, offset, pinfo, tree, hf_acse_encoding);
+}
+
+static const ber_sequence_t EXTERNAL_sequence[] = {
+  { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_direct_reference },
+  { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_indirect_reference },
+  { BER_CLASS_UNI, BER_UNI_TAG_ObjectDescriptor, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_data_value_descriptor },
+  { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_encoding },
+  { 0, 0, 0, NULL }
 };
-static const value_string associate_result_values_vals[] =
-{
-  {PRESENTATION_RESULT_ACCEPTANCE,"Accepted"},
-  {PRESENTATION_RESULT_USER_REJECTION,"Rejected permanent"},
-  {PRESENTATION_RESULT_PROVIDER_REJECTION,"Rejected transient"},
-  {0, NULL}
+
+static int
+dissect_acse_EXTERNAL(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+  offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
+                                EXTERNAL_sequence, hf_index, ett_acse_EXTERNAL);
+
+  return offset;
+}
+static int dissect_Association_data_item(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
+  return dissect_acse_EXTERNAL(TRUE, tvb, offset, pinfo, tree, hf_acse_Association_data_item);
+}
+static int dissect_external_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
+  return dissect_acse_EXTERNAL(TRUE, tvb, offset, pinfo, tree, hf_acse_external);
+}
+
+static const asn_namedbit T_AARQ_protocol_version_bits[] = {
+  {  0, &hf_acse_T_AARQ_protocol_version_version1, -1, -1, "version1", NULL },
+  { 0, NULL, 0, 0, NULL, NULL }
 };
 
-static const value_string acse_associate_source_diagnostic_vals[] =
-{
-  {ACSE_SERVICE_USER,"ACSE service user"},
-  {ACSE_SERVICE_PROVIDER,"ACSE service provider"},
-  {0, NULL}
+static int
+dissect_acse_T_AARQ_protocol_version(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+  offset = dissect_ber_bitstring(implicit_tag, pinfo, tree, tvb, offset,
+                                 T_AARQ_protocol_version_bits, hf_index, ett_acse_T_AARQ_protocol_version,
+                                 NULL);
+
+  return offset;
+}
+static int dissect_AARQ_protocol_version_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
+  return dissect_acse_T_AARQ_protocol_version(TRUE, tvb, offset, pinfo, tree, hf_acse_AARQ_protocol_version);
+}
+
+
+
+static int
+dissect_acse_ASO_context_name(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+  offset = dissect_ber_object_identifier(implicit_tag, pinfo, tree, tvb, offset, hf_index,
+                                            NULL);
+
+  return offset;
+}
+static int dissect_ASO_context_name_list_item(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
+  return dissect_acse_ASO_context_name(FALSE, tvb, offset, pinfo, tree, hf_acse_ASO_context_name_list_item);
+}
+
+
+static int
+dissect_acse_T_aSO_context_name(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+  offset = dissect_ber_object_identifier(FALSE, pinfo, tree, tvb, offset,
+                                         hf_index, object_identifier_id);
+
+
+  return offset;
+}
+static int dissect_AARQ_aSO_context_name(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
+  return dissect_acse_T_aSO_context_name(FALSE, tvb, offset, pinfo, tree, hf_acse_AARQ_aSO_context_name);
+}
+
+
+static int
+dissect_acse_AP_title_form1(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+  offset = dissect_x509if_Name(implicit_tag, tvb, offset, pinfo, tree, hf_index);
+
+  return offset;
+}
+static int dissect_ap_title_form1(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
+  return dissect_acse_AP_title_form1(FALSE, tvb, offset, pinfo, tree, hf_acse_ap_title_form1);
+}
+
+
+
+static int
+dissect_acse_AP_title_form2(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+  offset = dissect_ber_object_identifier(implicit_tag, pinfo, tree, tvb, offset, hf_index,
+                                            NULL);
+
+  return offset;
+}
+static int dissect_ap_title_form2(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
+  return dissect_acse_AP_title_form2(FALSE, tvb, offset, pinfo, tree, hf_acse_ap_title_form2);
+}
+
+
+static int
+dissect_acse_AP_title_form3(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+  offset = dissect_ber_restricted_string(implicit_tag, BER_UNI_TAG_PrintableString,
+                                         pinfo, tree, tvb, offset, hf_index,
+                                         NULL);
+
+  return offset;
+}
+static int dissect_ap_title_form3(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
+  return dissect_acse_AP_title_form3(FALSE, tvb, offset, pinfo, tree, hf_acse_ap_title_form3);
+}
+
+
+static const value_string acse_AP_title_vals[] = {
+  {   0, "ap-title-form1" },
+  {   1, "ap-title-form2" },
+  {   2, "ap-title-form3" },
+  {   3, "ap-title-form3" },
+  { 0, NULL }
 };
-static const value_string acse_service_user_values_vals[] =
-{
-  {ACSE_NULL,"null"},
-  {ACSE_NO_REASON_GIVEN,"No reason given"},
-  {ACSE_APPLICATION_CONTEXT_NAME_NOT_SUPPORTED,"Application context name not supported"},
-  {ACSE_CALLING_AP_TITLE_NOT_RECOGNIZED,"Calling AP title not recognized"},
-  {ACSE_CALLING_AP_INVOKATION_IDENTIFIER_NOT_RECOGNIZED,"Calling AP invocation identifier not recognized"},
-  {ACSE_CALLING_AE_QUALIFIER_NOT_RECOGNIZED,"Calling AE qualifier not recognized"},
-  {ACSE_CALLING_AE_INVOKATION_IDENTIFIER_NOT_RECOGNIZED,"Calling AE invocation identifier not recognized"},
-  {ACSE_CALLED_AP_TITLE_NOT_RECOGNIZED,"Called AP title not recognized"},
-  {ACSE_CALLED_AP_INVOKATION_IDENTIFIER_NOT_RECOGNIZED,"Called AP invocation identifier not recognized"},
-  {ACSE_CALLED_AE_QUALIFIER_NOT_RECOGNIZED,"Called AE qualifier not recognized"},
-  {ACSE_CALLED_AE_INVOKATION_IDENTIFIER_NOT_RECOGNIZED,"Called AE invocation identifier not recognized"},
-  {0, NULL}
+
+static const ber_choice_t AP_title_choice[] = {
+  {   0, BER_CLASS_UNI, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_ap_title_form1 },
+  {   1, BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_ap_title_form2 },
+  {   2, BER_CLASS_UNI, BER_UNI_TAG_PrintableString, BER_FLAGS_NOOWNTAG, dissect_ap_title_form3 },
+  {   3, BER_CLASS_UNI, BER_UNI_TAG_PrintableString, BER_FLAGS_NOOWNTAG, dissect_ap_title_form3 },
+  {   4, BER_CLASS_UNI, BER_UNI_TAG_PrintableString, BER_FLAGS_NOOWNTAG, dissect_ap_title_form3 },
+  { 0, 0, 0, 0, NULL }
 };
-static const value_string acse_service_provider_values_vals[] =
-{
-  {ACSE_NULL,"Null"},
-  {ACSE_NO_REASON_GIVEN,"No reason given"},
-  {ACSE_NO_COMMON_ACSE_VERSION,"no_common_acse_version"},
-  {0, NULL}
+
+static int
+dissect_acse_AP_title(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+  offset = dissect_ber_choice(pinfo, tree, tvb, offset,
+                              AP_title_choice, hf_index, ett_acse_AP_title);
+
+  return offset;
+}
+static int dissect_called_AP_title(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
+  return dissect_acse_AP_title(FALSE, tvb, offset, pinfo, tree, hf_acse_called_AP_title);
+}
+static int dissect_calling_AP_title(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
+  return dissect_acse_AP_title(FALSE, tvb, offset, pinfo, tree, hf_acse_calling_AP_title);
+}
+static int dissect_responding_AP_title(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
+  return dissect_acse_AP_title(FALSE, tvb, offset, pinfo, tree, hf_acse_responding_AP_title);
+}
+
+
+static int
+dissect_acse_ASO_qualifier_form1(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+  offset = dissect_x509if_RelativeDistinguishedName(implicit_tag, tvb, offset, pinfo, tree, hf_index);
+
+  return offset;
+}
+static int dissect_aso_qualifier_form1(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
+  return dissect_acse_ASO_qualifier_form1(FALSE, tvb, offset, pinfo, tree, hf_acse_aso_qualifier_form1);
+}
+
+
+
+static int
+dissect_acse_ASO_qualifier_form2(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index,
+                                  NULL);
+
+  return offset;
+}
+static int dissect_aso_qualifier_form2(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
+  return dissect_acse_ASO_qualifier_form2(FALSE, tvb, offset, pinfo, tree, hf_acse_aso_qualifier_form2);
+}
+
+
+static int
+dissect_acse_ASO_qualifier_form3(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+  offset = dissect_ber_restricted_string(implicit_tag, BER_UNI_TAG_PrintableString,
+                                         pinfo, tree, tvb, offset, hf_index,
+                                         NULL);
+
+  return offset;
+}
+static int dissect_aso_qualifier_form3(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
+  return dissect_acse_ASO_qualifier_form3(FALSE, tvb, offset, pinfo, tree, hf_acse_aso_qualifier_form3);
+}
+
+
+static const value_string acse_ASO_qualifier_vals[] = {
+  {   0, "aso-qualifier-form1" },
+  {   1, "aso-qualifier-form2" },
+  {   2, "aso-qualifier-form3" },
+  {   3, "aso-qualifier-form3" },
+  { 0, NULL }
 };
 
-static const value_string acse_user_information_vals[] =
-{
-  {ACSE_EXTERNAL_USER,"External"},
-  {0, NULL}
+static const ber_choice_t ASO_qualifier_choice[] = {
+  {   0, BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_aso_qualifier_form1 },
+  {   1, BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_aso_qualifier_form2 },
+  {   2, BER_CLASS_UNI, BER_UNI_TAG_PrintableString, BER_FLAGS_NOOWNTAG, dissect_aso_qualifier_form3 },
+  {   3, BER_CLASS_UNI, BER_UNI_TAG_PrintableString, BER_FLAGS_NOOWNTAG, dissect_aso_qualifier_form3 },
+  {   4, BER_CLASS_UNI, BER_UNI_TAG_PrintableString, BER_FLAGS_NOOWNTAG, dissect_aso_qualifier_form3 },
+  { 0, 0, 0, 0, NULL }
 };
-static const value_string presentation_context_definition_vals[] =
-{
-  {SEQUENCE, "Sequence"},
-  {0, NULL}
+
+static int
+dissect_acse_ASO_qualifier(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+  offset = dissect_ber_choice(pinfo, tree, tvb, offset,
+                              ASO_qualifier_choice, hf_index, ett_acse_ASO_qualifier);
+
+  return offset;
+}
+static int dissect_aso_qualifier(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
+  return dissect_acse_ASO_qualifier(FALSE, tvb, offset, pinfo, tree, hf_acse_aso_qualifier);
+}
+static int dissect_qualifier(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
+  return dissect_acse_ASO_qualifier(FALSE, tvb, offset, pinfo, tree, hf_acse_qualifier);
+}
+
+
+static int
+dissect_acse_AE_qualifier(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+  offset = dissect_acse_ASO_qualifier(implicit_tag, tvb, offset, pinfo, tree, hf_index);
+
+  return offset;
+}
+static int dissect_called_AE_qualifier(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
+  return dissect_acse_AE_qualifier(FALSE, tvb, offset, pinfo, tree, hf_acse_called_AE_qualifier);
+}
+static int dissect_calling_AE_qualifier(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
+  return dissect_acse_AE_qualifier(FALSE, tvb, offset, pinfo, tree, hf_acse_calling_AE_qualifier);
+}
+static int dissect_responding_AE_qualifier(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
+  return dissect_acse_AE_qualifier(FALSE, tvb, offset, pinfo, tree, hf_acse_responding_AE_qualifier);
+}
+
+
+
+static int
+dissect_acse_AP_invocation_identifier(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index,
+                                  NULL);
+
+  return offset;
+}
+static int dissect_called_AP_invocation_identifier(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
+  return dissect_acse_AP_invocation_identifier(FALSE, tvb, offset, pinfo, tree, hf_acse_called_AP_invocation_identifier);
+}
+static int dissect_calling_AP_invocation_identifier(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
+  return dissect_acse_AP_invocation_identifier(FALSE, tvb, offset, pinfo, tree, hf_acse_calling_AP_invocation_identifier);
+}
+static int dissect_responding_AP_invocation_identifier(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
+  return dissect_acse_AP_invocation_identifier(FALSE, tvb, offset, pinfo, tree, hf_acse_responding_AP_invocation_identifier);
+}
+
+
+
+static int
+dissect_acse_AE_invocation_identifier(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index,
+                                  NULL);
+
+  return offset;
+}
+static int dissect_called_AE_invocation_identifier(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
+  return dissect_acse_AE_invocation_identifier(FALSE, tvb, offset, pinfo, tree, hf_acse_called_AE_invocation_identifier);
+}
+static int dissect_calling_AE_invocation_identifier(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
+  return dissect_acse_AE_invocation_identifier(FALSE, tvb, offset, pinfo, tree, hf_acse_calling_AE_invocation_identifier);
+}
+static int dissect_responding_AE_invocation_identifier(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
+  return dissect_acse_AE_invocation_identifier(FALSE, tvb, offset, pinfo, tree, hf_acse_responding_AE_invocation_identifier);
+}
+
+static const asn_namedbit ACSE_requirements_bits[] = {
+  {  0, &hf_acse_ACSE_requirements_authentication, -1, -1, "authentication", NULL },
+  {  1, &hf_acse_ACSE_requirements_aSO_context_negotiation, -1, -1, "aSO-context-negotiation", NULL },
+  {  2, &hf_acse_ACSE_requirements_higher_level_association, -1, -1, "higher-level-association", NULL },
+  {  3, &hf_acse_ACSE_requirements_nested_association, -1, -1, "nested-association", NULL },
+  { 0, NULL, 0, 0, NULL, NULL }
 };
-static const value_string user_data_values_vals[] =
-{
-  {SIMPLY_ENCODED_DATA,"Simply encoded data"},
-  {FULLY_ENCODED_DATA,"Fully encoded data "},
-  {0, NULL}
+
+static int
+dissect_acse_ACSE_requirements(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+  offset = dissect_ber_bitstring(implicit_tag, pinfo, tree, tvb, offset,
+                                 ACSE_requirements_bits, hf_index, ett_acse_ACSE_requirements,
+                                 NULL);
+
+  return offset;
+}
+static int dissect_sender_acse_requirements_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
+  return dissect_acse_ACSE_requirements(TRUE, tvb, offset, pinfo, tree, hf_acse_sender_acse_requirements);
+}
+static int dissect_responder_acse_requirements_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
+  return dissect_acse_ACSE_requirements(TRUE, tvb, offset, pinfo, tree, hf_acse_responder_acse_requirements);
+}
+
+
+
+static int
+dissect_acse_Mechanism_name(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+  offset = dissect_ber_object_identifier(implicit_tag, pinfo, tree, tvb, offset, hf_index,
+                                            NULL);
+
+  return offset;
+}
+static int dissect_mechanism_name_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
+  return dissect_acse_Mechanism_name(TRUE, tvb, offset, pinfo, tree, hf_acse_mechanism_name);
+}
+
+
+static int
+dissect_acse_GraphicString(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+  offset = dissect_ber_restricted_string(implicit_tag, 0,
+                                         pinfo, tree, tvb, offset, hf_index,
+                                         NULL);
+
+  return offset;
+}
+static int dissect_charstring_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
+  return dissect_acse_GraphicString(TRUE, tvb, offset, pinfo, tree, hf_acse_charstring);
+}
+
+
+
+static int
+dissect_acse_T_other_mechanism_name(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+  offset = dissect_ber_object_identifier(FALSE, pinfo, tree, tvb, offset,
+                                         hf_index, object_identifier_id);
+
+
+  return offset;
+}
+static int dissect_other_mechanism_name(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
+  return dissect_acse_T_other_mechanism_name(FALSE, tvb, offset, pinfo, tree, hf_acse_other_mechanism_name);
+}
+
+
+
+static int
+dissect_acse_T_other_mechanism_value(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+  offset=call_ber_oid_callback(object_identifier_id, tvb, offset, pinfo, top_tree);
+
+
+  return offset;
+}
+static int dissect_other_mechanism_value(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
+  return dissect_acse_T_other_mechanism_value(FALSE, tvb, offset, pinfo, tree, hf_acse_other_mechanism_value);
+}
+
+static const ber_sequence_t Authentication_value_other_sequence[] = {
+  { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_other_mechanism_name },
+  { BER_CLASS_ANY, 0, BER_FLAGS_NOOWNTAG, dissect_other_mechanism_value },
+  { 0, 0, 0, NULL }
 };
-static const value_string presentation_data_values[] =
-{
-  {PRESENTATION_CONTEXT_IDENTIFIER,"Presentation context identifier"},
-  {SINGLE_ASN1_TYPE,"Single ASN.1 type"},
-  {OCTET_ALIGNED,"Octet aligned"},
-  {ARBITRARY,"Arbitrary"},
-  {ABSTRACT_SYNTAX_NAME,"Abstract syntax name"},
-  {0, NULL}
+
+static int
+dissect_acse_Authentication_value_other(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+  offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
+                                Authentication_value_other_sequence, hf_index, ett_acse_Authentication_value_other);
+
+  return offset;
+}
+static int dissect_other_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
+  return dissect_acse_Authentication_value_other(TRUE, tvb, offset, pinfo, tree, hf_acse_other);
+}
+
+
+static const value_string acse_Authentication_value_vals[] = {
+  {   0, "charstring" },
+  {   1, "bitstring" },
+  {   2, "external" },
+  {   3, "other" },
+  { 0, NULL }
 };
-static const value_string release_request_reason[] =
-{
-  {RRR_NORMAL,"Normal"},
-  {RRR_URGENT,"Urgent"},
-  {RRR_USER_DEFINED,"User defined"},
-  {0, NULL}
+
+static const ber_choice_t Authentication_value_choice[] = {
+  {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_charstring_impl },
+  {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_bitstring_impl },
+  {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_external_impl },
+  {   3, BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_other_impl },
+  { 0, 0, 0, 0, NULL }
 };
-static const value_string release_response_reason[] =
-{
-  {RRPR_NORMAL,"Normal"},
-  {RRPR_URGENT,"Not finished"},
-  {RRPR_USER_DEFINED,"User defined"},
-  {0, NULL}
+
+static int
+dissect_acse_Authentication_value(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+  offset = dissect_ber_choice(pinfo, tree, tvb, offset,
+                              Authentication_value_choice, hf_index, ett_acse_Authentication_value);
+
+  return offset;
+}
+static int dissect_calling_authentication_value(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
+  return dissect_acse_Authentication_value(FALSE, tvb, offset, pinfo, tree, hf_acse_calling_authentication_value);
+}
+static int dissect_responding_authentication_value(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
+  return dissect_acse_Authentication_value(FALSE, tvb, offset, pinfo, tree, hf_acse_responding_authentication_value);
+}
+
+static const ber_sequence_t ASO_context_name_list_sequence_of[1] = {
+  { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_ASO_context_name_list_item },
 };
 
-static const value_string abort_reason[] =
-{
-  {ABRT_ACSE_SERVICE_USER,"ACSE service user"},
-  {ABRT_ACSE_SERVICE_PROVIDER,"ACSE service provider"},
-  {0, NULL}
+static int
+dissect_acse_ASO_context_name_list(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+  offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset,
+                                   ASO_context_name_list_sequence_of, hf_index, ett_acse_ASO_context_name_list);
+
+  return offset;
+}
+static int dissect_aSO_context_name_list_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
+  return dissect_acse_ASO_context_name_list(TRUE, tvb, offset, pinfo, tree, hf_acse_aSO_context_name_list);
+}
+
+
+static int
+dissect_acse_Implementation_data(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+  offset = dissect_ber_restricted_string(implicit_tag, BER_UNI_TAG_GraphicString,
+                                         pinfo, tree, tvb, offset, hf_index,
+                                         NULL);
+
+  return offset;
+}
+static int dissect_implementation_information_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
+  return dissect_acse_Implementation_data(TRUE, tvb, offset, pinfo, tree, hf_acse_implementation_information);
+}
+
+
+
+static int
+dissect_acse_Presentation_context_identifier(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index,
+                                  NULL);
+
+  return offset;
+}
+static int dissect_pci(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
+  return dissect_acse_Presentation_context_identifier(FALSE, tvb, offset, pinfo, tree, hf_acse_pci);
+}
+static int dissect_presentation_context_identifier(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
+  return dissect_acse_Presentation_context_identifier(FALSE, tvb, offset, pinfo, tree, hf_acse_presentation_context_identifier);
+}
+
+
+
+static int
+dissect_acse_Abstract_syntax_name(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+  offset = dissect_ber_object_identifier(implicit_tag, pinfo, tree, tvb, offset, hf_index,
+                                            NULL);
+
+  return offset;
+}
+static int dissect_abstract_syntax(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
+  return dissect_acse_Abstract_syntax_name(FALSE, tvb, offset, pinfo, tree, hf_acse_abstract_syntax);
+}
+static int dissect_abstract_syntax_name_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
+  return dissect_acse_Abstract_syntax_name(TRUE, tvb, offset, pinfo, tree, hf_acse_abstract_syntax_name);
+}
+
+
+
+static int
+dissect_acse_TransferSyntaxName(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+  offset = dissect_ber_object_identifier(implicit_tag, pinfo, tree, tvb, offset, hf_index,
+                                            NULL);
+
+  return offset;
+}
+static int dissect_transfer_syntaxes_item(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
+  return dissect_acse_TransferSyntaxName(FALSE, tvb, offset, pinfo, tree, hf_acse_transfer_syntaxes_item);
+}
+static int dissect_transfer_syntax_name(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
+  return dissect_acse_TransferSyntaxName(FALSE, tvb, offset, pinfo, tree, hf_acse_transfer_syntax_name);
+}
+static int dissect_transfer_syntax_name_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
+  return dissect_acse_TransferSyntaxName(TRUE, tvb, offset, pinfo, tree, hf_acse_transfer_syntax_name);
+}
+
+static const ber_sequence_t SEQUENCE_OF_TransferSyntaxName_sequence_of[1] = {
+  { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_transfer_syntaxes_item },
 };
 
+static int
+dissect_acse_SEQUENCE_OF_TransferSyntaxName(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+  offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset,
+                                   SEQUENCE_OF_TransferSyntaxName_sequence_of, hf_index, ett_acse_SEQUENCE_OF_TransferSyntaxName);
 
-/*      pointers for acse dissector  */
-static proto_tree *global_tree  = NULL;
-static packet_info *global_pinfo = NULL;
-/* dissector for data */
-static dissector_handle_t data_handle;
-static void
-call_app_dissector(tvbuff_t *tvb, gint offset, gint param_len,
-    packet_info *pinfo, proto_tree *tree, proto_tree *param_tree)
-{
-	/* do we have OSI app packet dissector ? */
-	if(!app_handle )
-	{
-
-		/* No - display as data */
-		if (tree)
-		{
-			proto_tree_add_text(param_tree, tvb, offset, param_len,
-			    "dissector is not available");
-		}
-	}
-	else
-	{
-			/* Yes - call application dissector */
-			tvbuff_t *next_tvb;
-
-			next_tvb = tvb_new_subset(tvb, offset, param_len,
-			    param_len);
-			TRY
-			{
-				call_dissector(app_handle, next_tvb, pinfo,
-				    tree);
-			}
-			CATCH_ALL
-			{
-				show_exception(tvb, pinfo, tree, EXCEPT_CODE, GET_MESSAGE);
-			}
-			ENDTRY;
-	}
+  return offset;
+}
+static int dissect_transfer_syntaxes(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
+  return dissect_acse_SEQUENCE_OF_TransferSyntaxName(FALSE, tvb, offset, pinfo, tree, hf_acse_transfer_syntaxes);
 }
-static int read_length(ASN1_SCK *a, proto_tree *tree, int hf_id, guint *len)
-{
-  guint length = 0;
-  gboolean def = FALSE;
-  int start = a->offset;
-  int ret;
-
-  ret = asn1_length_decode(a, &def, &length);
-  if (ret != ASN1_ERR_NOERROR)
-  {
-    if (tree)
-	{
-      proto_tree_add_text(tree, a->tvb, start, 0,
-        "%s: ERROR: Couldn't parse length: %s",
-        proto_registrar_get_name(hf_id), asn1_err_to_str(ret));
-    }
-    return ret;
-  }
 
-  if (len)
-    *len = length;
+static const ber_sequence_t Context_list_item_sequence[] = {
+  { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_pci },
+  { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_abstract_syntax },
+  { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_transfer_syntaxes },
+  { 0, 0, 0, NULL }
+};
 
-  if (hf_id)
-    proto_tree_add_uint(tree, hf_id, a->tvb, start, a->offset-start,
-length);
+static int
+dissect_acse_Context_list_item(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+  offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
+                                Context_list_item_sequence, hf_index, ett_acse_Context_list_item);
 
-  return ASN1_ERR_NOERROR;
+  return offset;
+}
+static int dissect_Context_list_item(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
+  return dissect_acse_Context_list_item(FALSE, tvb, offset, pinfo, tree, hf_acse_Context_list_item);
 }
-static int read_integer_value(ASN1_SCK *a, proto_tree *tree, int hf_id,
-	proto_item **new_item, guint *i, int start, guint length)
-{
-  guint integer = 0;
-  proto_item *temp_item = NULL;
-  int ret;
-
-  ret = asn1_uint32_value_decode(a, length, &integer);
-  if (ret != ASN1_ERR_NOERROR)
-  {
-    if (tree)
-	{
-      proto_tree_add_text(tree, a->tvb, start, 0,
-       "%s: ERROR: Couldn't parse value: %s",
-        proto_registrar_get_name(hf_id), asn1_err_to_str(ret));
-    }
-    return ret;
-  }
 
-  if (i)
-    *i = integer;
+static const ber_sequence_t Context_list_sequence_of[1] = {
+  { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_Context_list_item },
+};
 
-  if (hf_id)
-    temp_item = proto_tree_add_uint(tree, hf_id, a->tvb, start,
-a->offset-start, integer);
+static int
+dissect_acse_Context_list(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+  offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset,
+                                   Context_list_sequence_of, hf_index, ett_acse_Context_list);
 
-  if (new_item)
-    *new_item = temp_item;
+  return offset;
+}
+static int dissect_context_list(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
+  return dissect_acse_Context_list(FALSE, tvb, offset, pinfo, tree, hf_acse_context_list);
+}
+
+static const ber_sequence_t Default_Context_List_item_sequence[] = {
+  { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_abstract_syntax_name_impl },
+  { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_transfer_syntax_name_impl },
+  { 0, 0, 0, NULL }
+};
+
+static int
+dissect_acse_Default_Context_List_item(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+  offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
+                                Default_Context_List_item_sequence, hf_index, ett_acse_Default_Context_List_item);
 
-  return ASN1_ERR_NOERROR;
+  return offset;
+}
+static int dissect_Default_Context_List_item(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
+  return dissect_acse_Default_Context_List_item(FALSE, tvb, offset, pinfo, tree, hf_acse_Default_Context_List_item);
 }
 
-static int read_integer(ASN1_SCK *a, proto_tree *tree, int hf_id,
-	proto_item **new_item, guint *i)
-{
-  guint cls, con, tag;
-  gboolean def;
-  guint length;
-  int start = a->offset;
-  int ret;
-
-  ret = asn1_header_decode(a, &cls, &con, &tag, &def, &length);
-  if (ret != ASN1_ERR_NOERROR)
-  {
-    if (tree)
-	{
-      proto_tree_add_text(tree, a->tvb, start, 0,
-        "%s: ERROR: Couldn't parse header: %s",
-        (hf_id != -1) ? proto_registrar_get_name(hf_id) : "LDAP message",
-        asn1_err_to_str(ret));
-    }
-    return ret;
-  }
+static const ber_sequence_t Default_Context_List_sequence_of[1] = {
+  { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_Default_Context_List_item },
+};
 
-  return read_integer_value(a, tree, hf_id, new_item, i, start, length);
+static int
+dissect_acse_Default_Context_List(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+  offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset,
+                                   Default_Context_List_sequence_of, hf_index, ett_acse_Default_Context_List);
+
+  return offset;
 }
-/*   display asn.1 Integer type */
-static void
-show_integer(ASN1_SCK *asn,proto_tree *acse_tree,tvbuff_t *tvb,int
-*offset,guint item_len)
-{
-	  proto_tree *acse_tree_itm = NULL;
-	  proto_item *itm;
-	  int       ret;
-	  int		save_len = item_len;
-	  int		off      = *offset;
-	  itm = proto_tree_add_text(acse_tree, tvb, *offset, item_len,
-										"Integer");
-	  acse_tree_itm = proto_item_add_subtree(itm, ett_acse_itm);
-	  ret = read_integer(asn,acse_tree_itm,0,NULL,&item_len);
-	  if (ret == ASN1_ERR_NOERROR )
-			{
-				*offset = asn->offset;
-				itm = proto_tree_add_text(acse_tree_itm, tvb, (*offset)-item_len,
-											item_len,
-											"Integer value: %u",item_len);
-			}
-	  else
-			{
-		  /* can't dissect item. Skip it. */
-		  *offset = off+ save_len;
-			}
+static int dissect_default_contact_list(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
+  return dissect_acse_Default_Context_List(FALSE, tvb, offset, pinfo, tree, hf_acse_default_contact_list);
+}
+
+
+static const value_string acse_Syntactic_context_list_vals[] = {
+  {   0, "context-list" },
+  {   1, "default-contact-list" },
+  { 0, NULL }
+};
+
+static const ber_choice_t Syntactic_context_list_choice[] = {
+  {   0, BER_CLASS_CON, 0, 0, dissect_context_list },
+  {   1, BER_CLASS_CON, 1, 0, dissect_default_contact_list },
+  { 0, 0, 0, 0, NULL }
+};
+
+static int
+dissect_acse_Syntactic_context_list(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+  offset = dissect_ber_choice(pinfo, tree, tvb, offset,
+                              Syntactic_context_list_choice, hf_index, ett_acse_Syntactic_context_list);
 
+  return offset;
 }
-static void
-show_protocol_version(ASN1_SCK *asn,proto_tree *acse_tree,tvbuff_t *tvb,int
-*offset,int item_len,int tag)
-{
-	  proto_tree *acse_tree_itm = NULL;
-	  proto_item *itm;
-	  guint16       flags;
-	  gint length;
-/* do we have enough bytes to dissect this item ? */
-			if( ( length = tvb_reported_length_remaining(tvb, *offset))  <
-										(asn->offset -*offset)+ item_len )
-			{
-					proto_tree_add_text(acse_tree, tvb, *offset, item_len,
-							"Wrong Item.Need %u bytes but have %u", item_len,length);
-					return;
-			}
+static int dissect_p_context_definition_list(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
+  return dissect_acse_Syntactic_context_list(FALSE, tvb, offset, pinfo, tree, hf_acse_p_context_definition_list);
+}
+
+
+
+static int
+dissect_acse_ASOI_identifier(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index,
+                                  NULL);
 
-	  itm = proto_tree_add_text(acse_tree, tvb, *offset,(asn->offset -*offset)+
-								item_len,
-								val_to_str(tag, request_sequence_top_vals,"Unknown item (0x%02x)"));
-	  acse_tree_itm = proto_item_add_subtree(itm, ett_acse_itm);
-	  *offset = asn->offset;
-	  flags = tvb_get_ntohs(tvb, *offset);
-	  proto_tree_add_boolean(acse_tree_itm,hf_protocol_version, tvb, *offset,
-							2, flags);
-	  *offset = *offset + item_len;
-	  asn->offset = *offset;
+  return offset;
 }
-static void
-print_oid_value(ASN1_SCK *asn,proto_tree *acse_tree,tvbuff_t *tvb,int
-*offset,int item_len)
-{
-	guint		ret;
-	subid_t		*oid;
-	guint		len;
-	gchar		*display_string;
-	guint		length;
-	guint		start=*offset;
-
-		ret = asn1_oid_value_decode (asn, item_len, &oid, &len);
-		if (ret != ASN1_ERR_NOERROR)
-		{
-			return ;
-		}
-		length = asn->offset - start;
-		display_string = format_oid(oid, len);
-		proto_tree_add_text(acse_tree, tvb, *offset,length,"Value:%s",
-							display_string);
-		g_free(display_string);
-		(*offset)=start+item_len;
-		asn->offset = (*offset);
+static int dissect_asoi_identifier_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
+  return dissect_acse_ASOI_identifier(TRUE, tvb, offset, pinfo, tree, hf_acse_asoi_identifier);
 }
-static void
-print_oid(ASN1_SCK *asn,proto_tree *acse_tree,tvbuff_t *tvb,int *offset,int
-item_len,gchar* d_s)
-{
-	guint		ret;
-	subid_t		*oid;
-	guint		len;
-	guint		nbytes;
-	gchar		*display_string;
-	guint		length;
-	guint		start=*offset;
-
-		ret = asn1_oid_decode ( asn, &oid, &len, &nbytes);
-
-		if (ret != ASN1_ERR_NOERROR)
-		{
-			return ;
-		}
-		length = asn->offset - start;
-		display_string = format_oid(oid, len);
-		proto_tree_add_text(acse_tree, tvb, *offset,length,"Value:%s",
-							display_string);
-		if(d_s)
-		{
-			/*   copy OID   */
-			strcpy(d_s,display_string);
-		}
-		g_free(display_string);
-		(*offset)=start+item_len;
-		asn->offset = (*offset);
+static int dissect_identifier(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
+  return dissect_acse_ASOI_identifier(FALSE, tvb, offset, pinfo, tree, hf_acse_identifier);
 }
 
-static void
-print_value(proto_tree *acse_tree,tvbuff_t *tvb,int
-*offset,int item_len)
-{
-	  gchar  *tmp;
-		tmp = tvb_bytes_to_str(tvb, *offset, item_len);
-		proto_tree_add_text(acse_tree, tvb, *offset, item_len, tmp);
+static const ber_sequence_t ASOI_tag_item_sequence[] = {
+  { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_qualifier },
+  { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_identifier },
+  { 0, 0, 0, NULL }
+};
+
+static int
+dissect_acse_ASOI_tag_item(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+  offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
+                                ASOI_tag_item_sequence, hf_index, ett_acse_ASOI_tag_item);
+
+  return offset;
+}
+static int dissect_ASOI_tag_item(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
+  return dissect_acse_ASOI_tag_item(FALSE, tvb, offset, pinfo, tree, hf_acse_ASOI_tag_item);
 }
+
+static const ber_sequence_t ASOI_tag_sequence_of[1] = {
+  { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_ASOI_tag_item },
+};
+
 static int
-get_integer_value(ASN1_SCK *asn,int length,int *offset)
-{
-	int off = *offset;
-	int asn_off = asn->offset;
-	int item_len = -1;
-	int ret;
-	/* align   pointers */
-	*offset=asn->offset;
-	ret = asn1_uint32_value_decode(asn, length, &item_len);
-	/* return to present position */
-	*offset = off;
-	asn->offset = asn_off;
-
-    if (ret != ASN1_ERR_NOERROR )
-	{
-		return -1;
-	}
-	else
-	{
-		return item_len;
-	}
+dissect_acse_ASOI_tag(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+  offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset,
+                                   ASOI_tag_sequence_of, hf_index, ett_acse_ASOI_tag);
 
+  return offset;
+}
+static int dissect_called_asoi_tag_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
+  return dissect_acse_ASOI_tag(TRUE, tvb, offset, pinfo, tree, hf_acse_called_asoi_tag);
+}
+static int dissect_calling_asoi_tag_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
+  return dissect_acse_ASOI_tag(TRUE, tvb, offset, pinfo, tree, hf_acse_calling_asoi_tag);
 }
-static void
-show_fully_encoded_seq(ASN1_SCK *asn,proto_tree *acse_tree,tvbuff_t *tvb,int
-*offset,int item_len)
-{
-	  proto_tree *acse_tree_ms = NULL;
-	  guint length;
-	  guint   type;
-	  proto_item *ms;
-	  guint   new_item_len;
-	  guint   start = *offset;
-	  guint   header_len;
-	  guint   acse = 0;      /*   no acse   id   */
-	  int		old_offset;
-			/*  print seq */
-			while ( item_len > 0 && tvb_reported_length_remaining(tvb, *offset) > 0 )
-			{
-				old_offset = *offset ;
-			/*  get item type  */
-			type = tvb_get_guint8(tvb, *offset);
-			/* skip type */
-			(*offset)++;
-			asn->offset = *offset;
-			/* get length  */
-				if (read_length(asn, acse_tree, 0, &new_item_len) != ASN1_ERR_NOERROR)
-				{
-					(*offset)=start+item_len;
-					asn->offset = (*offset);
-					return  ;
-				}
-			/* do we have enough bytes to dissect ? */
-			if( ( length =tvb_reported_length_remaining(tvb, *offset))  <
-														new_item_len )
-			{
-					proto_tree_add_text(acse_tree, tvb, *offset, new_item_len,
-							"Wrong item.Need %u bytes but have %u", new_item_len,length);
-					(*offset)=start+item_len;
-					asn->offset = (*offset);
-				    return ;
-			}
-				header_len = asn->offset - (*offset) +1;
-					ms = proto_tree_add_text(acse_tree, tvb, *offset-1,
-										new_item_len+(asn->offset-*offset)+1,
-										val_to_str(type, presentation_data_values,
-										"Unknown item (0x%02x)"));
-				acse_tree_ms = proto_item_add_subtree(ms, ett_acse_ms);
-				*offset = asn->offset;
-
-
-			switch(type)
-				{
-			case PRESENTATION_CONTEXT_IDENTIFIER:
-				{
-				acse	=	get_integer_value(asn,new_item_len,offset);
-				print_value(acse_tree_ms,tvb,offset,new_item_len);
-				}
-					break;
-			case ABSTRACT_SYNTAX_NAME:
-				print_oid_value(asn,acse_tree_ms,tvb,offset,new_item_len);
-					break;
-
-			case OCTET_ALIGNED:
-				break;
-			case SINGLE_ASN1_TYPE:
-				{
-						proto_item *acse_ms;
-					/*  yes, we have to call ACSE dissector    */
-				acse_ms = proto_tree_add_text(acse_tree_ms, tvb, *offset,
-										new_item_len+(asn->offset-*offset),
-										"user data");
-					/*  call acse dissector  */
-				call_app_dissector(tvb,*offset,new_item_len,global_pinfo,global_tree,acse_tree_ms);
-				}
-					break;
-			case ARBITRARY:
-				print_value(acse_tree_ms,tvb,offset,new_item_len);
-					break;
-			default:
-					proto_tree_add_text(acse_tree, tvb, *offset,
-										new_item_len+(asn->offset-*offset),
-					"Unknown asn.1 parameter: (0x%02x)", type);
-				}
-				*offset = old_offset+new_item_len+header_len;
-				item_len-=new_item_len+header_len;
-			}
-			/*   align the pointer */
-			(*offset)=start+item_len;
-			asn->offset = (*offset);
 
+static const ber_sequence_t Association_data_sequence_of[1] = {
+  { BER_CLASS_UNI, 8, NULL, dissect_Association_data_item },
+};
+
+static int
+dissect_acse_Association_data(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+  offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset,
+                                   Association_data_sequence_of, hf_index, ett_acse_Association_data);
+
+  return offset;
+}
+static int dissect_AARQ_user_information_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
+  return dissect_acse_Association_data(TRUE, tvb, offset, pinfo, tree, hf_acse_AARQ_user_information);
+}
+static int dissect_AARE_user_information_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
+  return dissect_acse_Association_data(TRUE, tvb, offset, pinfo, tree, hf_acse_AARE_user_information);
+}
+static int dissect_RLRQ_user_information_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
+  return dissect_acse_Association_data(TRUE, tvb, offset, pinfo, tree, hf_acse_RLRQ_user_information);
+}
+static int dissect_RLRE_user_information_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
+  return dissect_acse_Association_data(TRUE, tvb, offset, pinfo, tree, hf_acse_RLRE_user_information);
+}
+static int dissect_ABRT_user_information_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
+  return dissect_acse_Association_data(TRUE, tvb, offset, pinfo, tree, hf_acse_ABRT_user_information);
 }
 
-static void
-show_acse_user_information(ASN1_SCK *asn,proto_tree
-*acse_tree,tvbuff_t *tvb,int *offset,int item_len)
-{
-	  proto_tree *acse_tree_ms = NULL;
-	  proto_tree *acse_tree_ab = NULL;
-	  guint length;
-	  guint   type;
-	  proto_item *ms;
-	  proto_item *ab;
-	  guint   new_item_len;
-	  guint   code_item_len;
-	  guint   start = *offset;
-	  guint   header_len;
-			/*  get item type  */
-			type = tvb_get_guint8(tvb, *offset) & 0x1f;
-			/* skip type */
-			(*offset)++;
-			asn->offset = *offset;
-			/* get length  */
-				if (read_length(asn, acse_tree, 0, &new_item_len) != ASN1_ERR_NOERROR)
-				{
-					(*offset)=start+item_len;
-					asn->offset = (*offset);
-					return  ;
-				}
-
-			/* do we have enough bytes to dissect ? */
-			if( ( length =tvb_reported_length_remaining(tvb, *offset))  <
-														new_item_len )
-			{
-					proto_tree_add_text(acse_tree, tvb, *offset, new_item_len,
-							"Wrong item.Need %u bytes but have %u", new_item_len,length);
-					(*offset)=start+item_len;
-					asn->offset = (*offset);
-				    return ;
-			}
-				header_len = asn->offset - (*offset) +1;
-				ms = proto_tree_add_text(acse_tree, tvb, *offset-1,
-										new_item_len+(asn->offset-*offset)+1,
-										val_to_str(type,response_sequence_top_vals,
-										"Unknown item (0x%02x)"));
-				acse_tree_ms = proto_item_add_subtree(ms, ett_acse_ms);
-				*offset = asn->offset;
-				/*  get item type  */
-				type = tvb_get_guint8(tvb, *offset) & 0x1f;
-				/* do we have user or provider abort ?  */
-				ab = proto_tree_add_text(acse_tree_ms, tvb, *offset,
-										new_item_len+(asn->offset-*offset),
-										val_to_str(type,acse_user_information_vals,
-										"Unknown item (0x%02x)"));
-				acse_tree_ab = proto_item_add_subtree(ab, ett_acse_ms);
-
-				if(type!= ACSE_EXTERNAL)
-				{
-					(*offset)=start+item_len;
-					asn->offset = (*offset);
-					return  ;
-				}
-
-				/*  skip type of item*/
-				(*offset)++;
-				asn->offset = *offset;
-				/* get length  */
-				if (read_length(asn, acse_tree_ab, 0, &code_item_len) != 
-ASN1_ERR_NOERROR)
-				{
-					(*offset)=start+item_len;
-					asn->offset = (*offset);
-					return  ;
-				}
-				/* do we have enough bytes to dissect ? */
-				if( ( length =tvb_reported_length_remaining(tvb, *offset))  <
-														code_item_len )
-				{
-					proto_tree_add_text(acse_tree_ab, tvb, *offset, code_item_len,
-							"Wrong item.Need %u bytes but have %u", code_item_len,length);
-					(*offset)=start+item_len;
-					asn->offset = (*offset);
-				    return ;
-				}
-				*offset = asn->offset;
-
-				show_fully_encoded_seq(asn,acse_tree_ab,tvb,offset,code_item_len);
-			/*   align the pointer */
-			(*offset)=start+item_len;
-			asn->offset = (*offset);
+static const ber_sequence_t AARQ_apdu_sequence[] = {
+  { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_AARQ_protocol_version_impl },
+  { BER_CLASS_CON, 1, 0, dissect_AARQ_aSO_context_name },
+  { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_called_AP_title },
+  { BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_called_AE_qualifier },
+  { BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL, dissect_called_AP_invocation_identifier },
+  { BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL, dissect_called_AE_invocation_identifier },
+  { BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_calling_AP_title },
+  { BER_CLASS_CON, 7, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_calling_AE_qualifier },
+  { BER_CLASS_CON, 8, BER_FLAGS_OPTIONAL, dissect_calling_AP_invocation_identifier },
+  { BER_CLASS_CON, 9, BER_FLAGS_OPTIONAL, dissect_calling_AE_invocation_identifier },
+  { BER_CLASS_CON, 10, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_sender_acse_requirements_impl },
+  { BER_CLASS_CON, 11, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mechanism_name_impl },
+  { BER_CLASS_CON, 12, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_calling_authentication_value },
+  { BER_CLASS_CON, 13, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_aSO_context_name_list_impl },
+  { BER_CLASS_CON, 29, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_implementation_information_impl },
+  { BER_CLASS_CON, 14, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_p_context_definition_list },
+  { BER_CLASS_CON, 15, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_called_asoi_tag_impl },
+  { BER_CLASS_CON, 16, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_calling_asoi_tag_impl },
+  { BER_CLASS_CON, 30, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_AARQ_user_information_impl },
+  { 0, 0, 0, NULL }
+};
+
+static int
+dissect_acse_AARQ_apdu(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+  offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
+                                AARQ_apdu_sequence, hf_index, ett_acse_AARQ_apdu);
+
+  return offset;
+}
+static int dissect_aarq_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
+  return dissect_acse_AARQ_apdu(TRUE, tvb, offset, pinfo, tree, hf_acse_aarq);
 }
 
-static void
-show_acse_result_source_diagnostic(ASN1_SCK *asn,proto_tree
-*acse_tree,tvbuff_t *tvb,int *offset,int item_len)
-{
-	  proto_tree *acse_tree_ms = NULL;
-	  proto_tree *acse_tree_ab = NULL;
-	  guint length;
-	  guint   type;
-	  proto_item *ms;
-	  proto_item *ab;
-	  guint   new_item_len;
-	  guint   code_item_len;
-	  guint   start = *offset;
-	  guint   header_len;
-	  proto_tree *acse_tree_pr = NULL;
-	  proto_item *pr;
-	  int	value;
-			/*  get item type  */
-			type = tvb_get_guint8(tvb, *offset) & 0x1f;
-			/* skip type */
-			(*offset)++;
-			asn->offset = *offset;
-			/* get length  */
-				if (read_length(asn, acse_tree, 0, &new_item_len) != ASN1_ERR_NOERROR)
-				{
-					(*offset)=start+item_len;
-					asn->offset = (*offset);
-					return  ;
-				}
-
-			/* do we have enough bytes to dissect ? */
-			if( ( length =tvb_reported_length_remaining(tvb, *offset))  <
-														new_item_len )
-			{
-					proto_tree_add_text(acse_tree, tvb, *offset, new_item_len,
-							"Wrong item.Need %u bytes but have %u", new_item_len,length);
-					(*offset)=start+item_len;
-					asn->offset = (*offset);
-				    return ;
-			}
-				header_len = asn->offset - (*offset) +1;
-				ms = proto_tree_add_text(acse_tree, tvb, *offset-1,
-										new_item_len+(asn->offset-*offset)+1,
-										val_to_str(type,response_sequence_top_vals,
-										"Unknown item (0x%02x)"));
-				acse_tree_ms = proto_item_add_subtree(ms, ett_acse_ms);
-				*offset = asn->offset;
-			/*  get item type  */
-			type = tvb_get_guint8(tvb, *offset) & 0x1f;
-			/* do we have user or provider abort ?  */
-				ab = proto_tree_add_text(acse_tree_ms, tvb, *offset,
-										new_item_len+(asn->offset-*offset),
-										val_to_str(type,acse_associate_source_diagnostic_vals,
-										"Unknown item (0x%02x)"));
-				acse_tree_ab = proto_item_add_subtree(ab, ett_acse_ms);
-
-				/*  skip type of abort*/
-				(*offset)++;
-				asn->offset = *offset;
-				/* get length  */
-				if (read_length(asn, acse_tree, 0, &code_item_len) != ASN1_ERR_NOERROR)
-				{
-					(*offset)=start+item_len;
-					asn->offset = (*offset);
-					return  ;
-				}
-				*offset = asn->offset;
-				/* do we have enough bytes to dissect ? */
-				if( ( length =tvb_reported_length_remaining(tvb, *offset))  <
-														code_item_len )
-				{
-					proto_tree_add_text(acse_tree, tvb, *offset, code_item_len,
-							"Wrong item.Need %u bytes but have %u", code_item_len,length);
-					(*offset)=start+item_len;
-					asn->offset = (*offset);
-				    return ;
-				}
-
-				/*  skip type of constant*/
-				(*offset)++;
-				asn->offset = *offset;
-				/* get length  */
-				if (read_length(asn, acse_tree_ab, 0, &code_item_len) != 
-ASN1_ERR_NOERROR)
-				{
-					(*offset)=start+item_len;
-					asn->offset = (*offset);
-					return  ;
-				}
-				/* do we have enough bytes to dissect ? */
-				if( ( length =tvb_reported_length_remaining(tvb, *offset))  <
-														code_item_len )
-				{
-					proto_tree_add_text(acse_tree_ab, tvb, *offset, code_item_len,
-							"Wrong item.Need %u bytes but have %u", code_item_len,length);
-					(*offset)=start+item_len;
-					asn->offset = (*offset);
-				    return ;
-				}
-				*offset = asn->offset;
-			    value	=	get_integer_value(asn,code_item_len,offset);
-				if(type == ACSE_SERVICE_USER )
-				{
-				pr = proto_tree_add_text(acse_tree_ab, tvb, *offset,
-								code_item_len+(asn->offset-*offset),
-								val_to_str(value , acse_service_user_values_vals,
-								"Unknown item (0x%02x)"));
-				}
-				else
-				{
-				pr = proto_tree_add_text(acse_tree_ab, tvb, *offset,
-								code_item_len+(asn->offset-*offset),
-								val_to_str(value , acse_service_provider_values_vals,
-								"Unknown item (0x%02x)"));
-				}
-
-				acse_tree_pr = proto_item_add_subtree(pr, ett_acse_ms);
-				print_value(acse_tree_pr,tvb,offset,code_item_len);
-
-				*offset = start+new_item_len+header_len;
-				item_len-=new_item_len+header_len;
-			/*   align the pointer */
-			(*offset)=start+item_len;
-			asn->offset = (*offset);
+static const asn_namedbit T_AARE_protocol_version_bits[] = {
+  {  0, &hf_acse_T_AARE_protocol_version_version1, -1, -1, "version1", NULL },
+  { 0, NULL, 0, 0, NULL, NULL }
+};
+
+static int
+dissect_acse_T_AARE_protocol_version(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+  offset = dissect_ber_bitstring(implicit_tag, pinfo, tree, tvb, offset,
+                                 T_AARE_protocol_version_bits, hf_index, ett_acse_T_AARE_protocol_version,
+                                 NULL);
 
+  return offset;
 }
-static void
-show_acse_result(ASN1_SCK *asn,proto_tree
-*acse_tree,tvbuff_t *tvb,int *offset,int item_len)
-{
-	  proto_tree *acse_tree_ms = NULL;
-	  guint length;
-	  guint   type;
-	  proto_item *ms;
-	  guint   new_item_len;
-	  guint   code_item_len;
-	  guint   start = *offset;
-	  guint   header_len;
-	  proto_tree *acse_tree_pr = NULL;
-	  proto_item *pr;
-	  int	value;
-			/*  get item type  */
-			type = tvb_get_guint8(tvb, *offset) & 0x1f;
-			/* skip type */
-			(*offset)++;
-			asn->offset = *offset;
-			/* get length  */
-				if (read_length(asn, acse_tree, 0, &new_item_len) != ASN1_ERR_NOERROR)
-				{
-					(*offset)=start+item_len;
-					asn->offset = (*offset);
-					return  ;
-				}
-
-			/* do we have enough bytes to dissect ? */
-			if( ( length =tvb_reported_length_remaining(tvb, *offset))  <
-														new_item_len )
-			{
-					proto_tree_add_text(acse_tree, tvb, *offset, new_item_len,
-							"Wrong item.Need %u bytes but have %u", new_item_len,length);
-					(*offset)=start+item_len;
-					asn->offset = (*offset);
-				    return ;
-			}
-				header_len = asn->offset - (*offset) +1;
-				ms = proto_tree_add_text(acse_tree, tvb, *offset-1,
-										new_item_len+(asn->offset-*offset)+1,
-										val_to_str(type,response_sequence_top_vals,
-										"Unknown item (0x%02x)"));
-				acse_tree_ms = proto_item_add_subtree(ms, ett_acse_ms);
-				*offset = asn->offset;
-				/*  skip type */
-				(*offset)++;
-				asn->offset = *offset;
-				/* get length  */
-				if (read_length(asn, acse_tree, 0, &code_item_len) != ASN1_ERR_NOERROR)
-				{
-					(*offset)=start+item_len;
-					asn->offset = (*offset);
-					return  ;
-				}
-				/* do we have enough bytes to dissect ? */
-				if( ( length =tvb_reported_length_remaining(tvb, *offset))  <
-														code_item_len )
-				{
-					proto_tree_add_text(acse_tree, tvb, *offset, code_item_len,
-							"Wrong item.Need %u bytes but have %u", code_item_len,length);
-					(*offset)=start+item_len;
-					asn->offset = (*offset);
-				    return ;
-				}
-				*offset = asn->offset;
-			    value	=	get_integer_value(asn,code_item_len,offset);
-				pr = proto_tree_add_text(acse_tree_ms, tvb, *offset,
-								code_item_len+(asn->offset-*offset),
-								val_to_str(value , associate_result_values_vals,
-								"Unknown item (0x%02x)"));
-				acse_tree_pr = proto_item_add_subtree(pr, ett_acse_ms);
-				print_value(acse_tree_pr,tvb,offset,code_item_len);
-
-				*offset = start+new_item_len+header_len;
-				item_len-=new_item_len+header_len;
-			/*   align the pointer */
-			(*offset)=start+item_len;
-			asn->offset = (*offset);
+static int dissect_AARE_protocol_version_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
+  return dissect_acse_T_AARE_protocol_version(TRUE, tvb, offset, pinfo, tree, hf_acse_AARE_protocol_version);
 }
 
-static void
-show_oid(ASN1_SCK *asn,proto_tree
-*acse_tree,tvbuff_t *tvb,int *offset,int item_len,const value_string* 
-v_s,gchar* oid)
-{
-	  proto_tree *acse_tree_ms = NULL;
-	  guint length;
-	  guint   type;
-	  proto_item *ms;
-	  guint   new_item_len;
-	  guint   start = *offset;
-	  guint   header_len;
-	  int		old_offset;
-				old_offset = *offset ;
-			/*  get item type  */
-			type = tvb_get_guint8(tvb, *offset) & 0x1f;
-			/* skip type */
-			(*offset)++;
-			asn->offset = *offset;
-			/* get length  */
-				if (read_length(asn, acse_tree, 0, &new_item_len) != ASN1_ERR_NOERROR)
-				{
-					(*offset)=start+item_len;
-					asn->offset = (*offset);
-					return  ;
-				}
-
-			/* do we have enough bytes to dissect ? */
-			if( ( length =tvb_reported_length_remaining(tvb, *offset))  <
-														new_item_len )
-			{
-					proto_tree_add_text(acse_tree, tvb, *offset, new_item_len,
-							"Wrong item.Need %u bytes but have %u", new_item_len,length);
-					(*offset)=start+item_len;
-					asn->offset = (*offset);
-				    return ;
-			}
-				header_len = asn->offset - (*offset) +1;
-				ms = proto_tree_add_text(acse_tree, tvb, *offset-1,
-										new_item_len+(asn->offset-*offset)+1,
-										val_to_str(type, v_s,
-										"Unknown item (0x%02x)"));
-				acse_tree_ms = proto_item_add_subtree(ms, ett_acse_ms);
-				*offset = asn->offset;
-				print_oid(asn,acse_tree_ms,tvb,offset,new_item_len,oid);
-				*offset = old_offset+new_item_len+header_len;
-				item_len-=new_item_len+header_len;
-			/*   align the pointer */
-			(*offset)=start+item_len;
-			asn->offset = (*offset);
+
+static int
+dissect_acse_T_aSO_context_name1(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+  offset = dissect_ber_object_identifier(FALSE, pinfo, tree, tvb, offset,
+                                         hf_index, object_identifier_id);
+
+
+  return offset;
+}
+static int dissect_AARE_aSO_context_name(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
+  return dissect_acse_T_aSO_context_name1(FALSE, tvb, offset, pinfo, tree, hf_acse_AARE_aSO_context_name);
 }
-static void
-show_fully_encoded_data(ASN1_SCK *asn,proto_tree *acse_tree,tvbuff_t
-*tvb,int *offset,int item_len)
-{
-	  proto_tree *acse_tree_ms = NULL;
-	  proto_tree *acse_tree_pc = NULL;
-	  guint    length;
-	  guint   type;
-	  guint   header_len;
-	  proto_item *ms;
-	  guint   new_item_len;
-	  guint   start = asn->offset;
-	  guint	  item_length = item_len;
-	  acse_tree_pc = acse_tree;
-
-/* do we have enough bytes to dissect ? */
-			if( ( length =tvb_reported_length_remaining(tvb, *offset))  < (guint)item_len )
-			{
-					proto_tree_add_text(acse_tree_pc, tvb, *offset, item_len,
-							"Wrong item.Need %u bytes but have %u", item_len,length);
-					/*   align the pointer */
-					(*offset)=start+item_length;
-					asn->offset = (*offset);
-					return ;
-			}
-			*offset =asn->offset;
-			start = *offset;
-			/*  read the rest */
-			while ( item_len > 0 && tvb_reported_length_remaining(tvb, *offset) > 0 )
-			{
-				int old_offset = *offset;
-			/*  get item type  */
-			type = tvb_get_guint8(tvb, *offset);
-			/* skip type */
-			(*offset)++;
-			asn->offset = *offset;
-			/* get length  */
-				if (read_length(asn, acse_tree_pc, 0, &new_item_len) !=
-								ASN1_ERR_NOERROR)
-				{
-					/*   align the pointer */
-					(*offset)=start+item_length;
-					asn->offset = (*offset);
-					return  ;
-				}
-				header_len = asn->offset - (*offset) +1;
-			/* do we have enough bytes to dissect ? */
-			if( ( length =tvb_reported_length_remaining(tvb, *offset))  <
-														new_item_len )
-			{
-					proto_tree_add_text(acse_tree_pc, tvb, *offset, new_item_len,
-							"Wrong item.Need %u bytes but have %u", new_item_len,length);
-					/*   align the pointer */
-					(*offset)=start+item_length;
-					asn->offset = (*offset);
-					return ;
-			}
-				ms = proto_tree_add_text(acse_tree_pc, tvb, *offset-1,
-										new_item_len+(asn->offset-*offset)+1,
-										val_to_str(type, presentation_context_definition_vals,
-										"Unknown item (0x%02x)"));
-				acse_tree_ms = proto_item_add_subtree(ms, ett_acse_ms);
-				*offset = asn->offset;
-
-
-			switch(type)
-				{
-
-			case SEQUENCE:
-			show_fully_encoded_seq(asn,acse_tree_ms,tvb,offset,new_item_len);
-			*offset = old_offset+(new_item_len+header_len);
-					break;
-
-			default:
-					proto_tree_add_text(acse_tree_ms, tvb, *offset,
-										new_item_len+(asn->offset-*offset),
-					"Unknown asn.1 parameter: (0x%02x)", type);
-					*offset = old_offset+(new_item_len+header_len);
-				}
-				item_len = item_len -  (new_item_len+header_len);
 
-			}
+
+static const value_string acse_Associate_result_vals[] = {
+  {   0, "accepted" },
+  {   1, "rejected-permanent" },
+  {   2, "rejected-transient" },
+  { 0, NULL }
+};
 
 
-					/*   align the pointer */
-					(*offset)=start+item_length;
-					asn->offset = (*offset);
+static int
+dissect_acse_Associate_result(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index,
+                                  NULL);
+
+  return offset;
+}
+static int dissect_AARE_result(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
+  return dissect_acse_Associate_result(FALSE, tvb, offset, pinfo, tree, hf_acse_AARE_result);
 }
-static void
-show_abort_reason(ASN1_SCK *asn,proto_tree *acse_tree,tvbuff_t
-*tvb,int *offset,int item_len)
-{
-	gint		length;
-	gint		value;
-    proto_tree	*acse_tree_pc = NULL;
-	proto_item	*itu;
-	guint		new_item_len;
-	guint		start = *offset;
-	int			save_len = item_len;
-/* do we have enough bytes to dissect this item ? */
-			if( ( length =tvb_reported_length_remaining(tvb, *offset))  < item_len )
-			{
-					proto_tree_add_text(acse_tree, tvb, *offset, item_len,
-							"Wrong Item.Need %u bytes but have %u", item_len,length);
-							*offset = asn->offset;
-							return;
-			}
 
-			if(item_len <= 0)
-			{
-					proto_tree_add_text(acse_tree, tvb, *offset, item_len,
-							"Reason not specified");
-							*offset = asn->offset;
-							return;
-			}
-			itu = proto_tree_add_text(acse_tree, tvb, *offset,ABORT_REASON_LEN,
-					"Reason");
-			acse_tree_pc = proto_item_add_subtree(itu, ett_acse_ms);
-			(*offset)++; /* skip type  */
-			asn->offset =  *offset;
-			item_len--;
-			/* get length  */
-				if (read_length(asn, acse_tree_pc, 0, &new_item_len) !=
-								ASN1_ERR_NOERROR)
-				{
-							*offset = asn->offset;
-							return;
-				}
-			/*  try to get reason  */
-			value	=	get_integer_value(asn,new_item_len,offset);
-
-			proto_tree_add_text(acse_tree_pc, tvb, *offset+1,new_item_len,
-					val_to_str(value,abort_reason,"Unknown item (0x%02x)"));
-			item_len-=(asn->offset-*offset)+new_item_len;
-			*offset = asn->offset+new_item_len;
-			asn->offset = *offset;
-			/*  do we have User information field  ?  */
-			if(item_len > 0)
-			{
-				show_acse_user_information(asn,acse_tree,tvb,offset,item_len);
-			}
-			/*   align the pointer */
-			(*offset)=start+save_len;
-			asn->offset = (*offset);
+
+static const value_string acse_T_acse_service_user_vals[] = {
+  {   0, "null" },
+  {   1, "no-reason-given" },
+  {   2, "application-context-name-not-supported" },
+  {   3, "calling-AP-title-not-recognized" },
+  {   4, "calling-AP-invocation-identifier-not-recognized" },
+  {   5, "calling-AE-qualifier-not-recognized" },
+  {   6, "calling-AE-invocation-identifier-not-recognized" },
+  {   7, "called-AP-title-not-recognized" },
+  {   8, "called-AP-invocation-identifier-not-recognized" },
+  {   9, "called-AE-qualifier-not-recognized" },
+  {  10, "called-AE-invocation-identifier-not-recognized" },
+  {  11, "authentication-mechanism-name-not-recognized" },
+  {  12, "authentication-mechanism-name-required" },
+  {  13, "authentication-failure" },
+  {  14, "authentication-required" },
+  { 0, NULL }
+};
+
+
+static int
+dissect_acse_T_acse_service_user(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index,
+                                  NULL);
+
+  return offset;
+}
+static int dissect_acse_service_user(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
+  return dissect_acse_T_acse_service_user(FALSE, tvb, offset, pinfo, tree, hf_acse_acse_service_user);
 }
 
-static void
-show_disconnect_pdu(ASN1_SCK *asn,proto_tree *acse_tree,tvbuff_t
-*tvb,int *offset,int item_len)
-{
-	gint		length;
-	gint		value;
-    proto_tree	*acse_tree_pc = NULL;
-	proto_item	*itu;
-	guint		new_item_len;
-	guint		start = *offset;
-	int			save_len = item_len;
-/* do we have enough bytes to dissect this item ? */
-			if( ( length =tvb_reported_length_remaining(tvb, *offset))  < item_len )
-			{
-					proto_tree_add_text(acse_tree, tvb, *offset, item_len,
-							"Wrong Item.Need %u bytes but have %u", item_len,length);
-							*offset = asn->offset;
-							return;
-			}
 
-			if(item_len <= 0)
-			{
-					proto_tree_add_text(acse_tree, tvb, *offset, item_len,
-							"Reason not specified");
-							*offset = asn->offset;
-							return;
-			}
+static const value_string acse_T_acse_service_provider_vals[] = {
+  {   0, "null" },
+  {   1, "no-reason-given" },
+  {   2, "no-common-acse-version" },
+  { 0, NULL }
+};
 
-			if( tvb_get_guint8(tvb, *offset) == RELEASE_REQUEST_OR_RESPONSE_REASON )  /* is it a reason ? */
-			{
-			itu = proto_tree_add_text(acse_tree, tvb, *offset,ABORT_REASON_LEN,
-					"Reason");
-			acse_tree_pc = proto_item_add_subtree(itu, ett_acse_ms);
-			(*offset)++; /* skip type  */
-			asn->offset =  *offset;
-			item_len--;
-			/* get length  */
-				if (read_length(asn, acse_tree_pc, 0, &new_item_len) !=
-								ASN1_ERR_NOERROR)
-				{
-				proto_tree_add_text(acse_tree, tvb, *offset, item_len,
-							"Can't decode item length");
-							*offset = asn->offset;
-							return;
-				}
-			/*  try to get reason  */
-			value	=	get_integer_value(asn,new_item_len,offset);
-
-			proto_tree_add_text(acse_tree_pc, tvb, *offset+1,new_item_len,
-					val_to_str(value,release_response_reason,"Unknown item (0x%02x)"));
-			item_len-=(asn->offset-*offset)+new_item_len;
-			*offset = asn->offset+new_item_len;
-			asn->offset = *offset;
-			}
-			/*  do we have User information field  ?  */
-			if(item_len > 0)
-			{
-				show_acse_user_information(asn,acse_tree,tvb,offset,item_len);
-			}
-			/*   align the pointer */
-			(*offset)=start+save_len;
-			asn->offset = (*offset);
+
+static int
+dissect_acse_T_acse_service_provider(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index,
+                                  NULL);
+
+  return offset;
+}
+static int dissect_acse_service_provider(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
+  return dissect_acse_T_acse_service_provider(FALSE, tvb, offset, pinfo, tree, hf_acse_acse_service_provider);
 }
-static void
-show_user_data(ASN1_SCK *asn,proto_tree *acse_tree,tvbuff_t *tvb,int
-*offset,int item_len,int tag)
-{
-	  proto_tree *acse_tree_ud = NULL;
-	  proto_tree *acse_tree_pc = NULL;
-	  proto_item *itm;
-	  proto_item *itu;
-	  guint   start = asn->offset;
-	  guint	  item_length = item_len;
-
-			itm = proto_tree_add_text(acse_tree, tvb, *offset,(asn->offset -*offset)+
-									item_len,	"User data");
-			acse_tree_ud = proto_item_add_subtree(itm, ett_acse_ms);
-			itu = proto_tree_add_text(acse_tree_ud, tvb,
-										*offset,item_len+(asn->offset-*offset),
-					val_to_str(tag, user_data_values_vals,"Unknown item (0x%02x)"));
-			acse_tree_pc = proto_item_add_subtree(itu, ett_acse_ms);
-			switch(tag)
-			{
-			case SIMPLY_ENCODED_DATA:
-				break;
-			case FULLY_ENCODED_DATA:
-				show_fully_encoded_data(asn,acse_tree_pc,tvb,offset,item_len);
-				break;
-			default:
-				break;
-			}
 
 
-			/*   align the pointer */
-			(*offset)=start+item_length;
-			asn->offset = (*offset);
+static const value_string acse_Associate_source_diagnostic_vals[] = {
+  {   1, "acse-service-user" },
+  {   2, "acse-service-provider" },
+  { 0, NULL }
+};
+
+static const ber_choice_t Associate_source_diagnostic_choice[] = {
+  {   1, BER_CLASS_CON, 1, 0, dissect_acse_service_user },
+  {   2, BER_CLASS_CON, 2, 0, dissect_acse_service_provider },
+  { 0, 0, 0, 0, NULL }
+};
+
+static int
+dissect_acse_Associate_source_diagnostic(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+  offset = dissect_ber_choice(pinfo, tree, tvb, offset,
+                              Associate_source_diagnostic_choice, hf_index, ett_acse_Associate_source_diagnostic);
 
+  return offset;
+}
+static int dissect_result_source_diagnostic(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
+  return dissect_acse_Associate_source_diagnostic(FALSE, tvb, offset, pinfo, tree, hf_acse_result_source_diagnostic);
 }
 
-/* if we can't dissect */
-static void
-dissect_parse_error(tvbuff_t *tvb, int offset, packet_info *pinfo,
-		    proto_tree *tree, const char *field_name, int ret)
-{
-	char *errstr;
-	errstr = asn1_err_to_str(ret);
-
-	if (tree != NULL)
-	{
-		proto_tree_add_text(tree, tvb, offset, 0,
-		    "ERROR: Couldn't parse %s: %s", field_name, errstr);
-		call_dissector(data_handle,
-		    tvb_new_subset(tvb, offset, -1, -1), pinfo, tree);
-	}
+
+static const value_string acse_Result_vals[] = {
+  {   0, "acceptance" },
+  {   1, "user-rejection" },
+  {   2, "provider-rejection" },
+  { 0, NULL }
+};
+
+
+static int
+dissect_acse_Result(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index,
+                                  NULL);
+
+  return offset;
+}
+static int dissect_Pcontext_result_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
+  return dissect_acse_Result(TRUE, tvb, offset, pinfo, tree, hf_acse_Pcontext_result);
 }
 
-/* display request top sequence  */
-static void
-show_request_sequence_top(ASN1_SCK *asn,proto_tree *acse_tree,tvbuff_t
-*tvb,packet_info *pinfo,int *offset,int item_len)
-{
-	int ret;
-	guint cls, con, tag,len1;
-	gint  type;
-	gboolean def;
-	proto_item *itm;
-	gint length;
-
-	while(item_len > 0 )
-	{
-			int offset_save = *offset;
-/* do we have enough bytes to dissect this item ? */
-			if( ( length =tvb_reported_length_remaining(tvb, *offset))  < item_len )
-			{
-					proto_tree_add_text(acse_tree, tvb, *offset, item_len,
-							"Wrong Item.Need %u bytes but have %u", item_len,length);
-					break;
-			}
-		/*   get  tag     */
-			type = tvb_get_guint8(tvb, *offset);
-		/* decode header  */
-			ret = asn1_header_decode(asn, &cls, &con, &tag, &def, &len1);
-
-			if (ret != ASN1_ERR_NOERROR)
-			{
-							dissect_parse_error(tvb, *offset, pinfo, acse_tree,
-									"sequence error", ret);
-				break;
-			}
-			/* add header  */
-			item_len = item_len - (asn->offset - *offset);
-			offset_save += (asn->offset - *offset);
-						/*
-						* [APPLICATION <tag>]
-						*/
-						switch (tag)
-							{
-								case USER_INFORMATION:
-									show_acse_user_information(asn,acse_tree,tvb,offset,len1);
-									break;
-								case CALLED_AE_QUALIFIER:
-								case CALLING_AE_QUALIFIER:
-									{
-									proto_tree *acse_tree_pr = NULL;
-									proto_item *pr;
-									pr = proto_tree_add_text(acse_tree,tvb,*offset,
-									len1+(asn->offset-*offset),
-									val_to_str(tag ,request_sequence_top_vals,
-									"Unknown item (0x%02x)"));
-									acse_tree_pr = proto_item_add_subtree(pr, ett_acse_ms);
-									show_integer(asn,acse_tree_pr,tvb,offset,len1);
-									}
-									break;
-								case APPLICATION_CONTEXT_NAME:
-								case CALLED_AP_TITLE:
-								case CALLING_AP_TITLE:
-								case CALLED_AP_INVOKATION_ID:
-								case CALLED_AE_INVOKATION_ID:
-								case CALLING_AP_INVOKATION_ID:
-								case CALLING_AE_INVOKATION_ID:
-								{
-									gchar oid_string[MAXSTRING];
-									show_oid(asn,acse_tree,tvb,offset,len1,(const 
-value_string*)&request_sequence_top_vals,
-												(gchar*)&oid_string);
-									if(tag == APPLICATION_CONTEXT_NAME )
-									{
-										guint   pos_in_string;
-										/* try to find real OID string from given  */
-										/* function could return "1.0.8571.1.1" or "1.0.8571.1.1 iso.0.8571.1.1" */
-										/* so try to find first blank and strip string */
-										for(pos_in_string=0;pos_in_string<strlen(oid_string);pos_in_string++)
-										{
-											if( oid_string[pos_in_string] == ' ' )
-											{
-												oid_string[pos_in_string] = 0x00;
-												break;
-											}
-										}
-										/* try to get subdissector handler using given OID */
-										if(pos_in_string )
-										{
-											if( !(app_handle = dissector_get_string_handle(application_dissector_table, oid_string)  ))
-											{
-												proto_tree_add_text(acse_tree,tvb,*offset,len1,"Unknown OID");
-											}
-										}
-									}
-								}
-									break;
-								case PROTOCOL_VERSION:
-									show_protocol_version(asn,acse_tree,tvb,offset,len1,tag);
-									break;
-								default:
-									itm = proto_tree_add_text(acse_tree, tvb, *offset,(asn->offset
-																-*offset)+ len1,
-											"Unknown tag: %x",tag);
-							}
-		item_len-=len1;
-		*offset = asn->offset = offset_save+len1;;
-	}
+
+static int
+dissect_acse_Concrete_syntax_name(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+  offset = dissect_acse_TransferSyntaxName(implicit_tag, tvb, offset, pinfo, tree, hf_index);
+
+  return offset;
 }
-/* display response top sequence  */
-static void
-show_response_sequence_top(ASN1_SCK *asn,proto_tree *acse_tree,tvbuff_t
-*tvb,packet_info *pinfo,int *offset,int item_len)
-{
-	int ret;
-	guint cls, con, tag,len1;
-	gint  type;
-	gboolean def;
-	proto_item *itm;
-	gint length;
-
-	while(item_len > 0 )
-	{
-			int offset_save = *offset;
-/* do we have enough bytes to dissect this item ? */
-			if( ( length =tvb_reported_length_remaining(tvb, *offset))  < item_len )
-			{
-					proto_tree_add_text(acse_tree, tvb, *offset, item_len,
-							"Wrong Item.Need %u bytes but have %u", item_len,length);
-					break;
-			}
-		/*   get  tag     */
-			type = tvb_get_guint8(tvb, *offset);
-		/* decode header  */
-			ret = asn1_header_decode(asn, &cls, &con, &tag, &def, &len1);
-
-			if (ret != ASN1_ERR_NOERROR)
-			{
-							dissect_parse_error(tvb, *offset, pinfo, acse_tree,
-									"sequence error", ret);
-				break;
-			}
-			/* add header  */
-			item_len = item_len - (asn->offset - *offset);
-			offset_save += (asn->offset - *offset);
-						/*
-						* [APPLICATION <tag>]
-						*/
-						switch (tag)
-							{
-								case ACSE_RESULT:
-									show_acse_result(asn,acse_tree,tvb,offset,len1);
-									break;
-								case ACSE_RESULT_SOURCE_DIAGNOSTIC:
-									show_acse_result_source_diagnostic(asn,acse_tree,tvb,offset,len1);
-									break;
-								case USER_INFORMATION:
-									show_acse_user_information(asn,acse_tree,tvb,offset,len1);
-									break;
-
-								case RESPONDING_AE_QUALIFIER:
-									{
-									proto_tree *acse_tree_pr = NULL;
-									proto_item *pr;
-									pr = proto_tree_add_text(acse_tree,tvb,*offset,
-									len1+(asn->offset-*offset),
-									val_to_str(tag ,response_sequence_top_vals,
-									"Unknown item (0x%02x)"));
-									acse_tree_pr = proto_item_add_subtree(pr, ett_acse_ms);
-									show_integer(asn,acse_tree_pr,tvb,offset,len1);
-									}
-									break;
-								case APPLICATION_CONTEXT_NAME:
-								case RESPONDING_AP_TITLE:
-								case RESPONDING_AP_INVOKATION_ID:
-								case RESPONDING_AE_INVOKATION_ID:
-									show_oid(asn,acse_tree,tvb,offset,len1,(const 
-value_string*)&response_sequence_top_vals,NULL);
-									break;
-								case PROTOCOL_VERSION:
-									show_protocol_version(asn,acse_tree,tvb,offset,len1,tag);
-									break;
-								default:
-									itm = proto_tree_add_text(acse_tree, tvb, *offset,(asn->offset
-																-*offset)+ len1,
-											"Unknown tag: %x",tag);
-							}
-		item_len-=len1;
-		*offset = asn->offset = offset_save+len1;
-	}
+static int dissect_concrete_syntax_name_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
+  return dissect_acse_Concrete_syntax_name(TRUE, tvb, offset, pinfo, tree, hf_acse_concrete_syntax_name);
 }
 
-/*
-* Dissect a pdu.
-*/
+
+static const value_string acse_T_provider_reason_vals[] = {
+  {   0, "reason-not-specified" },
+  {   1, "abstract-syntax-not-supported" },
+  {   2, "proposed-transfer-syntaxes-not-supported" },
+  {   3, "local-limit-on-DCS-exceeded" },
+  { 0, NULL }
+};
+
+
 static int
-dissect_pdu(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree
-			*tree)
-{
-  proto_item *ti;
-  proto_tree *acse_tree = NULL;
-  guint length;
-  guint       rest_len;
-  guint  s_type;
-  ASN1_SCK asn;
-  guint cp_type_len;
-/* get type of tag      */
-	s_type = tvb_get_guint8(tvb, offset);
-		/*  set up type of pdu */
-  	if (check_col(pinfo->cinfo, COL_INFO))
-					col_add_str(pinfo->cinfo, COL_INFO,
-						val_to_str(session->spdu_type, ses_vals, "Unknown pdu type (0x%02x)"));
-  if (tree)
-	{
-		ti = proto_tree_add_item(tree, proto_acse, tvb, offset, -1,
-		    FALSE);
-		acse_tree = proto_item_add_subtree(ti, ett_acse);
-	}
-	offset++;
-/*    open asn.1 stream    */
-	asn1_open(&asn, tvb, offset);
-
-	switch(session->spdu_type)
-	{
-		case SES_REFUSE:
-		case SES_CONNECTION_REQUEST:
-		case SES_CONNECTION_ACCEPT:
-			proto_tree_add_uint(acse_tree, hf_acse_type, tvb, offset-1, 1, s_type);
-
-			if (read_length(&asn, acse_tree, hf_cp_type_message_length, &cp_type_len)
-							!= ASN1_ERR_NOERROR)
-					{
-					return  FALSE;
-					}
-			/* skip length   */
-			offset = asn.offset;
-			/* do we have enough bytes to dissect ? */
-			if( ( length =tvb_reported_length_remaining(tvb, offset))  < cp_type_len
-					)
-			{
-				if(tree)
-				{
-					proto_tree_add_text(acse_tree, tvb, offset, -1,
-							"Wrong pdu.Need %u bytes but have %u", cp_type_len,length);
-				}
-			return FALSE;
-			}
-			{
-				if(session->spdu_type == SES_CONNECTION_REQUEST)
-				{
-				show_request_sequence_top(&asn,acse_tree,tvb,pinfo,&offset,cp_type_len);
-				}
-				else
-				{
-				show_response_sequence_top(&asn,acse_tree,tvb,pinfo,&offset,cp_type_len);
-				}
+dissect_acse_T_provider_reason(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index,
+                                  NULL);
 
-			}
-				break;
-		case SES_FINISH:
-			proto_tree_add_uint(acse_tree, hf_acse_type, tvb, offset-1, 1, s_type);
-	  			/* get length  */
-				if (read_length(&asn, acse_tree, 0, &rest_len) != ASN1_ERR_NOERROR)
-						{
-					return  FALSE;
-						}
-				/* skip length   */
-				offset = asn.offset;
-				/* do we have enough bytes to dissect ? */
-				if( ( length =tvb_reported_length_remaining(tvb, offset))  < rest_len )
-				{
-					if(tree)
-					{
-					proto_tree_add_text(acse_tree, tvb, offset, -1,
-							"Wrong pdu.Need %u bytes but have %u", rest_len,length);
-					}
-				return FALSE;
-				}
-				show_disconnect_pdu(&asn,acse_tree,tvb,&offset,rest_len);
-				break;
-		case SES_DISCONNECT:
-			proto_tree_add_uint(acse_tree, hf_acse_type, tvb, offset-1, 1, s_type);
-	  			/* get length  */
-				if (read_length(&asn, acse_tree, 0, &rest_len) != ASN1_ERR_NOERROR)
-						{
-					return  FALSE;
-						}
-				/* skip length   */
-				offset = asn.offset;
-				/* do we have enough bytes to dissect ? */
-				if( ( length =tvb_reported_length_remaining(tvb, offset))  < rest_len )
-				{
-					if(tree)
-					{
-					proto_tree_add_text(acse_tree, tvb, offset, -1,
-							"Wrong pdu.Need %u bytes but have %u", rest_len,length);
-					}
-				return FALSE;
-				}
-				show_disconnect_pdu(&asn,acse_tree,tvb,&offset,rest_len);
-				break;
-		case SES_ABORT:
-			proto_tree_add_uint(acse_tree, hf_acse_type, tvb, offset-1, 1, s_type);
-	  			/* get length  */
-				if (read_length(&asn, acse_tree, 0, &rest_len) != ASN1_ERR_NOERROR)
-						{
-					return  FALSE;
-						}
-				/* skip length   */
-				offset = asn.offset;
-				/* do we have enough bytes to dissect ? */
-				if( ( length =tvb_reported_length_remaining(tvb, offset))  < rest_len )
-				{
-					if(tree)
-					{
-					proto_tree_add_text(acse_tree, tvb, offset, -1,
-							"Wrong pdu.Need %u bytes but have %u", rest_len,length);
-					}
-				return FALSE;
-				}
-				show_abort_reason(&asn,acse_tree,tvb,&offset,rest_len);
-				break;
-		default:
-			{
-				proto_item *ms;
-				proto_tree *acse_tree_ms = NULL;
-				/* back to length  */
-				  offset--;
-	  			/* get length  */
-				if (read_length(&asn, acse_tree, 0, &rest_len) != ASN1_ERR_NOERROR)
-						{
-					return  FALSE;
-						}
-				ms = proto_tree_add_text(acse_tree, tvb, offset, rest_len,
-										val_to_str(session->spdu_type, ses_vals, "Unknown pdu type (0x%02x)"));
-				acse_tree_ms = proto_item_add_subtree(ms, ett_acse_ms);
-				show_user_data(&asn,acse_tree_ms,tvb,&offset,rest_len,s_type);
-			}
-	}
-/*    close asn.1 stream    */
-	  asn1_close(&asn, &offset);
+  return offset;
+}
+static int dissect_provider_reason_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
+  return dissect_acse_T_provider_reason(TRUE, tvb, offset, pinfo, tree, hf_acse_provider_reason);
+}
 
-	return offset;
+static const ber_sequence_t P_context_result_list_item_sequence[] = {
+  { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_Pcontext_result_impl },
+  { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_concrete_syntax_name_impl },
+  { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_provider_reason_impl },
+  { 0, 0, 0, NULL }
+};
+
+static int
+dissect_acse_P_context_result_list_item(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+  offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
+                                P_context_result_list_item_sequence, hf_index, ett_acse_P_context_result_list_item);
+
+  return offset;
+}
+static int dissect_P_context_result_list_item(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
+  return dissect_acse_P_context_result_list_item(FALSE, tvb, offset, pinfo, tree, hf_acse_P_context_result_list_item);
 }
 
+static const ber_sequence_t P_context_result_list_sequence_of[1] = {
+  { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_P_context_result_list_item },
+};
+
+static int
+dissect_acse_P_context_result_list(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+  offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset,
+                                   P_context_result_list_sequence_of, hf_index, ett_acse_P_context_result_list);
+
+  return offset;
+}
+static int dissect_p_context_result_list_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
+  return dissect_acse_P_context_result_list(TRUE, tvb, offset, pinfo, tree, hf_acse_p_context_result_list);
+}
+
+static const ber_sequence_t AARE_apdu_sequence[] = {
+  { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_AARE_protocol_version_impl },
+  { BER_CLASS_CON, 1, 0, dissect_AARE_aSO_context_name },
+  { BER_CLASS_CON, 2, 0, dissect_AARE_result },
+  { BER_CLASS_CON, 3, BER_FLAGS_NOTCHKTAG, dissect_result_source_diagnostic },
+  { BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_responding_AP_title },
+  { BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_responding_AE_qualifier },
+  { BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL, dissect_responding_AP_invocation_identifier },
+  { BER_CLASS_CON, 7, BER_FLAGS_OPTIONAL, dissect_responding_AE_invocation_identifier },
+  { BER_CLASS_CON, 8, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_responder_acse_requirements_impl },
+  { BER_CLASS_CON, 9, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mechanism_name_impl },
+  { BER_CLASS_CON, 10, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_responding_authentication_value },
+  { BER_CLASS_CON, 11, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_aSO_context_name_list_impl },
+  { BER_CLASS_CON, 29, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_implementation_information_impl },
+  { BER_CLASS_CON, 12, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_p_context_result_list_impl },
+  { BER_CLASS_CON, 13, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_called_asoi_tag_impl },
+  { BER_CLASS_CON, 14, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_calling_asoi_tag_impl },
+  { BER_CLASS_CON, 30, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_AARE_user_information_impl },
+  { 0, 0, 0, NULL }
+};
+
+static int
+dissect_acse_AARE_apdu(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+  offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
+                                AARE_apdu_sequence, hf_index, ett_acse_AARE_apdu);
+
+  return offset;
+}
+static int dissect_aare_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
+  return dissect_acse_AARE_apdu(TRUE, tvb, offset, pinfo, tree, hf_acse_aare);
+}
+
+
+static const value_string acse_Release_request_reason_vals[] = {
+  {   0, "normal" },
+  {   1, "urgent" },
+  {  30, "user-defined" },
+  { 0, NULL }
+};
+
+
+static int
+dissect_acse_Release_request_reason(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index,
+                                  NULL);
+
+  return offset;
+}
+static int dissect_RLRQ_reason_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
+  return dissect_acse_Release_request_reason(TRUE, tvb, offset, pinfo, tree, hf_acse_RLRQ_reason);
+}
+
+static const ber_sequence_t RLRQ_apdu_sequence[] = {
+  { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_RLRQ_reason_impl },
+  { BER_CLASS_CON, 13, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_aso_qualifier },
+  { BER_CLASS_CON, 14, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_asoi_identifier_impl },
+  { BER_CLASS_CON, 30, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_RLRQ_user_information_impl },
+  { 0, 0, 0, NULL }
+};
+
+static int
+dissect_acse_RLRQ_apdu(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+  offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
+                                RLRQ_apdu_sequence, hf_index, ett_acse_RLRQ_apdu);
+
+  return offset;
+}
+static int dissect_rlrq_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
+  return dissect_acse_RLRQ_apdu(TRUE, tvb, offset, pinfo, tree, hf_acse_rlrq);
+}
+
+
+static const value_string acse_Release_response_reason_vals[] = {
+  {   0, "normal" },
+  {   1, "not-finished" },
+  {  30, "user-defined" },
+  { 0, NULL }
+};
+
+
+static int
+dissect_acse_Release_response_reason(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index,
+                                  NULL);
+
+  return offset;
+}
+static int dissect_RLRE_reason_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
+  return dissect_acse_Release_response_reason(TRUE, tvb, offset, pinfo, tree, hf_acse_RLRE_reason);
+}
+
+static const ber_sequence_t RLRE_apdu_sequence[] = {
+  { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_RLRE_reason_impl },
+  { BER_CLASS_CON, 13, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_aso_qualifier },
+  { BER_CLASS_CON, 14, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_asoi_identifier_impl },
+  { BER_CLASS_CON, 30, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_RLRE_user_information_impl },
+  { 0, 0, 0, NULL }
+};
+
+static int
+dissect_acse_RLRE_apdu(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+  offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
+                                RLRE_apdu_sequence, hf_index, ett_acse_RLRE_apdu);
+
+  return offset;
+}
+static int dissect_rlre_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
+  return dissect_acse_RLRE_apdu(TRUE, tvb, offset, pinfo, tree, hf_acse_rlre);
+}
+
+
+static const value_string acse_ABRT_source_vals[] = {
+  {   0, "acse-service-user" },
+  {   1, "acse-service-provider" },
+  { 0, NULL }
+};
+
+
+static int
+dissect_acse_ABRT_source(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index,
+                                  NULL);
+
+  return offset;
+}
+static int dissect_abort_source_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
+  return dissect_acse_ABRT_source(TRUE, tvb, offset, pinfo, tree, hf_acse_abort_source);
+}
+
+
+static const value_string acse_ABRT_diagnostic_vals[] = {
+  {   1, "no-reason-given" },
+  {   2, "protocol-error" },
+  {   3, "authentication-mechanism-name-not-recognized" },
+  {   4, "authentication-mechanism-name-required" },
+  {   5, "authentication-failure" },
+  {   6, "authentication-required" },
+  { 0, NULL }
+};
+
+
+static int
+dissect_acse_ABRT_diagnostic(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+
+  return offset;
+}
+static int dissect_abort_diagnostic_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
+  return dissect_acse_ABRT_diagnostic(TRUE, tvb, offset, pinfo, tree, hf_acse_abort_diagnostic);
+}
+
+static const ber_sequence_t ABRT_apdu_sequence[] = {
+  { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_abort_source_impl },
+  { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_abort_diagnostic_impl },
+  { BER_CLASS_CON, 13, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_aso_qualifier },
+  { BER_CLASS_CON, 14, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_asoi_identifier_impl },
+  { BER_CLASS_CON, 30, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ABRT_user_information_impl },
+  { 0, 0, 0, NULL }
+};
+
+static int
+dissect_acse_ABRT_apdu(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+  offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
+                                ABRT_apdu_sequence, hf_index, ett_acse_ABRT_apdu);
+
+  return offset;
+}
+static int dissect_abrt_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
+  return dissect_acse_ABRT_apdu(TRUE, tvb, offset, pinfo, tree, hf_acse_abrt);
+}
+
+
+static int
+dissect_acse_User_information(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+  offset = dissect_acse_Association_data(implicit_tag, tvb, offset, pinfo, tree, hf_index);
+
+  return offset;
+}
+static int dissect_user_information(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
+  return dissect_acse_User_information(FALSE, tvb, offset, pinfo, tree, hf_acse_user_information);
+}
+static int dissect_user_information_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
+  return dissect_acse_User_information(TRUE, tvb, offset, pinfo, tree, hf_acse_user_information);
+}
+
+
+static int
+dissect_acse_Simply_encoded_data(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+  offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index,
+                                    NULL);
+
+  return offset;
+}
+static int dissect_simply_encoded_data(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
+  return dissect_acse_Simply_encoded_data(FALSE, tvb, offset, pinfo, tree, hf_acse_simply_encoded_data);
+}
+
+
+
+static int
+dissect_acse_T_simple_ASN1_type(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+/*XXX not implemented yet */
+
+
+  return offset;
+}
+static int dissect_simple_ASN1_type(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
+  return dissect_acse_T_simple_ASN1_type(FALSE, tvb, offset, pinfo, tree, hf_acse_simple_ASN1_type);
+}
+
+
+static const value_string acse_T_presentation_data_values_vals[] = {
+  {   0, "simple-ASN1-type" },
+  {   1, "octet-aligned" },
+  {   2, "arbitrary" },
+  { 0, NULL }
+};
+
+static const ber_choice_t T_presentation_data_values_choice[] = {
+  {   0, BER_CLASS_CON, 0, 0, dissect_simple_ASN1_type },
+  {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_octet_aligned_impl },
+  {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_arbitrary_impl },
+  { 0, 0, 0, 0, NULL }
+};
+
+static int
+dissect_acse_T_presentation_data_values(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+  offset = dissect_ber_choice(pinfo, tree, tvb, offset,
+                              T_presentation_data_values_choice, hf_index, ett_acse_T_presentation_data_values);
+
+  return offset;
+}
+static int dissect_presentation_data_values(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
+  return dissect_acse_T_presentation_data_values(FALSE, tvb, offset, pinfo, tree, hf_acse_presentation_data_values);
+}
+
+static const ber_sequence_t PDV_list_sequence[] = {
+  { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_transfer_syntax_name },
+  { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_presentation_context_identifier },
+  { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_presentation_data_values },
+  { 0, 0, 0, NULL }
+};
+
+static int
+dissect_acse_PDV_list(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+  offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
+                                PDV_list_sequence, hf_index, ett_acse_PDV_list);
+
+  return offset;
+}
+static int dissect_fully_encoded_data(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
+  return dissect_acse_PDV_list(FALSE, tvb, offset, pinfo, tree, hf_acse_fully_encoded_data);
+}
+
+
+static const value_string acse_User_Data_vals[] = {
+  {   0, "user-information" },
+  {   1, "simply-encoded-data" },
+  {   2, "fully-encoded-data" },
+  { 0, NULL }
+};
+
+static const ber_choice_t User_Data_choice[] = {
+  {   0, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_user_information },
+  {   1, BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_simply_encoded_data },
+  {   2, BER_CLASS_CON, 0, 0, dissect_fully_encoded_data },
+  { 0, 0, 0, 0, NULL }
+};
+
+static int
+dissect_acse_User_Data(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+  offset = dissect_ber_choice(pinfo, tree, tvb, offset,
+                              User_Data_choice, hf_index, ett_acse_User_Data);
+
+  return offset;
+}
+static int dissect_a_user_data(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
+  return dissect_acse_User_Data(FALSE, tvb, offset, pinfo, tree, hf_acse_a_user_data);
+}
+
+static const ber_sequence_t A_DT_apdu_sequence[] = {
+  { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_aso_qualifier },
+  { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_asoi_identifier_impl },
+  { BER_CLASS_CON, 30, BER_FLAGS_NOTCHKTAG, dissect_a_user_data },
+  { 0, 0, 0, NULL }
+};
+
+static int
+dissect_acse_A_DT_apdu(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+  offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
+                                A_DT_apdu_sequence, hf_index, ett_acse_A_DT_apdu);
+
+  return offset;
+}
+static int dissect_adt_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
+  return dissect_acse_A_DT_apdu(TRUE, tvb, offset, pinfo, tree, hf_acse_adt);
+}
+
+
+static int
+dissect_acse_T_aSO_context_name2(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+  offset = dissect_ber_object_identifier(FALSE, pinfo, tree, tvb, offset,
+                                         hf_index, object_identifier_id);
+
+
+  return offset;
+}
+static int dissect_ACRQ_aSO_context_name_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
+  return dissect_acse_T_aSO_context_name2(TRUE, tvb, offset, pinfo, tree, hf_acse_ACRQ_aSO_context_name);
+}
+
+static const ber_sequence_t ACRQ_apdu_sequence[] = {
+  { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_aso_qualifier },
+  { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_asoi_identifier_impl },
+  { BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ACRQ_aSO_context_name_impl },
+  { BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_aSO_context_name_list_impl },
+  { BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_p_context_definition_list },
+  { BER_CLASS_CON, 30, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_user_information_impl },
+  { 0, 0, 0, NULL }
+};
+
+static int
+dissect_acse_ACRQ_apdu(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+  offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
+                                ACRQ_apdu_sequence, hf_index, ett_acse_ACRQ_apdu);
+
+  return offset;
+}
+static int dissect_acrq_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
+  return dissect_acse_ACRQ_apdu(TRUE, tvb, offset, pinfo, tree, hf_acse_acrq);
+}
+
+
+static int
+dissect_acse_T_aSO_context_name3(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+  offset = dissect_ber_object_identifier(FALSE, pinfo, tree, tvb, offset,
+                                         hf_index, object_identifier_id);
+
+
+  return offset;
+}
+static int dissect_aSO_context_name_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
+  return dissect_acse_T_aSO_context_name3(TRUE, tvb, offset, pinfo, tree, hf_acse_aSO_context_name);
+}
+
+static const ber_sequence_t ACRP_apdu_sequence[] = {
+  { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_aso_qualifier },
+  { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_asoi_identifier_impl },
+  { BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_aSO_context_name_impl },
+  { BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_p_context_result_list_impl },
+  { BER_CLASS_CON, 30, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_user_information_impl },
+  { 0, 0, 0, NULL }
+};
+
+static int
+dissect_acse_ACRP_apdu(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+  offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
+                                ACRP_apdu_sequence, hf_index, ett_acse_ACRP_apdu);
+
+  return offset;
+}
+static int dissect_acrp_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
+  return dissect_acse_ACRP_apdu(TRUE, tvb, offset, pinfo, tree, hf_acse_acrp);
+}
+
+
+static const value_string acse_ACSE_apdu_vals[] = {
+  {   0, "aarq" },
+  {   1, "aare" },
+  {   2, "rlrq" },
+  {   3, "rlre" },
+  {   4, "abrt" },
+  {   5, "adt" },
+  {   6, "acrq" },
+  {   7, "acrp" },
+  {   5, "adt" },
+  {   6, "acrq" },
+  {   7, "acrp" },
+  { 0, NULL }
+};
+
+static const ber_choice_t ACSE_apdu_choice[] = {
+  {   0, BER_CLASS_APP, 0, BER_FLAGS_IMPLTAG, dissect_aarq_impl },
+  {   1, BER_CLASS_APP, 1, BER_FLAGS_IMPLTAG, dissect_aare_impl },
+  {   2, BER_CLASS_APP, 2, BER_FLAGS_IMPLTAG, dissect_rlrq_impl },
+  {   3, BER_CLASS_APP, 3, BER_FLAGS_IMPLTAG, dissect_rlre_impl },
+  {   4, BER_CLASS_APP, 4, BER_FLAGS_IMPLTAG, dissect_abrt_impl },
+  {   5, BER_CLASS_APP, 5, BER_FLAGS_IMPLTAG, dissect_adt_impl },
+  {   6, BER_CLASS_APP, 6, BER_FLAGS_IMPLTAG, dissect_acrq_impl },
+  {   7, BER_CLASS_APP, 7, BER_FLAGS_IMPLTAG, dissect_acrp_impl },
+  {   5, BER_CLASS_APP, 5, BER_FLAGS_IMPLTAG, dissect_adt_impl },
+  {   6, BER_CLASS_APP, 6, BER_FLAGS_IMPLTAG, dissect_acrq_impl },
+  {   7, BER_CLASS_APP, 7, BER_FLAGS_IMPLTAG, dissect_acrp_impl },
+  {   5, BER_CLASS_APP, 5, BER_FLAGS_IMPLTAG, dissect_adt_impl },
+  {   6, BER_CLASS_APP, 6, BER_FLAGS_IMPLTAG, dissect_acrq_impl },
+  {   7, BER_CLASS_APP, 7, BER_FLAGS_IMPLTAG, dissect_acrp_impl },
+  { 0, 0, 0, 0, NULL }
+};
+
+static int
+dissect_acse_ACSE_apdu(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+  offset = dissect_ber_choice(pinfo, tree, tvb, offset,
+                              ACSE_apdu_choice, hf_index, ett_acse_ACSE_apdu);
+
+  return offset;
+}
+
+
+static int
+dissect_acse_Application_context_name(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+  offset = dissect_acse_ASO_context_name(implicit_tag, tvb, offset, pinfo, tree, hf_index);
+
+  return offset;
+}
+
+
+static int
+dissect_acse_AE_title_form1(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+  offset = dissect_x509if_Name(implicit_tag, tvb, offset, pinfo, tree, hf_index);
+
+  return offset;
+}
+static int dissect_ae_title_form1(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
+  return dissect_acse_AE_title_form1(FALSE, tvb, offset, pinfo, tree, hf_acse_ae_title_form1);
+}
+
+
+
+static int
+dissect_acse_AE_title_form2(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+  offset = dissect_ber_object_identifier(implicit_tag, pinfo, tree, tvb, offset, hf_index,
+                                            NULL);
+
+  return offset;
+}
+static int dissect_ae_title_form2(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
+  return dissect_acse_AE_title_form2(FALSE, tvb, offset, pinfo, tree, hf_acse_ae_title_form2);
+}
+
+
+static const value_string acse_AE_title_vals[] = {
+  {   0, "ae-title-form1" },
+  {   1, "ae-title-form2" },
+  { 0, NULL }
+};
+
+static const ber_choice_t AE_title_choice[] = {
+  {   0, BER_CLASS_UNI, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_ae_title_form1 },
+  {   1, BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_ae_title_form2 },
+  { 0, 0, 0, 0, NULL }
+};
+
+static int
+dissect_acse_AE_title(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+  offset = dissect_ber_choice(pinfo, tree, tvb, offset,
+                              AE_title_choice, hf_index, ett_acse_AE_title);
+
+  return offset;
+}
+
+
+/*--- End of included file: packet-acse-fn.c ---*/
+
+
+
 /*
 * Dissect ACSE PDUs inside a PPDU.
 */
 static void
-dissect_acse(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
+dissect_acse(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
 {
 	int offset = 0;
-/* first, try to check length   */
-/* do we have at least 2 bytes  */
-	if (!tvb_bytes_exist(tvb, 0, 2))
-	{
-	proto_tree_add_text(tree, tvb, offset, 
-tvb_reported_length_remaining(tvb,offset),
-								"User data");
-			return;  /* no, it isn't a ACSE PDU */
-	}
-/* do we have spdu type from the session dissector?  */
-	if( !pinfo->private_data )
-				{
-				if(tree)
-						{
-					proto_tree_add_text(tree, tvb, offset, -1,
-							"Internal error:can't get spdu type from session dissector.");
-					return  ;
-						} 
-				}
-	else
-				{
-					session  = ( (struct SESSION_DATA_STRUCTURE*)(pinfo->private_data) );
-					if(session->spdu_type == 0 )
-					{
-						if(tree)
-						{
-					proto_tree_add_text(tree, tvb, offset, -1,
-							"Internal error:wrong spdu type %x from session dissector.",session->spdu_type);
-					return  ;
-						}
-					}
-				}
-/*  ACSE has only AARQ,AARE,RLRQ,RLRE,ABRT type of pdu */
-/*  reject everything else                              */
-/*  data pdu is not ACSE pdu and has to go directly to app dissector */
-			switch(session->spdu_type)
-			{
-		case SES_REFUSE:					/*   RLRE   */
-		case SES_CONNECTION_REQUEST:		/*   AARQ   */
-		case SES_CONNECTION_ACCEPT:			/*   AARE   */
-		case SES_DISCONNECT:				/*   RLRQ   */
-		case SES_FINISH:					/*   RLRE   */
-		case SES_ABORT:						/*   ABRT   */
-			break;
-		case SES_DATA_TRANSFER:
-			call_app_dissector(tvb,offset,tvb_reported_length_remaining(tvb, offset) 
-,pinfo,tree,tree);
-			return;
-		default:
-			return;
-			}
+	proto_item    *item=NULL;
+	proto_tree    *tree=NULL;
+	char *oid;
 
-	/*  we can't make any additional checking here   */
-	/*  postpone it before dissector will have more information */
+	/* save parent_tree so subdissectors can create new top nodes */
+	top_tree=parent_tree;
 
+	/* create display subtree for the protocol */
+	if(parent_tree){
+		item = proto_tree_add_item(parent_tree, proto_acse, tvb, 0, -1, FALSE);
+		tree = proto_item_add_subtree(item, ett_acse);
+	}
 	if (check_col(pinfo->cinfo, COL_PROTOCOL))
 		col_set_str(pinfo->cinfo, COL_PROTOCOL, "ACSE");
   	if (check_col(pinfo->cinfo, COL_INFO))
   		col_clear(pinfo->cinfo, COL_INFO);
-	/* save pointers for calling the app dissector  */
-	global_tree = tree;
-	global_pinfo = pinfo;
-
-	while (tvb_reported_length_remaining(tvb, offset) > 0)
-			{
-		offset = dissect_pdu(tvb, offset, pinfo, tree);
-		if(offset == FALSE )
-							{
-									proto_tree_add_text(tree, tvb, offset, -1,"Internal error");
-									offset = tvb_length(tvb);
-									break;
-							}
-			}
-}
-
-void
-proto_register_acse(void)
-{
-	static hf_register_info hf[] =
-	{
-		{
-			&hf_acse_type,
-			{
-				"PDU Type",
-				"acse.type",
-				FT_UINT8,
-				BASE_DEC,
-				VALS(acse_vals),
-				0x0,
-				"", HFILL
-			}
-		},
-		{
-			&hf_cp_type_message_length,
-			{
-				"Message Length",
-				"cp_type.message_length",
-				FT_UINT32,
-				BASE_DEC,
-				NULL,
-				0x0,
-				"CP type Message Length",
-				HFILL
-			}
-		},
-		{
-			&hf_protocol_version,
-			{
-				"Protocol version 1",
-				"acse.protocol.version",
-				FT_BOOLEAN, 16,
-				NULL,
-				ACSE_PROTOCOL_VERGION,
-				"Protocol version 1",
-				HFILL
-			}
-		},
-	};
 
-	static gint *ett[] =
-	{
-		&ett_acse,
-		&ett_acse_param,
-		&ett_acse_rc,
-		&ett_acse_ms,
-		&ett_acse_itm,
-	};
-	module_t *acse_module;
 
+	/* first, try to check length   */
+	/* do we have at least 2 bytes  */
+	if (!tvb_bytes_exist(tvb, 0, 2)){
+		proto_tree_add_text(tree, tvb, offset, 
+			tvb_reported_length_remaining(tvb,offset),
+			"User data");
+		return;  /* no, it isn't a ACSE PDU */
+	}
+	/* do we have spdu type from the session dissector?  */
+	if( !pinfo->private_data ){
+		if(tree){
+			proto_tree_add_text(tree, tvb, offset, -1,
+				"Internal error:can't get spdu type from session dissector.");
+		} 
+		return  ;
+	} else {
+		session  = ( (struct SESSION_DATA_STRUCTURE*)(pinfo->private_data) );
+		if(session->spdu_type == 0 ) {
+			if(tree){
+				proto_tree_add_text(tree, tvb, offset, -1,
+					"Internal error:wrong spdu type %x from session dissector.",session->spdu_type);
+				return  ;
+			}
+		}
+	}
+	/*  ACSE has only AARQ,AARE,RLRQ,RLRE,ABRT type of pdu */
+	/*  reject everything else                              */
+	/*  data pdu is not ACSE pdu and has to go directly to app dissector */
+	switch(session->spdu_type){
+	case SES_CONNECTION_REQUEST:		/*   AARQ   */
+	case SES_CONNECTION_ACCEPT:		/*   AARE   */
+	case SES_REFUSE:			/*   RLRE   */
+	case SES_DISCONNECT:			/*   RLRQ   */
+	case SES_FINISH:			/*   RLRE   */
+	case SES_ABORT:				/*   ABRT   */
+		break;
+	case SES_DATA_TRANSFER:
+		oid=find_oid_by_ctx_id(pinfo, indir_ref);
+		if(oid){
+			call_ber_oid_callback(oid, tvb, offset, pinfo, top_tree);
+		} else {
+			proto_tree_add_text(tree, tvb, offset, -1,
+			    "dissector is not available");
+		}
+		return;
+	default:
+		return;
+	}
 
-	proto_acse = proto_register_protocol(PROTO_STRING_ACSE, "ACSE", "acse");
-	proto_register_field_array(proto_acse, hf, array_length(hf));
-	proto_register_subtree_array(ett, array_length(ett));
+	/*  we can't make any additional checking here   */
+	/*  postpone it before dissector will have more information */
+	while (tvb_reported_length_remaining(tvb, offset) > 0){
+		offset = dissect_acse_ACSE_apdu(FALSE, tvb, offset, pinfo, tree, -1);
+		if(offset == FALSE ){
+			proto_tree_add_text(tree, tvb, offset, -1,"Internal error");
+			offset = tvb_length(tvb);
+			break;
+		}
+	}
 
-	acse_module = prefs_register_protocol(proto_acse, NULL);
+	switch(session->spdu_type){
+	case SES_CONNECTION_REQUEST:		/*   AARQ   */
+	case SES_CONNECTION_ACCEPT:		/*   AARE   */
+		/* these two functions are used to set up the association
+		   between a presentation identifier (indir_ref) and
+		   a protocol identified by a oid.
+		   it is ugly to handle it with global variables but
+		   better than nothing.
+		*/
+		register_ctx_id_and_oid(pinfo, indir_ref, object_identifier_id);
+		break;
+	}
+}
 
-	/*
-	 * Register the dissector by name, so other dissectors can
-	 * grab it by name rather than just referring to it directly
-	 */
-	register_dissector("acse", dissect_acse, proto_acse);
-	application_dissector_table = register_dissector_table("acse.application_context", "Application context OID", FT_STRING, BASE_NONE); 
+/*--- proto_register_acse ----------------------------------------------*/
+void proto_register_acse(void) {
+
+  /* List of fields */
+  static hf_register_info hf[] = {
+
+/*--- Included file: packet-acse-hfarr.c ---*/
+
+    { &hf_acse_direct_reference,
+      { "direct-reference", "acse.direct_reference",
+        FT_STRING, BASE_NONE, NULL, 0,
+        "EXTERNAL/direct-reference", HFILL }},
+    { &hf_acse_indirect_reference,
+      { "indirect-reference", "acse.indirect_reference",
+        FT_INT32, BASE_DEC, NULL, 0,
+        "EXTERNAL/indirect-reference", HFILL }},
+    { &hf_acse_data_value_descriptor,
+      { "data-value-descriptor", "acse.data_value_descriptor",
+        FT_STRING, BASE_NONE, NULL, 0,
+        "EXTERNAL/data-value-descriptor", HFILL }},
+    { &hf_acse_encoding,
+      { "encoding", "acse.encoding",
+        FT_UINT32, BASE_DEC, VALS(acse_T_encoding_vals), 0,
+        "EXTERNAL/encoding", HFILL }},
+    { &hf_acse_single_ASN1_type,
+      { "single-ASN1-type", "acse.single_ASN1_type",
+        FT_NONE, BASE_NONE, NULL, 0,
+        "EXTERNAL/encoding/single-ASN1-type", HFILL }},
+    { &hf_acse_octet_aligned,
+      { "octet-aligned", "acse.octet_aligned",
+        FT_BYTES, BASE_HEX, NULL, 0,
+        "", HFILL }},
+    { &hf_acse_arbitrary,
+      { "arbitrary", "acse.arbitrary",
+        FT_BYTES, BASE_HEX, NULL, 0,
+        "", HFILL }},
+    { &hf_acse_aarq,
+      { "aarq", "acse.aarq",
+        FT_NONE, BASE_NONE, NULL, 0,
+        "ACSE-apdu/aarq", HFILL }},
+    { &hf_acse_aare,
+      { "aare", "acse.aare",
+        FT_NONE, BASE_NONE, NULL, 0,
+        "ACSE-apdu/aare", HFILL }},
+    { &hf_acse_rlrq,
+      { "rlrq", "acse.rlrq",
+        FT_NONE, BASE_NONE, NULL, 0,
+        "ACSE-apdu/rlrq", HFILL }},
+    { &hf_acse_rlre,
+      { "rlre", "acse.rlre",
+        FT_NONE, BASE_NONE, NULL, 0,
+        "ACSE-apdu/rlre", HFILL }},
+    { &hf_acse_abrt,
+      { "abrt", "acse.abrt",
+        FT_NONE, BASE_NONE, NULL, 0,
+        "ACSE-apdu/abrt", HFILL }},
+    { &hf_acse_adt,
+      { "adt", "acse.adt",
+        FT_NONE, BASE_NONE, NULL, 0,
+        "ACSE-apdu/adt", HFILL }},
+    { &hf_acse_acrq,
+      { "acrq", "acse.acrq",
+        FT_NONE, BASE_NONE, NULL, 0,
+        "ACSE-apdu/acrq", HFILL }},
+    { &hf_acse_acrp,
+      { "acrp", "acse.acrp",
+        FT_NONE, BASE_NONE, NULL, 0,
+        "ACSE-apdu/acrp", HFILL }},
+    { &hf_acse_AARQ_protocol_version,
+      { "protocol-version", "acse.protocol_version",
+        FT_BYTES, BASE_HEX, NULL, 0,
+        "AARQ-apdu/protocol-version", HFILL }},
+    { &hf_acse_AARQ_aSO_context_name,
+      { "aSO-context-name", "acse.aSO_context_name",
+        FT_STRING, BASE_NONE, NULL, 0,
+        "AARQ-apdu/aSO-context-name", HFILL }},
+    { &hf_acse_called_AP_title,
+      { "called-AP-title", "acse.called_AP_title",
+        FT_UINT32, BASE_DEC, VALS(acse_AP_title_vals), 0,
+        "AARQ-apdu/called-AP-title", HFILL }},
+    { &hf_acse_called_AE_qualifier,
+      { "called-AE-qualifier", "acse.called_AE_qualifier",
+        FT_UINT32, BASE_DEC, VALS(acse_ASO_qualifier_vals), 0,
+        "AARQ-apdu/called-AE-qualifier", HFILL }},
+    { &hf_acse_called_AP_invocation_identifier,
+      { "called-AP-invocation-identifier", "acse.called_AP_invocation_identifier",
+        FT_INT32, BASE_DEC, NULL, 0,
+        "AARQ-apdu/called-AP-invocation-identifier", HFILL }},
+    { &hf_acse_called_AE_invocation_identifier,
+      { "called-AE-invocation-identifier", "acse.called_AE_invocation_identifier",
+        FT_INT32, BASE_DEC, NULL, 0,
+        "AARQ-apdu/called-AE-invocation-identifier", HFILL }},
+    { &hf_acse_calling_AP_title,
+      { "calling-AP-title", "acse.calling_AP_title",
+        FT_UINT32, BASE_DEC, VALS(acse_AP_title_vals), 0,
+        "AARQ-apdu/calling-AP-title", HFILL }},
+    { &hf_acse_calling_AE_qualifier,
+      { "calling-AE-qualifier", "acse.calling_AE_qualifier",
+        FT_UINT32, BASE_DEC, VALS(acse_ASO_qualifier_vals), 0,
+        "AARQ-apdu/calling-AE-qualifier", HFILL }},
+    { &hf_acse_calling_AP_invocation_identifier,
+      { "calling-AP-invocation-identifier", "acse.calling_AP_invocation_identifier",
+        FT_INT32, BASE_DEC, NULL, 0,
+        "AARQ-apdu/calling-AP-invocation-identifier", HFILL }},
+    { &hf_acse_calling_AE_invocation_identifier,
+      { "calling-AE-invocation-identifier", "acse.calling_AE_invocation_identifier",
+        FT_INT32, BASE_DEC, NULL, 0,
+        "AARQ-apdu/calling-AE-invocation-identifier", HFILL }},
+    { &hf_acse_sender_acse_requirements,
+      { "sender-acse-requirements", "acse.sender_acse_requirements",
+        FT_BYTES, BASE_HEX, NULL, 0,
+        "AARQ-apdu/sender-acse-requirements", HFILL }},
+    { &hf_acse_mechanism_name,
+      { "mechanism-name", "acse.mechanism_name",
+        FT_STRING, BASE_NONE, NULL, 0,
+        "", HFILL }},
+    { &hf_acse_calling_authentication_value,
+      { "calling-authentication-value", "acse.calling_authentication_value",
+        FT_UINT32, BASE_DEC, VALS(acse_Authentication_value_vals), 0,
+        "AARQ-apdu/calling-authentication-value", HFILL }},
+    { &hf_acse_aSO_context_name_list,
+      { "aSO-context-name-list", "acse.aSO_context_name_list",
+        FT_NONE, BASE_NONE, NULL, 0,
+        "", HFILL }},
+    { &hf_acse_implementation_information,
+      { "implementation-information", "acse.implementation_information",
+        FT_STRING, BASE_NONE, NULL, 0,
+        "", HFILL }},
+    { &hf_acse_p_context_definition_list,
+      { "p-context-definition-list", "acse.p_context_definition_list",
+        FT_UINT32, BASE_DEC, VALS(acse_Syntactic_context_list_vals), 0,
+        "", HFILL }},
+    { &hf_acse_called_asoi_tag,
+      { "called-asoi-tag", "acse.called_asoi_tag",
+        FT_NONE, BASE_NONE, NULL, 0,
+        "", HFILL }},
+    { &hf_acse_calling_asoi_tag,
+      { "calling-asoi-tag", "acse.calling_asoi_tag",
+        FT_NONE, BASE_NONE, NULL, 0,
+        "", HFILL }},
+    { &hf_acse_AARQ_user_information,
+      { "user-information", "acse.user_information",
+        FT_NONE, BASE_NONE, NULL, 0,
+        "AARQ-apdu/user-information", HFILL }},
+    { &hf_acse_AARE_protocol_version,
+      { "protocol-version", "acse.protocol_version",
+        FT_BYTES, BASE_HEX, NULL, 0,
+        "AARE-apdu/protocol-version", HFILL }},
+    { &hf_acse_AARE_aSO_context_name,
+      { "aSO-context-name", "acse.aSO_context_name",
+        FT_STRING, BASE_NONE, NULL, 0,
+        "AARE-apdu/aSO-context-name", HFILL }},
+    { &hf_acse_AARE_result,
+      { "result", "acse.result",
+        FT_UINT32, BASE_DEC, VALS(acse_Associate_result_vals), 0,
+        "AARE-apdu/result", HFILL }},
+    { &hf_acse_result_source_diagnostic,
+      { "result-source-diagnostic", "acse.result_source_diagnostic",
+        FT_UINT32, BASE_DEC, VALS(acse_Associate_source_diagnostic_vals), 0,
+        "AARE-apdu/result-source-diagnostic", HFILL }},
+    { &hf_acse_responding_AP_title,
+      { "responding-AP-title", "acse.responding_AP_title",
+        FT_UINT32, BASE_DEC, VALS(acse_AP_title_vals), 0,
+        "AARE-apdu/responding-AP-title", HFILL }},
+    { &hf_acse_responding_AE_qualifier,
+      { "responding-AE-qualifier", "acse.responding_AE_qualifier",
+        FT_UINT32, BASE_DEC, VALS(acse_ASO_qualifier_vals), 0,
+        "AARE-apdu/responding-AE-qualifier", HFILL }},
+    { &hf_acse_responding_AP_invocation_identifier,
+      { "responding-AP-invocation-identifier", "acse.responding_AP_invocation_identifier",
+        FT_INT32, BASE_DEC, NULL, 0,
+        "AARE-apdu/responding-AP-invocation-identifier", HFILL }},
+    { &hf_acse_responding_AE_invocation_identifier,
+      { "responding-AE-invocation-identifier", "acse.responding_AE_invocation_identifier",
+        FT_INT32, BASE_DEC, NULL, 0,
+        "AARE-apdu/responding-AE-invocation-identifier", HFILL }},
+    { &hf_acse_responder_acse_requirements,
+      { "responder-acse-requirements", "acse.responder_acse_requirements",
+        FT_BYTES, BASE_HEX, NULL, 0,
+        "AARE-apdu/responder-acse-requirements", HFILL }},
+    { &hf_acse_responding_authentication_value,
+      { "responding-authentication-value", "acse.responding_authentication_value",
+        FT_UINT32, BASE_DEC, VALS(acse_Authentication_value_vals), 0,
+        "AARE-apdu/responding-authentication-value", HFILL }},
+    { &hf_acse_p_context_result_list,
+      { "p-context-result-list", "acse.p_context_result_list",
+        FT_NONE, BASE_NONE, NULL, 0,
+        "", HFILL }},
+    { &hf_acse_AARE_user_information,
+      { "user-information", "acse.user_information",
+        FT_NONE, BASE_NONE, NULL, 0,
+        "AARE-apdu/user-information", HFILL }},
+    { &hf_acse_RLRQ_reason,
+      { "reason", "acse.reason",
+        FT_INT32, BASE_DEC, VALS(acse_Release_request_reason_vals), 0,
+        "RLRQ-apdu/reason", HFILL }},
+    { &hf_acse_aso_qualifier,
+      { "aso-qualifier", "acse.aso_qualifier",
+        FT_UINT32, BASE_DEC, VALS(acse_ASO_qualifier_vals), 0,
+        "", HFILL }},
+    { &hf_acse_asoi_identifier,
+      { "asoi-identifier", "acse.asoi_identifier",
+        FT_UINT32, BASE_DEC, NULL, 0,
+        "", HFILL }},
+    { &hf_acse_RLRQ_user_information,
+      { "user-information", "acse.user_information",
+        FT_NONE, BASE_NONE, NULL, 0,
+        "RLRQ-apdu/user-information", HFILL }},
+    { &hf_acse_RLRE_reason,
+      { "reason", "acse.reason",
+        FT_INT32, BASE_DEC, VALS(acse_Release_response_reason_vals), 0,
+        "RLRE-apdu/reason", HFILL }},
+    { &hf_acse_RLRE_user_information,
+      { "user-information", "acse.user_information",
+        FT_NONE, BASE_NONE, NULL, 0,
+        "RLRE-apdu/user-information", HFILL }},
+    { &hf_acse_abort_source,
+      { "abort-source", "acse.abort_source",
+        FT_UINT32, BASE_DEC, VALS(acse_ABRT_source_vals), 0,
+        "ABRT-apdu/abort-source", HFILL }},
+    { &hf_acse_abort_diagnostic,
+      { "abort-diagnostic", "acse.abort_diagnostic",
+        FT_UINT32, BASE_DEC, VALS(acse_ABRT_diagnostic_vals), 0,
+        "ABRT-apdu/abort-diagnostic", HFILL }},
+    { &hf_acse_ABRT_user_information,
+      { "user-information", "acse.user_information",
+        FT_NONE, BASE_NONE, NULL, 0,
+        "ABRT-apdu/user-information", HFILL }},
+    { &hf_acse_a_user_data,
+      { "a-user-data", "acse.a_user_data",
+        FT_UINT32, BASE_DEC, VALS(acse_User_Data_vals), 0,
+        "A-DT-apdu/a-user-data", HFILL }},
+    { &hf_acse_ACRQ_aSO_context_name,
+      { "aSO-context-name", "acse.aSO_context_name",
+        FT_STRING, BASE_NONE, NULL, 0,
+        "ACRQ-apdu/aSO-context-name", HFILL }},
+    { &hf_acse_user_information,
+      { "user-information", "acse.user_information",
+        FT_NONE, BASE_NONE, NULL, 0,
+        "", HFILL }},
+    { &hf_acse_aSO_context_name,
+      { "aSO-context-name", "acse.aSO_context_name",
+        FT_NONE, BASE_NONE, NULL, 0,
+        "ACRP-apdu/aSO-context-name", HFILL }},
+    { &hf_acse_ap_title_form1,
+      { "ap-title-form1", "acse.ap_title_form1",
+        FT_UINT32, BASE_DEC, VALS(x509if_Name_vals), 0,
+        "AP-title/ap-title-form1", HFILL }},
+    { &hf_acse_ap_title_form2,
+      { "ap-title-form2", "acse.ap_title_form2",
+        FT_STRING, BASE_NONE, NULL, 0,
+        "AP-title/ap-title-form2", HFILL }},
+    { &hf_acse_ap_title_form3,
+      { "ap-title-form3", "acse.ap_title_form3",
+        FT_STRING, BASE_NONE, NULL, 0,
+        "AP-title/ap-title-form3", HFILL }},
+    { &hf_acse_aso_qualifier_form1,
+      { "aso-qualifier-form1", "acse.aso_qualifier_form1",
+        FT_NONE, BASE_NONE, NULL, 0,
+        "ASO-qualifier/aso-qualifier-form1", HFILL }},
+    { &hf_acse_aso_qualifier_form2,
+      { "aso-qualifier-form2", "acse.aso_qualifier_form2",
+        FT_INT32, BASE_DEC, NULL, 0,
+        "ASO-qualifier/aso-qualifier-form2", HFILL }},
+    { &hf_acse_aso_qualifier_form3,
+      { "aso-qualifier-form3", "acse.aso_qualifier_form3",
+        FT_STRING, BASE_NONE, NULL, 0,
+        "ASO-qualifier/aso-qualifier-form3", HFILL }},
+    { &hf_acse_ae_title_form1,
+      { "ae-title-form1", "acse.ae_title_form1",
+        FT_UINT32, BASE_DEC, VALS(x509if_Name_vals), 0,
+        "AE-title/ae-title-form1", HFILL }},
+    { &hf_acse_ae_title_form2,
+      { "ae-title-form2", "acse.ae_title_form2",
+        FT_STRING, BASE_NONE, NULL, 0,
+        "AE-title/ae-title-form2", HFILL }},
+    { &hf_acse_ASOI_tag_item,
+      { "Item", "acse.ASOI_tag_item",
+        FT_NONE, BASE_NONE, NULL, 0,
+        "ASOI-tag/_item", HFILL }},
+    { &hf_acse_qualifier,
+      { "qualifier", "acse.qualifier",
+        FT_UINT32, BASE_DEC, VALS(acse_ASO_qualifier_vals), 0,
+        "ASOI-tag/_item/qualifier", HFILL }},
+    { &hf_acse_identifier,
+      { "identifier", "acse.identifier",
+        FT_UINT32, BASE_DEC, NULL, 0,
+        "ASOI-tag/_item/identifier", HFILL }},
+    { &hf_acse_ASO_context_name_list_item,
+      { "Item", "acse.ASO_context_name_list_item",
+        FT_STRING, BASE_NONE, NULL, 0,
+        "ASO-context-name-list/_item", HFILL }},
+    { &hf_acse_context_list,
+      { "context-list", "acse.context_list",
+        FT_NONE, BASE_NONE, NULL, 0,
+        "Syntactic-context-list/context-list", HFILL }},
+    { &hf_acse_default_contact_list,
+      { "default-contact-list", "acse.default_contact_list",
+        FT_NONE, BASE_NONE, NULL, 0,
+        "Syntactic-context-list/default-contact-list", HFILL }},
+    { &hf_acse_Context_list_item,
+      { "Item", "acse.Context_list_item",
+        FT_NONE, BASE_NONE, NULL, 0,
+        "Context-list/_item", HFILL }},
+    { &hf_acse_pci,
+      { "pci", "acse.pci",
+        FT_INT32, BASE_DEC, NULL, 0,
+        "Context-list/_item/pci", HFILL }},
+    { &hf_acse_abstract_syntax,
+      { "abstract-syntax", "acse.abstract_syntax",
+        FT_STRING, BASE_NONE, NULL, 0,
+        "Context-list/_item/abstract-syntax", HFILL }},
+    { &hf_acse_transfer_syntaxes,
+      { "transfer-syntaxes", "acse.transfer_syntaxes",
+        FT_NONE, BASE_NONE, NULL, 0,
+        "Context-list/_item/transfer-syntaxes", HFILL }},
+    { &hf_acse_transfer_syntaxes_item,
+      { "Item", "acse.transfer_syntaxes_item",
+        FT_STRING, BASE_NONE, NULL, 0,
+        "Context-list/_item/transfer-syntaxes/_item", HFILL }},
+    { &hf_acse_Default_Context_List_item,
+      { "Item", "acse.Default_Context_List_item",
+        FT_NONE, BASE_NONE, NULL, 0,
+        "Default-Context-List/_item", HFILL }},
+    { &hf_acse_abstract_syntax_name,
+      { "abstract-syntax-name", "acse.abstract_syntax_name",
+        FT_STRING, BASE_NONE, NULL, 0,
+        "Default-Context-List/_item/abstract-syntax-name", HFILL }},
+    { &hf_acse_transfer_syntax_name,
+      { "transfer-syntax-name", "acse.transfer_syntax_name",
+        FT_STRING, BASE_NONE, NULL, 0,
+        "", HFILL }},
+    { &hf_acse_P_context_result_list_item,
+      { "Item", "acse.P_context_result_list_item",
+        FT_NONE, BASE_NONE, NULL, 0,
+        "P-context-result-list/_item", HFILL }},
+    { &hf_acse_Pcontext_result,
+      { "result", "acse.result",
+        FT_INT32, BASE_DEC, VALS(acse_Result_vals), 0,
+        "P-context-result-list/_item/result", HFILL }},
+    { &hf_acse_concrete_syntax_name,
+      { "concrete-syntax-name", "acse.concrete_syntax_name",
+        FT_STRING, BASE_NONE, NULL, 0,
+        "P-context-result-list/_item/concrete-syntax-name", HFILL }},
+    { &hf_acse_provider_reason,
+      { "provider-reason", "acse.provider_reason",
+        FT_INT32, BASE_DEC, VALS(acse_T_provider_reason_vals), 0,
+        "P-context-result-list/_item/provider-reason", HFILL }},
+    { &hf_acse_acse_service_user,
+      { "acse-service-user", "acse.acse_service_user",
+        FT_UINT32, BASE_DEC, VALS(acse_T_acse_service_user_vals), 0,
+        "Associate-source-diagnostic/acse-service-user", HFILL }},
+    { &hf_acse_acse_service_provider,
+      { "acse-service-provider", "acse.acse_service_provider",
+        FT_UINT32, BASE_DEC, VALS(acse_T_acse_service_provider_vals), 0,
+        "Associate-source-diagnostic/acse-service-provider", HFILL }},
+    { &hf_acse_Association_data_item,
+      { "Item", "acse.Association_data_item",
+        FT_NONE, BASE_NONE, NULL, 0,
+        "Association-data/_item", HFILL }},
+    { &hf_acse_simply_encoded_data,
+      { "simply-encoded-data", "acse.simply_encoded_data",
+        FT_BYTES, BASE_HEX, NULL, 0,
+        "User-Data/simply-encoded-data", HFILL }},
+    { &hf_acse_fully_encoded_data,
+      { "fully-encoded-data", "acse.fully_encoded_data",
+        FT_NONE, BASE_NONE, NULL, 0,
+        "User-Data/fully-encoded-data", HFILL }},
+    { &hf_acse_presentation_context_identifier,
+      { "presentation-context-identifier", "acse.presentation_context_identifier",
+        FT_INT32, BASE_DEC, NULL, 0,
+        "PDV-list/presentation-context-identifier", HFILL }},
+    { &hf_acse_presentation_data_values,
+      { "presentation-data-values", "acse.presentation_data_values",
+        FT_UINT32, BASE_DEC, VALS(acse_T_presentation_data_values_vals), 0,
+        "PDV-list/presentation-data-values", HFILL }},
+    { &hf_acse_simple_ASN1_type,
+      { "simple-ASN1-type", "acse.simple_ASN1_type",
+        FT_NONE, BASE_NONE, NULL, 0,
+        "PDV-list/presentation-data-values/simple-ASN1-type", HFILL }},
+    { &hf_acse_other_mechanism_name,
+      { "other-mechanism-name", "acse.other_mechanism_name",
+        FT_STRING, BASE_NONE, NULL, 0,
+        "Authentication-value-other/other-mechanism-name", HFILL }},
+    { &hf_acse_other_mechanism_value,
+      { "other-mechanism-value", "acse.other_mechanism_value",
+        FT_NONE, BASE_NONE, NULL, 0,
+        "Authentication-value-other/other-mechanism-value", HFILL }},
+    { &hf_acse_charstring,
+      { "charstring", "acse.charstring",
+        FT_STRING, BASE_NONE, NULL, 0,
+        "Authentication-value/charstring", HFILL }},
+    { &hf_acse_bitstring,
+      { "bitstring", "acse.bitstring",
+        FT_BYTES, BASE_HEX, NULL, 0,
+        "Authentication-value/bitstring", HFILL }},
+    { &hf_acse_external,
+      { "external", "acse.external",
+        FT_NONE, BASE_NONE, NULL, 0,
+        "Authentication-value/external", HFILL }},
+    { &hf_acse_other,
+      { "other", "acse.other",
+        FT_NONE, BASE_NONE, NULL, 0,
+        "Authentication-value/other", HFILL }},
+    { &hf_acse_T_AARQ_protocol_version_version1,
+      { "version1", "acse.version1",
+        FT_BOOLEAN, 8, NULL, 0x80,
+        "", HFILL }},
+    { &hf_acse_T_AARE_protocol_version_version1,
+      { "version1", "acse.version1",
+        FT_BOOLEAN, 8, NULL, 0x80,
+        "", HFILL }},
+    { &hf_acse_ACSE_requirements_authentication,
+      { "authentication", "acse.authentication",
+        FT_BOOLEAN, 8, NULL, 0x80,
+        "", HFILL }},
+    { &hf_acse_ACSE_requirements_aSO_context_negotiation,
+      { "aSO-context-negotiation", "acse.aSO-context-negotiation",
+        FT_BOOLEAN, 8, NULL, 0x40,
+        "", HFILL }},
+    { &hf_acse_ACSE_requirements_higher_level_association,
+      { "higher-level-association", "acse.higher-level-association",
+        FT_BOOLEAN, 8, NULL, 0x20,
+        "", HFILL }},
+    { &hf_acse_ACSE_requirements_nested_association,
+      { "nested-association", "acse.nested-association",
+        FT_BOOLEAN, 8, NULL, 0x10,
+        "", HFILL }},
+
+/*--- End of included file: packet-acse-hfarr.c ---*/
+
+  };
+
+  /* List of subtrees */
+  static gint *ett[] = {
+    &ett_acse,
+
+/*--- Included file: packet-acse-ettarr.c ---*/
+
+    &ett_acse_EXTERNAL,
+    &ett_acse_T_encoding,
+    &ett_acse_ACSE_apdu,
+    &ett_acse_AARQ_apdu,
+    &ett_acse_T_AARQ_protocol_version,
+    &ett_acse_AARE_apdu,
+    &ett_acse_T_AARE_protocol_version,
+    &ett_acse_RLRQ_apdu,
+    &ett_acse_RLRE_apdu,
+    &ett_acse_ABRT_apdu,
+    &ett_acse_A_DT_apdu,
+    &ett_acse_ACRQ_apdu,
+    &ett_acse_ACRP_apdu,
+    &ett_acse_ACSE_requirements,
+    &ett_acse_AP_title,
+    &ett_acse_ASO_qualifier,
+    &ett_acse_AE_title,
+    &ett_acse_ASOI_tag,
+    &ett_acse_ASOI_tag_item,
+    &ett_acse_ASO_context_name_list,
+    &ett_acse_Syntactic_context_list,
+    &ett_acse_Context_list,
+    &ett_acse_Context_list_item,
+    &ett_acse_SEQUENCE_OF_TransferSyntaxName,
+    &ett_acse_Default_Context_List,
+    &ett_acse_Default_Context_List_item,
+    &ett_acse_P_context_result_list,
+    &ett_acse_P_context_result_list_item,
+    &ett_acse_Associate_source_diagnostic,
+    &ett_acse_Association_data,
+    &ett_acse_User_Data,
+    &ett_acse_PDV_list,
+    &ett_acse_T_presentation_data_values,
+    &ett_acse_Authentication_value_other,
+    &ett_acse_Authentication_value,
+
+/*--- End of included file: packet-acse-ettarr.c ---*/
+
+  };
+
+  /* Register protocol */
+  proto_acse = proto_register_protocol(PNAME, PSNAME, PFNAME);
+  register_dissector("acse", dissect_acse, proto_acse);
+
+  /* Register fields and subtrees */
+  proto_register_field_array(proto_acse, hf, array_length(hf));
+  proto_register_subtree_array(ett, array_length(ett));
+
+/*XXX remove later   just to keep the other dissectors happy */
+register_dissector_table("acse.application_context", "Application context OID", FT_STRING, BASE_NONE); 
+
+  register_init_routine(acse_init);
 }
 
-void
-proto_reg_handoff_acse(void)
-{
-	/*   find data dissector  */
-	data_handle = find_dissector("data");
 
+/*--- proto_reg_handoff_acse -------------------------------------------*/
+void proto_reg_handoff_acse(void) {
+/*#include "packet-acse-dis-tab.c"*/
 }
 
-