Adding upstream version 4.2.2.upstream/4.2.2

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 4981 insertions, 0 deletions

diff --git a/epan/dissectors/packet-dmp.c b/epan/dissectors/packet-dmp.c
new file mode 100644
index 0000000..6029d30
--- /dev/null
+++ b/epan/dissectors/packet-dmp.c
@@ -0,0 +1,4981 @@
+/* packet-dmp.c
+ *
+ * Routines for STANAG 4406 Direct Message Profile packet disassembly.
+ * A protocol for optimised transfer of time-critical short messages
+ * for use with a reliable bearer service.  Checksum and retransmission
+ * mechanisms are activated when using unreliable bearer services.
+ *
+ * Copyright 2006, Stig Bjorlykke <stig@bjorlykke.org>, Thales Norway AS
+ *
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
+ * Copyright 1998 Gerald Combs
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ *
+ * Ref:  http://jcs.dtic.mil/j6/cceb/acps/acp123/
+ *       https://web.archive.org/web/20100326015412/http://jcs.dtic.mil/j6/cceb/acps/acp123/ACP123A.pdf
+ */
+
+/*
+ * TODO:
+ * - Dissect extended Restrictive security categories
+ * - Add Transmission/Retransmission statistics
+ */
+
+#include "config.h"
+
+#include <math.h>
+
+#include <epan/packet.h>
+#include <epan/to_str.h>
+#include <epan/prefs.h>
+#include <epan/expert.h>
+#include <epan/crc16-tvb.h>
+#include <epan/asn1.h>
+#include <epan/strutil.h>
+#include <epan/uat.h>
+#include <epan/proto_data.h>
+
+#include <wsutil/str_util.h>
+
+#include "packet-p1.h"
+#include "packet-p22.h"
+#include "packet-s5066sis.h"
+
+void proto_register_dmp(void);
+void proto_reg_handoff_dmp(void);
+
+#define PNAME  "Direct Message Profile"
+#define PSNAME "DMP"
+#define PFNAME "dmp"
+
+/* Default UDP Port Number */
+#define DEFAULT_DMP_PORT_RANGE "5031"
+
+/* Protocol Identifier */
+#define PROT_NAT 0x0D
+#define PROT_DMP 0x1D
+
+/* Versions supported */
+#define DMP_VERSION_1  1
+#define DMP_VERSION_2  2
+
+/* Message Type (dmp.msg_type) */
+#define STANAG   0x0
+#define IPM      0x1
+#define REPORT   0x2
+#define NOTIF    0x3
+#define ACK      0x4
+
+/* Message Identifier Type (dmp.msg_id_type) */
+#define ONLY_DMP_ID  0x0
+#define X400_MSG_ID  0x1
+#define NAT_MSG_ID   0x2
+
+/* Report Type (dmp.report_type) */
+#define DR       0x0
+#define NDR      0x1
+
+/* Notification Type (dmp.notif_type) */
+#define RN       0x0
+#define NRN      0x1
+#define ON       0x2
+
+/* Address Encoding (dmp.addr_enc) */
+#define DIRECT_ADDR   0x0
+#define EXTENDED_ADDR 0x1
+
+/* Address type (internal values) */
+#define ORIGINATOR   1
+#define P1_ADDRESS   2
+#define P2_ADDRESS   3
+#define ORIG_P2_ADDRESS   4
+
+/* Extended Address Form (dmp_addr_form) */
+#define P1_DIRECT             0x0
+#define P2_DIRECT             0x1
+#define P1_EXTENDED           0x2
+#define P2_EXTENDED           0x3
+#define P1_P2_DIRECT          0x4
+#define P1_DIRECT_P2_EXTENDED 0x5
+#define P1_EXTENDED_P2_DIRECT 0x6
+#define P1_P2_EXTENDED        0x7
+
+/* Extended Address Type */
+#define ASN1_BER 0x0
+#define ASN1_PER 0x1
+
+/* Security Policy (dmp_sec_pol) */
+#define NATO              0x4
+#define NATIONAL          0x5
+#define EXTENDED_NATIONAL 0x6
+#define EXTENDED_MISSION  0x7
+
+#define SEC_CAT_EXT_NONE        0x0
+#define SEC_CAT_EXT_PERMISSIVE  0x1
+#define SEC_CAT_EXT_RESTRICTIVE 0x2
+
+/* Body Format (dmp.body_format) */
+#define FREE_TEXT         0x0
+#define FREE_TEXT_SUBJECT 0x1
+#define STRUCTURED        0x2
+
+/* Encoded Information Types */
+#define EIT_BILATERAL     0x3
+
+/* Compression Algorithm */
+#define ALGORITHM_NONE    0x0
+#define ALGORITHM_ZLIB    0x1
+
+/* National Decoding */
+#define NAT_DECODE_NONE    0
+#define NAT_DECODE_DMP     1
+#define NAT_DECODE_THALES  2
+
+#define IPM_MODIFIER_X400  0
+
+/* Internal values for not present and reserved time values */
+#define DMP_TIME_NOT_PRESENT  -1
+#define DMP_TIME_RESERVED     -2
+
+#define ILLEGAL_FORMAT "<Illegal format>"
+#define TIME_NOT_REPRESENTABLE "<Time not representable>"
+
+/* Maximum lengths */
+#define MAX_SIC_LEN         30
+
+static int proto_dmp = -1;
+
+static int hf_dmp_id = -1;
+static int hf_mts_id = -1;
+static int hf_ipm_id = -1;
+
+static int hf_envelope = -1;
+static int hf_envelope_protocol_id = -1;
+static int hf_envelope_version = -1;
+static int hf_envelope_version_value = -1;
+static int hf_envelope_hop_count = -1;
+static int hf_envelope_hop_count_value = -1;
+static int hf_envelope_rec_present = -1;
+static int hf_envelope_addr_enc = -1;
+static int hf_envelope_checksum = -1;
+static int hf_envelope_extensions = -1;
+static int hf_envelope_msg_id_type = -1;
+static int hf_envelope_msg_id_length = -1;
+static int hf_envelope_mts_id_length = -1;
+static int hf_envelope_ipm_id_modifier = -1;
+static int hf_envelope_ipm_id_length = -1;
+static int hf_envelope_mts_id = -1;
+static int hf_envelope_ipm_id = -1;
+static int hf_envelope_type = -1;
+static int hf_envelope_msg_id = -1;
+static int hf_envelope_msg_id_12bit = -1;
+static int hf_envelope_subm_time = -1;
+static int hf_envelope_subm_time_value = -1;
+static int hf_envelope_time_diff_present = -1;
+static int hf_envelope_time_diff = -1;
+static int hf_envelope_time_diff_value = -1;
+static int hf_envelope_flags = -1;
+static int hf_envelope_content_id_discarded = -1;
+static int hf_envelope_recip_reassign_prohib = -1;
+static int hf_envelope_dl_expansion_prohib = -1;
+static int hf_envelope_recipients = -1;
+static int hf_envelope_ext_recipients = -1;
+
+static int hf_thales_ipm_id_modifier = -1;
+
+static int hf_extensions = -1;
+static int hf_extension = -1;
+static int hf_extension_header = -1;
+static int hf_extension_more = -1;
+static int hf_extension_length = -1;
+static int hf_extension_data = -1;
+
+static int hf_message_content = -1;
+static int hf_report_content = -1;
+static int hf_notif_content = -1;
+
+static int hf_addr_recipient = -1;
+static int hf_addr_originator = -1;
+static int hf_addr_reporting_name = -1;
+static int hf_addr_dl_expanded = -1;
+static int hf_addr_int_rec = -1;
+static int hf_addr_dir_addr_ext = -1;
+static int hf_addr_dir_rec_no = -1;
+static int hf_addr_dir_rec_no1 = -1;
+static int hf_addr_dir_rec_no2 = -1;
+static int hf_addr_dir_rec_no3 = -1;
+static int hf_addr_dir_rec_no_generated = -1;
+static int hf_addr_dir_rep_req1 = -1;
+static int hf_addr_dir_rep_req2 = -1;
+static int hf_addr_dir_rep_req3 = -1;
+static int hf_addr_dir_not_req1 = -1;
+static int hf_addr_dir_not_req2 = -1;
+static int hf_addr_dir_not_req3 = -1;
+static int hf_addr_dir_action = -1;
+static int hf_addr_dir_address = -1;
+static int hf_addr_dir_address1 = -1;
+static int hf_addr_dir_address2 = -1;
+static int hf_addr_dir_address3 = -1;
+static int hf_addr_dir_address_generated = -1;
+
+static int hf_addr_ext_form = -1;
+static int hf_addr_ext_form_orig_v1 = -1;
+static int hf_addr_ext_form_orig = -1;
+static int hf_addr_ext_action = -1;
+static int hf_addr_ext_rep_req = -1;
+static int hf_addr_ext_not_req = -1;
+static int hf_addr_ext_rec_ext = -1;
+static int hf_addr_ext_rec_no = -1;
+static int hf_addr_ext_rec_no1 = -1;
+static int hf_addr_ext_rec_no2 = -1;
+static int hf_addr_ext_rec_no_generated = -1;
+static int hf_addr_ext_address = -1;
+static int hf_addr_ext_type = -1;
+static int hf_addr_ext_type_ext = -1;
+static int hf_addr_ext_length = -1;
+static int hf_addr_ext_length1 = -1;
+static int hf_addr_ext_length2 = -1;
+static int hf_addr_ext_length_generated = -1;
+static int hf_addr_ext_asn1_ber = -1;
+static int hf_addr_ext_asn1_per = -1;
+static int hf_addr_ext_unknown = -1;
+
+static int hf_message_body = -1;
+static int hf_message_st_type = -1;
+static int hf_message_precedence = -1;
+static int hf_message_importance = -1;
+static int hf_message_body_format = -1;
+static int hf_message_sec_class_val = -1;
+static int hf_message_sec_pol = -1;
+static int hf_message_heading_flags = -1;
+static int hf_message_auth_users = -1;
+static int hf_message_subject_disc = -1;
+static int hf_message_national_policy_id = -1;
+static int hf_message_mission_policy_id = -1;
+static int hf_message_sec_label = -1;
+static int hf_message_sec_cat_nat = -1;
+static int hf_message_sec_cat_val = -1;
+static int hf_message_sec_cat_cl = -1;
+static int hf_message_sec_cat_cs = -1;
+static int hf_message_sec_cat_ex = -1;
+static int hf_message_sec_cat_ne = -1;
+static int hf_message_sec_cat_permissive = -1;
+static int hf_message_sec_cat_country_code = -1;
+static int hf_message_sec_cat_restrictive = -1;
+static int hf_message_sec_cat_extended = -1;
+static int hf_message_sec_cat_bit0 = -1;
+static int hf_message_sec_cat_bit1 = -1;
+static int hf_message_sec_cat_bit2 = -1;
+static int hf_message_sec_cat_bit3 = -1;
+static int hf_message_sec_cat_bit4 = -1;
+static int hf_message_sec_cat_bit5 = -1;
+static int hf_message_sec_cat_bit6 = -1;
+static int hf_message_sec_cat_bit7 = -1;
+static int hf_message_exp_time = -1;
+static int hf_message_exp_time_val = -1;
+static int hf_message_dtg = -1;
+static int hf_message_dtg_sign = -1;
+static int hf_message_dtg_val = -1;
+static int hf_message_sic = -1;
+static int hf_message_sic_key = -1;
+static int hf_message_sic_key_values = -1;
+static int hf_message_sic_key_type = -1;
+static int hf_message_sic_key_chars = -1;
+static int hf_message_sic_key_num = -1;
+static int hf_message_sic_bitmap = -1;
+static int hf_message_sic_bits = -1;
+static int hf_message_sic_bits_any = -1;
+static int hf_message_subj_id = -1;
+static int hf_message_subj_mts_id = -1;
+static int hf_message_subj_ipm_id = -1;
+
+static int hf_message_subject = -1;
+static int hf_message_eit = -1;
+static int hf_message_compr = -1;
+static int hf_message_body_data = -1;
+static int hf_message_body_compressed = -1;
+static int hf_message_body_plain = -1;
+static int hf_message_body_structured = -1;
+
+static int hf_delivery_report = -1;
+static int hf_non_delivery_report = -1;
+static int hf_report_type = -1;
+static int hf_report_info_present_dr = -1;
+static int hf_report_addr_enc_dr = -1;
+static int hf_report_del_time = -1;
+static int hf_report_del_time_val = -1;
+static int hf_report_addr_enc_ndr = -1;
+static int hf_report_reason = -1;
+static int hf_report_info_present_ndr = -1;
+static int hf_report_diagn = -1;
+static int hf_report_suppl_info_len = -1;
+static int hf_report_suppl_info = -1;
+
+static int hf_receipt_notif = -1;
+static int hf_non_receipt_notif = -1;
+static int hf_other_notif = -1;
+static int hf_notif_type = -1;
+static int hf_notif_rec_time = -1;
+static int hf_notif_rec_time_val = -1;
+static int hf_notif_suppl_info_len = -1;
+static int hf_notif_suppl_info = -1;
+static int hf_notif_non_rec_reason = -1;
+static int hf_notif_discard_reason = -1;
+static int hf_notif_on_type = -1;
+static int hf_notif_acp127 = -1;
+static int hf_notif_acp127recip = -1;
+
+static int hf_ack = -1;
+static int hf_ack_reason = -1;
+static int hf_ack_diagnostic = -1;
+static int hf_ack_recips = -1;
+
+static int hf_checksum = -1;
+static int hf_checksum_status = -1;
+
+static int hf_analysis_ack_time = -1;
+static int hf_analysis_total_time = -1;
+static int hf_analysis_retrans_time = -1;
+static int hf_analysis_total_retrans_time = -1;
+static int hf_analysis_msg_num = -1;
+static int hf_analysis_acks_msg_num = -1;
+static int hf_analysis_retrans_no = -1;
+static int hf_analysis_ack_num = -1;
+static int hf_analysis_ack_missing = -1;
+static int hf_analysis_ack_dup_no = -1;
+/* static int hf_analysis_rep_num = -1; */
+static int hf_analysis_acks_rep_num = -1;
+static int hf_analysis_rep_time = -1;
+/* static int hf_analysis_not_num = -1; */
+static int hf_analysis_acks_not_num = -1;
+static int hf_analysis_not_time = -1;
+static int hf_analysis_msg_resend_from = -1;
+static int hf_analysis_rep_resend_from = -1;
+static int hf_analysis_not_resend_from = -1;
+static int hf_analysis_ack_resend_from = -1;
+
+static int hf_reserved_0x01 = -1;
+static int hf_reserved_0x02 = -1;
+static int hf_reserved_0x04 = -1;
+static int hf_reserved_0x07 = -1;
+static int hf_reserved_0x08 = -1;
+static int hf_reserved_0x0F = -1;
+static int hf_reserved_0x1F = -1;
+static int hf_reserved_0x20 = -1;
+static int hf_reserved_0x40 = -1;
+static int hf_reserved_0xC0 = -1;
+static int hf_reserved_0xE0 = -1;
+static int hf_reserved_0x8000 = -1;
+
+static gint ett_dmp = -1;
+static gint ett_envelope = -1;
+static gint ett_envelope_version = -1;
+static gint ett_envelope_hop_count = -1;
+static gint ett_envelope_rec_present = -1;
+static gint ett_envelope_addr_enc = -1;
+static gint ett_envelope_checksum = -1;
+static gint ett_envelope_extensions = -1;
+static gint ett_envelope_msg_id_type = -1;
+static gint ett_envelope_msg_id = -1;
+static gint ett_envelope_mts_id_length = -1;
+static gint ett_envelope_ipm_id_length = -1;
+static gint ett_envelope_cont_type = -1;
+static gint ett_envelope_subm_time = -1;
+static gint ett_envelope_time_diff = -1;
+static gint ett_envelope_flags = -1;
+static gint ett_envelope_recipients = -1;
+static gint ett_envelope_ext_recipients = -1;
+static gint ett_envelope_addresses = -1;
+
+static gint ett_address = -1;
+static gint ett_address_direct = -1;
+static gint ett_address_rec_no = -1;
+static gint ett_address_extended = -1;
+static gint ett_address_ext_form = -1;
+static gint ett_address_ext_rec_no = -1;
+static gint ett_address_ext_action = -1;
+static gint ett_address_ext_rep_req = -1;
+static gint ett_address_ext_not_req = -1;
+static gint ett_address_ext_type = -1;
+static gint ett_address_ext_length = -1;
+
+static gint ett_extensions = -1;
+static gint ett_extension = -1;
+static gint ett_extension_header = -1;
+
+static gint ett_content = -1;
+
+static gint ett_message = -1;
+static gint ett_message_st_type = -1;
+static gint ett_message_reserved = -1;
+static gint ett_message_precedence = -1;
+static gint ett_message_importance = -1;
+static gint ett_message_body_format = -1;
+static gint ett_message_sec_class = -1;
+static gint ett_message_sec_pol = -1;
+static gint ett_message_sec_cat = -1;
+static gint ett_message_heading_flags = -1;
+static gint ett_message_exp_time = -1;
+static gint ett_message_dtg = -1;
+static gint ett_message_sic = -1;
+static gint ett_message_sic_key = -1;
+static gint ett_message_sic_bitmap = -1;
+static gint ett_message_sic_bits = -1;
+static gint ett_message_eit = -1;
+static gint ett_message_compr = -1;
+static gint ett_message_body_reserved = -1;
+static gint ett_message_body = -1;
+
+static gint ett_report = -1;
+static gint ett_report_type = -1;
+static gint ett_report_info_present_dr = -1;
+static gint ett_report_info_present_ndr = -1;
+static gint ett_report_addr_enc_dr = -1;
+static gint ett_report_addr_enc_ndr = -1;
+static gint ett_report_reserved = -1;
+static gint ett_report_del_time = -1;
+static gint ett_report_reason = -1;
+static gint ett_report_suppl_info = -1;
+static gint ett_report_diagn = -1;
+
+static gint ett_notif = -1;
+static gint ett_notif_type = -1;
+static gint ett_notif_rec_time = -1;
+static gint ett_notif_suppl_info = -1;
+static gint ett_notif_acp127recip = -1;
+
+static gint ett_ack = -1;
+static gint ett_ack_recips = -1;
+
+static gint ett_analysis = -1;
+
+static expert_field ei_reserved_value = EI_INIT;
+static expert_field ei_message_sic_illegal = EI_INIT;
+static expert_field ei_envelope_version_value = EI_INIT;
+static expert_field ei_message_compr = EI_INIT;
+static expert_field ei_ack_reason = EI_INIT;
+static expert_field ei_addr_dir_rec_no_generated = EI_INIT;
+static expert_field ei_checksum_bad = EI_INIT;
+static expert_field ei_message_body_uncompress = EI_INIT;
+static expert_field ei_addr_ext_rec_no_generated = EI_INIT;
+static expert_field ei_envelope_msg_id = EI_INIT;
+static expert_field ei_7bit_string_unused_bits = EI_INIT;
+static expert_field ei_analysis_ack_missing = EI_INIT;
+static expert_field ei_analysis_ack_dup_no = EI_INIT;
+static expert_field ei_analysis_ack_unexpected = EI_INIT;
+static expert_field ei_analysis_msg_missing = EI_INIT;
+static expert_field ei_analysis_retrans_no = EI_INIT;
+static expert_field ei_too_many_sec_cat = EI_INIT;
+
+static dissector_handle_t dmp_handle;
+
+typedef struct _dmp_id_key {
+  guint   id;
+  address src;
+  address dst;
+} dmp_id_key;
+
+typedef struct _dmp_id_val {
+  gint     msg_type;                   /* Message type                   */
+  guint    prev_msg_id;                /* Previous message package num   */
+  guint    msg_id;                     /* Message package num            */
+  guint    ack_id;                     /* Acknowledgement package num    */
+  guint    rep_id;                     /* Report package num             */
+  guint    not_id;                     /* Notification package num       */
+  nstime_t msg_time;                   /* Message receive time           */
+  nstime_t first_msg_time;             /* First message receive time     */
+  nstime_t prev_msg_time;              /* Previous message receive time  */
+  nstime_t rep_not_msg_time;           /* Report or Notification time    */
+  guint32  msg_resend_count;           /* Message resend counter         */
+  guint32  ack_resend_count;           /* Acknowledgement resend counter */
+} dmp_id_val;
+
+static wmem_map_t *dmp_id_hash_table = NULL;
+static wmem_map_t *dmp_long_id_hash_table = NULL;
+
+/* Global values used in several functions */
+static struct dmp_data {
+  gint     version;
+  gint     prot_id;
+  gint     addr_enc;
+  gint     checksum;
+  gint     msg_type;
+  gint     st_type;
+  gint     prec;
+  gint     body_format;
+  gint     notif_type;
+  gint32   subm_time;
+  guint8   msg_id_type;
+  guint8   mts_id_length;
+  proto_item *mts_id_item;
+  guint8   ack_reason;
+  guint16  msg_id;
+  guint16  subj_id;
+  gboolean extensions;
+  gboolean dr;
+  gboolean ndr;
+  gboolean notif_req;
+  gboolean ack_rec_present;
+  dmp_id_val *id_val;
+} dmp;
+
+/* User definable values */
+static gint     dmp_nat_decode = NAT_DECODE_DMP;
+static gint     dmp_local_nation = 0;
+static gboolean use_seq_ack_analysis = TRUE;
+static gboolean dmp_align = FALSE;
+
+typedef struct _dmp_security_class_t {
+  guint nation;
+  guint sec_class;
+  char *name;
+} dmp_security_class_t;
+
+static dmp_security_class_t *dmp_security_classes;
+static guint num_dmp_security_classes;
+
+static const true_false_string addr_enc = {
+  "Use Extended Encoding", "Use Direct Encoding"
+};
+
+static const true_false_string dtg_sign = {
+  "Future", "Past"
+};
+
+static const true_false_string report_type = {
+  "Non-Delivery Report", "Delivery Report"
+};
+
+static const value_string version_vals[] = {
+  { 0x0, "1"       },
+  { 0x1, "2"       },
+  { 0x2, "Unknown" },
+  { 0x3, "Unknown" },
+  { 0x4, "Unknown" },
+  { 0x5, "Unknown" },
+  { 0x6, "Unknown" },
+  { 0x7, "Unknown" },
+  { 0,   NULL } };
+
+static const value_string type_vals[] = {
+  { 0x0, "Message"          },
+  { 0x1, "Message (E-Mail)" },
+  { 0x2, "Report"           },
+  { 0x3, "Notification"     },
+  { 0x4, "Acknowledgement"  },
+  { 0x5, "Unknown Content"  },
+  { 0x6, "Unknown Content"  },
+  { 0x7, "Unknown Content"  },
+  { 0,   NULL } };
+
+static const value_string msg_id_type_vals[] = {
+  { 0x0, "DMP Identifiers only"      },
+  { 0x1, "X.400 Message Identifiers" },
+  { 0x2, "Nationally-defined"        },
+  { 0x3, "Reserved"                  },
+  { 0,   NULL } };
+
+static const value_string msg_id_length_vals[] = {
+  { 0x0, "Full (16 bits)"  },
+  { 0x1, "Short (12 bits)" },
+  { 0,   NULL } };
+
+static const value_string report_vals[] = {
+  { 0x0, "No Report"           },
+  { 0x1, "Non-Delivery Report" },
+  { 0x2, "Delivery Report"     },
+  { 0x3, "Reserved"            },
+  { 0,   NULL } };
+
+static const value_string report_vals_ext[] = {
+  { 0x0, "No Report"                 },
+  { 0x1, "Non-Delivery Report"       },
+  { 0x2, "Delivery Report"           },
+  { 0x3, "Recipient Number Extended" },
+  { 0,   NULL } };
+
+/* Note the space in front of these values */
+static const value_string report_vals_short[] = {
+  { 0x1, " NDR" },
+  { 0x2, " DR"  },
+  { 0,   NULL } };
+
+static const value_string notif_vals[] = {
+  { 0x0, "No Notification"          },
+  { 0x1, "Non-Receipt Notification" },
+  { 0x2, "Receipt Notification"     },
+  { 0x3, "Reserved"                 },
+  { 0,   NULL } };
+
+static const value_string notif_vals_ext[] = {
+  { 0x0, "No Notification"          },
+  { 0x1, "Non-Receipt Notification" },
+  { 0x2, "Receipt Notification"     },
+  { 0x3, "Direct Address Extended"  },
+  { 0,   NULL } };
+
+/* Note the space in front of these values */
+static const value_string notif_vals_short[] = {
+  { 0x1, " NRN" },
+  { 0x2, " RN"  },
+  { 0,   NULL } };
+
+static const value_string notif_type [] = {
+  { 0x0, "Receipt Notification (RN)"      },
+  { 0x1, "Non-Receipt Notification (NRN)" },
+  { 0x2, "Other Notification (ON)"        },
+  { 0x3, "Unknown Notification"           },
+  { 0,   NULL } };
+
+/* Note the space behind these values */
+static const value_string addr_type_str [] = {
+  { ORIGINATOR,      ""          },
+  { P1_ADDRESS,      "P1 "       },
+  { P2_ADDRESS,      "P22/P772 " },
+  { ORIG_P2_ADDRESS, "P22 "      },
+  { 0,          NULL } };
+
+static const value_string addr_form [] = {
+  { 0x0, "P1 Direct"                       },
+  { 0x1, "P22/P772 Direct"                 },
+  { 0x2, "P1 Extended"                     },
+  { 0x3, "P22/P772 Extended"               },
+  { 0x4, "P1 and P22/P772 Direct"          },
+  { 0x5, "P1 Direct and P22/P772 Extended" },
+  { 0x6, "P1 Extended and P22/P772 Direct" },
+  { 0x7, "P1 and P22/P772 Extended"        },
+  { 0,   NULL } };
+
+static const value_string addr_form_orig_v1 [] = {
+  { 0x0, "Direct"                             },
+  { 0x1, "Reserved"                           },
+  { 0x2, "Extended"                           },
+  { 0x3, "Reserved"                           },
+  { 0x4, "Reserved"                           },
+  { 0x5, "Reserved"                           },
+  { 0x6, "Reserved"                           },
+  { 0x7, "Reserved"                           },
+  { 0,   NULL } };
+
+static const value_string addr_form_orig [] = {
+  { 0x0, "Direct"                             },
+  { 0x1, "Reserved"                           },
+  { 0x2, "Extended"                           },
+  { 0x3, "Reserved"                           },
+  { 0x4, "Originator and P2 Direct"           },
+  { 0x5, "Originator Direct and P2 Extended"  },
+  { 0x6, "Originator Extended and P2 Direct"  },
+  { 0x7, "Originator and P2 Extended"         },
+  { 0,   NULL } };
+
+static const value_string ext_addr_type [] = {
+  { 0x0, "ASN.1 BER-encoded OR-name" },
+  { 0x1, "ASN.1 PER-encoded OR-name" },
+  { 0x2, "Reserved" },
+  { 0x3, "Reserved" },
+  { 0x4, "Reserved" },
+  { 0x5, "Reserved" },
+  { 0x6, "Reserved" },
+  { 0x7, "Address Length Extended" },
+  { 0,   NULL } };
+
+static const value_string ext_addr_type_ext [] = {
+  { 0x0, "ASN.1 BER-encoded OR-name" },
+  { 0x1, "ASN.1 PER-encoded OR-name" },
+  { 0x2, "Reserved" },
+  { 0x3, "Reserved" },
+  { 0x4, "Reserved" },
+  { 0x5, "Reserved" },
+  { 0x6, "Reserved" },
+  { 0x7, "Reserved" },
+  { 0,   NULL } };
+
+static const value_string ext_addr_type_short [] = {
+  { 0x0, "OR-name (BER)" },
+  { 0x1, "OR-name (PER)" },
+  { 0x2, "Reserved" },
+  { 0x3, "Reserved" },
+  { 0x4, "Reserved" },
+  { 0x5, "Reserved" },
+  { 0x6, "Reserved" },
+  { 0x7, "Reserved" },
+  { 0,   NULL } };
+
+static const value_string message_type_vals[] = {
+  { 0x0, "Operation" },
+  { 0x1, "Project"   },
+  { 0x2, "Exercise"  },
+  { 0x3, "Drill"     },
+  { 0,   NULL } };
+
+static const value_string precedence[] = {
+  { 0x0, "Deferred"  },
+  { 0x1, "Routine"   },
+  { 0x2, "Priority"  },
+  { 0x3, "Immediate" },
+  { 0x4, "Flash"     },
+  { 0x5, "Override"  },
+  { 0x6, "Priority, Info Precedence: Routine"   },
+  { 0x7, "Immediate, Info Precedence: Routine"  },
+  { 0,   NULL } };
+
+static const value_string importance[] = {
+  { 0x0, "Low"      },
+  { 0x1, "Reserved" },
+  { 0x2, "Normal"   },
+  { 0x3, "Reserved" },
+  { 0x4, "High"     },
+  { 0x5, "Reserved" },
+  { 0x6, "Reserved" },
+  { 0x7, "Reserved" },
+  { 0,   NULL } };
+
+static const value_string sec_class[] = {
+  { 0x0, "Unmarked"     },
+  { 0x1, "Unclassified" },
+/* { 0x2, "Reserved"     }, */
+  { 0x3, "Restricted"   },
+/* { 0x4, "Reserved"     }, */
+  { 0x5, "Confidential" },
+  { 0x6, "Secret"       },
+  { 0x7, "Top secret"   },
+  { 0,   NULL } };
+
+static const value_string sec_pol[] = {
+  { 0x0, "Network defined"                   },
+  { 0x1, "Network defined"                   },
+  { 0x2, "Network defined"                   },
+  { 0x3, "Network defined"                   },
+  { 0x4, "NATO"                              },
+  { 0x5, "National (nation of local server)" },
+  { 0x6, "Extended, National"                },
+  { 0x7, "Extended, Mission Defined"         },
+  { 0,   NULL } };
+
+/* For name we use the ISO 3166-1 Alfa-3 value for the country,
+ * for description we use the Country Name and
+ * for value we use the DMP value for National Policy Identifier.
+ */
+static const enum_val_t dmp_national_values[] = {
+  { "???",  "None", 0x00 },
+  { "alb",  "Albania", 0x1B },
+  { "arm",  "Armenia", 0x20 },
+  { "aut",  "Austria", 0x21 },
+  { "aze",  "Azerbaijan", 0x22 },
+  { "blr",  "Belarus", 0x23 },
+  { "bel",  "Belgium", 0x01 },
+  { "bih",  "Bosnia and Hercegowina", 0x24 },
+  { "bgr",  "Bulgaria", 0x02 },
+  { "can",  "Canada", 0x03 },
+  { "hrv",  "Croatia", 0x1C },
+  { "cze",  "Czech Republic", 0x04 },
+  { "dnk",  "Denmark", 0x05 },
+  { "est",  "Estonia", 0x06 },
+  { "eapc", "Euro-Atlantic Partnership Council (EAPC)", 0x3A },
+  { "eu",   "European Union (EU)", 0x3B },
+  { "fin",  "Finland", 0x25 },
+  { "mkd",  "Former Yugoslav Republic of Macedonia", 0x26 },
+  { "fra",  "France", 0x07 },
+  { "geo",  "Georgia", 0x27 },
+  { "deu",  "Germany", 0x08 },
+  { "grc",  "Greece", 0x09 },
+  { "hun",  "Hungary", 0x0A },
+  { "isl",  "Iceland", 0x0B },
+  { "isaf", "International Security Assistance Force (ISAF)", 0x3C },
+  { "irl",  "Ireland", 0x28 },
+  { "ita",  "Italy", 0x0C },
+  { "kaz",  "Kazakhstan", 0x29 },
+  { "kgz",  "Kyrgyztan", 0x2A },
+  { "lva",  "Latvia", 0x0D },
+  { "ltu",  "Lithuania", 0x0E },
+  { "lux",  "Luxembourg", 0x0F },
+  { "mlt",  "Malta", 0x2B },
+  { "mda",  "Moldova", 0x2C },
+  { "mne",  "Montenegro", 0x2D },
+  { "nld",  "Netherlands", 0x10 },
+  { "nor",  "Norway", 0x11 },
+  { "pfp",  "Partnership for Peace (PfP)", 0x3D },
+  { "pol",  "Poland", 0x12 },
+  { "ptr",  "Portugal", 0x13 },
+  { "rou",  "Romania", 0x14 },
+  { "rus",  "Russian Federation", 0x2E },
+  { "srb",  "Serbia", 0x2F },
+  { "svk",  "Slovakia", 0x15 },
+  { "svn",  "Slovenia", 0x16 },
+  { "esp",  "Spain", 0x17 },
+  { "swe",  "Sweden", 0x30 },
+  { "che",  "Switzerland", 0x31 },
+  { "tjk",  "Tajikistan", 0x32 },
+  { "tur",  "Turkey", 0x18 },
+  { "tkm",  "Turkmenistan", 0x33 },
+  { "gbr",  "United Kingdom", 0x19 },
+  { "usa",  "United States", 0x1A },
+  { "ukr",  "Ukraine", 0x34 },
+  { "uzb",  "Uzbekistan", 0x35 },
+  { "weu",  "Western European Union (WEU)", 0x3E },
+  { NULL, NULL, 0 }
+};
+
+#define MAX_NATIONAL_VALUES array_length(dmp_national_values)
+/* Will be built in build_national_strings() */
+static value_string nat_pol_id[MAX_NATIONAL_VALUES];
+
+static const value_string ext_sec_cat[] = {
+  { 0x0, "Not present"                  },
+  { 0x1, "Permissive category follows"  },
+  { 0x2, "Restrictive category follows" },
+  { 0x3, "Reserved"                     },
+  { 0,   NULL } };
+
+static const value_string sic_key_type[] = {
+  { 0xc, "2 or more 3-character SICs"      },
+  { 0xd, "1 or more 3-to-8 character SICs" },
+  { 0,   NULL } };
+
+static const true_false_string sic_key_chars = {
+  "Any", "[A-Z0-9] only"
+};
+
+static const value_string sic_key_num[] = {
+  { 0, "1"  },
+  { 1, "2"  },
+  { 2, "3"  },
+  { 3, "4"  },
+  { 4, "5"  },
+  { 5, "6"  },
+  { 6, "7"  },
+  { 7, "8"  },
+  { 0, NULL } };
+
+
+static const value_string sic_bit_vals[] = {
+  { 0,   "length:6, bytes:4" },
+  { 1,   "length:6, bytes:4" },
+  { 2,   "length:6, bytes:4" },
+  { 3,   "length:6, bytes:4" },
+  { 4,   "length:6, bytes:4" },
+  { 5,   "length:6, bytes:4" },
+  { 6,   "length:6, bytes:4" },
+  { 7,   "length:6, bytes:4" },
+  { 8,   "length:6, bytes:4" },
+  { 9,   "reserved"          },
+  { 10,  "length:5, bytes:4" },
+  { 11,  "length:8, bytes:6" },
+  { 12,  "length:4, bytes:3" },
+  { 13,  "length:4, bytes:3" },
+  { 14,  "length:7, bytes:5" },
+  { 15,  "length:7, bytes:5" },
+  { 0,   NULL } };
+
+static const value_string sic_bit_any_vals[] = {
+  { 0,   "length:5, bytes:4" },
+  { 1,   "length:5, bytes:4" },
+  { 2,   "length:5, bytes:4" },
+  { 3,   "length:5, bytes:4" },
+  { 4,   "length:5, bytes:4" },
+  { 5,   "length:5, bytes:4" },
+  { 6,   "length:5, bytes:4" },
+  { 7,   "length:5, bytes:4" },
+  { 8,   "length:5, bytes:4" },
+  { 9,   "length:8, bytes:7" },
+  { 10,  "length:4, bytes:4" },
+  { 11,  "length:7, bytes:6" },
+  { 12,  "length:6, bytes:5" },
+  { 13,  "length:6, bytes:5" },
+  { 14,  "length:6, bytes:5" },
+  { 15,  "length:6, bytes:5" },
+  { 0,   NULL } };
+
+static const value_string body_format_vals[] = {
+  { 0x0, "Free text"                    },
+  { 0x1, "Free text including subject"  },
+  { 0x2, "Structured"                   },
+  { 0x3, "Reserved"                     },
+  { 0,   NULL } };
+
+static const value_string eit_vals[] = {
+  { 0x0, "Empty"                             },
+  { 0x1, "IA5-text"                          },
+  { 0x2, "General text"                      },
+  { 0x3, "Bilaterally defined (binary data)" },
+  { 0x4, "AdatP-3"                           },
+  { 0x5, "Reserved"                          },
+  { 0x6, "Reserved"                          },
+  { 0x7, "Reserved"                          },
+  { 0,   NULL } };
+
+static const value_string compression_vals[] = {
+  { 0x0, "No compression"  },
+  { 0x1, "ZLib compressed" },
+  { 0x2, "Reserved"        },
+  { 0x3, "Reserved"        },
+  { 0,   NULL } };
+
+static const value_string ack_reason [] = {
+  { 0x00, "Successful, positive acknowledgement" },
+  { 0x01, "Unspecified error"                    },
+  { 0x02, "Checksum incorrect"                   },
+  { 0,    NULL } };
+
+static const value_string non_del_reason [] = {
+  { 0x3D, "Unknown reason"                     },
+  { 0x3E, "Reason code greater than 0x3c (60)" },
+  { 0x3F, "Reserved"                           },
+  { 0,    NULL } };
+
+static const value_string non_del_diagn [] = {
+  { 0x7C, "Diagnostic not specified"                },
+  { 0x7D, "Unknown diagnostic"                      },
+  { 0x7E, "Diagnostic code greater than 0x7b (123)" },
+  { 0x7F, "Reserved"                                },
+  { 0,    NULL } };
+
+static const value_string discard_reason [] = {
+  { 0xFE, "Discard Reason absent" },
+  { 0xFF, "Reserved"              },
+  { 0,    NULL } };
+
+static const value_string on_type [] = {
+  { 0x00, "acp127-nn" },
+  { 0x01, "acp127-pn" },
+  { 0x02, "acp127-tn" },
+  { 0,    NULL } };
+
+static const value_string ack_msg_type [] = {
+  { STANAG, " (message)" },
+  { IPM,    " (e-mail)"  },
+  { REPORT, " (report)"  },
+  { NOTIF,  " (notif)"   },
+  { ACK,    " (ack)"     },
+  { 0,      NULL } };
+
+static const enum_val_t national_decoding[] = {
+  { "none",    "None (raw data)", NAT_DECODE_NONE   },
+  { "dmp",     "As for regular",  NAT_DECODE_DMP    },
+  { "thales",  "Thales XOmail",   NAT_DECODE_THALES },
+  { NULL,      NULL, 0 }
+};
+
+static const value_string ipm_id_modifier[] = {
+  { 0x0,  "X.400 IPM Identifier" },
+  { 0x1,  "Nationally-defined"   },
+  { 0x2,  "Nationally-defined"   },
+  { 0x3,  "Nationally-defined"   },
+  { 0, NULL }
+};
+
+static const value_string thales_ipm_id_modifier[] = {
+  { 0x0,  "X.400 IPM Identifier" },
+  { 0x1,  "3 or 5 digits"        },
+  { 0x2,  "4 digits"             },
+  { 0x3,  "5 digits"             },
+  { 0, NULL }
+};
+
+UAT_VS_DEF(dmp_security_class, nation, dmp_security_class_t, guint, 0, "None")
+UAT_DEC_CB_DEF(dmp_security_class, sec_class, dmp_security_class_t)
+UAT_CSTRING_CB_DEF(dmp_security_class, name, dmp_security_class_t)
+
+static void *
+dmp_class_copy_cb(void *dest, const void *orig, size_t len _U_)
+{
+  dmp_security_class_t *u = (dmp_security_class_t *)dest;
+  const dmp_security_class_t *o = (const dmp_security_class_t *)orig;
+
+  u->nation = o->nation;
+  u->sec_class = o->sec_class;
+  u->name = g_strdup(o->name);
+
+  return dest;
+}
+
+static void
+dmp_class_free_cb(void *r)
+{
+  dmp_security_class_t *u = (dmp_security_class_t *)r;
+
+  g_free(u->name);
+}
+
+static gchar *dmp_national_sec_class (guint nation, guint dmp_sec_class)
+{
+  guint i;
+
+  for (i = 0; i < num_dmp_security_classes; i++) {
+    dmp_security_class_t *u = &(dmp_security_classes[i]);
+
+    if (u->nation == nation && u->sec_class == dmp_sec_class) {
+      return u->name;
+    }
+  }
+
+  return NULL;
+}
+
+static void build_national_strings (void)
+{
+  guint i = 0;
+
+  /*
+  ** We use values from dmp_national_values to build value_string for nat_pol_id.
+  */
+  for (i = 0; i < MAX_NATIONAL_VALUES; i++) {
+    nat_pol_id[i].value  = dmp_national_values[i].value;
+    nat_pol_id[i].strptr = dmp_national_values[i].description;
+  }
+}
+
+static const gchar *get_nat_pol_id_short (gint nation)
+{
+  gint i = 0;
+  while (dmp_national_values[i].name) {
+    if (dmp_national_values[i].value == nation) {
+      return dmp_national_values[i].name;
+    }
+    i++;
+  }
+
+  return "???";
+}
+
+static const gchar *msg_type_to_str (void)
+{
+  const gchar *msg_type;
+  gboolean     have_msg = FALSE;
+
+  switch (dmp.msg_type) {
+
+  case STANAG:
+    /* Include message type and precedence */
+    msg_type = wmem_strdup_printf (wmem_packet_scope(), "%s (%s) [%s]",
+                val_to_str_const (dmp.msg_type, type_vals, "Unknown"),
+                val_to_str_const (dmp.st_type, message_type_vals, "Unknown"),
+                (dmp.prec == 0x6 || dmp.prec == 0x7) ?
+                val_to_str_const (dmp.prec-4, precedence, "Unknown") :
+                val_to_str_const (dmp.prec, precedence, "Unknown"));
+    break;
+
+  case IPM:
+    /* Include importance */
+    msg_type = wmem_strdup_printf (wmem_packet_scope(), "%s [%s]",
+                val_to_str_const (dmp.msg_type, type_vals, "Unknown"),
+                val_to_str_const (dmp.prec, importance, "Unknown"));
+    break;
+
+  case REPORT:
+    /* Include report types included */
+    msg_type = wmem_strdup_printf (wmem_packet_scope(), "Report (%s%s%s)",
+                dmp.dr ? "DR" : "", (dmp.dr && dmp.ndr) ? " and " : "",
+                dmp.ndr ? "NDR" : "");
+    break;
+
+  case NOTIF:
+    msg_type = val_to_str_const (dmp.notif_type, notif_type, "Unknown");
+    break;
+
+  case ACK:
+    /* If we have msg_time we have a matching packet */
+    have_msg = (dmp.id_val &&
+                (dmp.id_val->msg_time.secs>0 || dmp.id_val->msg_time.nsecs>0));
+    msg_type = wmem_strdup_printf (wmem_packet_scope(), "Acknowledgement%s%s",
+                have_msg ? val_to_str (dmp.id_val->msg_type, ack_msg_type,
+                                       " (unknown:%d)") : "",
+                dmp.ack_reason ? " [negative]" : "");
+    break;
+
+  default:
+    msg_type = "Unknown";
+    break;
+  }
+
+  return msg_type;
+}
+
+static const gchar *non_del_reason_str (guint32 value)
+{
+  if (value < 0x3D) {
+    /* Standard values according to P1 */
+    return val_to_str_const (value, p1_NonDeliveryReasonCode_vals, "Unknown");
+  } else {
+    return val_to_str_const (value, non_del_reason, "Unknown");
+  }
+}
+
+static const gchar *non_del_diagn_str (guint32 value)
+{
+  if (value < 0x7C) {
+    /* Standard values according to P1 */
+    return val_to_str_const (value, p1_NonDeliveryDiagnosticCode_vals, "Unknown");
+  } else {
+    return val_to_str_const (value, non_del_diagn, "Unknown");
+  }
+}
+
+static const gchar *nrn_reason_str (guint32 value)
+{
+  /* Standard values according to P22 */
+  return val_to_str_const (value, p22_NonReceiptReasonField_vals, "Reserved");
+}
+
+static const gchar *discard_reason_str (guint32 value)
+{
+  if (value < 0xFE) {
+    /* Standard values according to P22 */
+    return val_to_str_const (value, p22_DiscardReasonField_vals, "Reserved");
+  } else {
+    return val_to_str_const (value, discard_reason, "Unknown");
+  }
+}
+
+/* Ref chapter 6.2.8.10 TimeDifference */
+static gint32 dmp_dec_time_diff (guint8 dmp_time_diff)
+{
+  gint32 time_diff = 0;
+
+  if (dmp_time_diff <= 0x01) {
+    /* Reserved - low value */
+    time_diff = DMP_TIME_RESERVED;
+  } else if (dmp_time_diff <= 0x1D) {
+    /* Number of 2-second units (2-58 seconds) */
+    time_diff = dmp_time_diff * 2;
+  } else if (dmp_time_diff <= 0x91) {
+    /* Number of 15-second units (1 min - 29 min 45 sec) */
+    time_diff = (dmp_time_diff - 0x1D + 3) * 15;
+  } else if (dmp_time_diff  <= 0xDF) {
+    /* Number of 5-minute units (30 min - 6 hours 55 min) */
+    time_diff = (dmp_time_diff - 0x91 + 5) * 5*60;
+  } else if (dmp_time_diff <= 0xF7) {
+    /* Number of 30-minute units (7 hours - 18 hours 30 min) */
+    time_diff = (dmp_time_diff - 0xDF + 7) * 30*60;
+  } else {
+    /* Reserved - high value */
+    time_diff = DMP_TIME_RESERVED;
+  }
+
+  return time_diff;
+}
+
+/*
+ * Ref chapter 6.3.7.2.10 ExpiryTime
+ * and chapter 6.3.9.2.2  DeliveryTime
+ */
+static gint32 dmp_dec_exp_del_time (guint8 timev, gboolean expiry_time)
+{
+  gint32 time_value = 0;
+
+  if (expiry_time && (timev == 0x00)) {
+    /* No expiry time */
+    time_value = DMP_TIME_NOT_PRESENT;
+  } else if (timev <= 0x1D) {
+    /* Number of 2-second units (2-58 seconds) */
+    time_value = timev * 2;
+  } else if (timev <= 0x91) {
+    /* Number of 15-second units (1 min - 29 min 45 sec) */
+    time_value = (timev - 0x1D + 3) * 15;
+  } else if (timev <= 0xBB) {
+    /* Number of 5-minute units (30 min - 3 hours 55 min) */
+    time_value = (timev - 0x91 + 5) * 5*60;
+  } else if (timev <= 0xE3) {
+    /* Number of 30-minute units (4 hours - 23 hours 30 min) */
+    time_value = (timev - 0xBB + 7) * 30*60;
+  } else if (timev < 0xFF) {
+    /* Number of 2-hour units (24 - 78 hours) */
+    time_value = (timev - 0xE3 + 11) * 2*3600;
+  } else {
+    /* Reserved */
+    time_value = DMP_TIME_RESERVED;
+  }
+
+  return time_value;
+}
+
+static gint32 dmp_dec_exp_time (guint8 expiry_time)
+{
+  return dmp_dec_exp_del_time (expiry_time, TRUE);
+}
+
+static gint32 dmp_dec_del_time (guint8 delivery_time)
+{
+  return dmp_dec_exp_del_time (delivery_time, FALSE);
+}
+
+/* Ref chapter 6.3.7.2.11 DTG */
+static gint32 dmp_dec_dtg (guint32 dtg)
+{
+  gint32 value;
+
+  if (dtg == 0x00) {
+    /* Not present */
+    value = DMP_TIME_NOT_PRESENT;
+  } else if (dtg <= 0x3C) {
+    /* Number of minutes (0-59 min) */
+    value = (dtg - 1) * 60;
+  } else if (dtg <= 0x64) {
+    /* Number of 15-minute units (1 hour - 10 hours 45 min) */
+    value = (dtg - 0x3C + 3) * 15 * 60;
+  } else if (dtg < 0x7F) {
+    /* Number of hours (11-36 hours) */
+    value = (dtg - 0x64 + 10) * 3600;
+  } else {
+    /* Reserved */
+    value = DMP_TIME_RESERVED;
+  }
+
+  return value;
+}
+
+/*
+ * Ref chapter 7.10.11.1 Submission time
+ *
+ * start_time                 (current time)
+ * delta1     = E             (encoded submission time)
+ * delta2     = C             (encoded current time)
+ * 0x01C2     = Pn + 15min    (maximum point for S1)
+ * 0x7E38     = Pn+1 - 15min  (minimum point for S3)
+ * 0x7FF8     = Pn+1          (length of P (period))
+ */
+static gint32 dmp_dec_subm_time (guint16 delta1, gint32 start_time)
+{
+  gint32  subm_time = start_time;
+  guint16 delta2;
+
+  delta2 = (guint16) ((subm_time / 2) % 0x7FF8);
+
+  if ((delta1 < 0x01C2) && (delta2 >= delta1 + 0x7E38)) {
+    subm_time += 2 * (0x7FF8 - delta2 + delta1);
+  } else if ((delta1 >= 0x01C2) && (delta2 < delta1 - 0x01C2)) {
+    subm_time -= 2 * (0x7FF8 - delta1 + delta2);
+  } else {
+    subm_time -= 2 * (delta2 - delta1);
+  }
+
+  return subm_time;
+}
+
+/* Ref chapter 6.3.7.2.12 SIC */
+static gboolean dmp_dec_xbyte_sic (guint64 bin, gchar *sic,
+                                   guint8 no_char, gboolean any)
+{
+  gboolean failure = FALSE;
+  gdouble  multiplier;
+  guint8   i;
+  guint64  p, tmp;
+
+  if (no_char >= MAX_SIC_LEN) {
+    /* Illegal length */
+    snprintf (sic, MAX_SIC_LEN, "Illegal length: %d", no_char);
+    return TRUE;
+  }
+
+  if (any) {
+    multiplier = 74.0;
+  } else {
+    multiplier = 36.0;
+  }
+
+  for (i = 0; i < no_char; i++) {
+    p = (guint64) pow (multiplier, no_char - 1 - i);
+    tmp = bin / p;
+    bin -= tmp * p;
+    sic[i] = (gchar) tmp;
+    if (sic[i] <= 9) {
+      sic[i] += '0';
+    } else if (sic[i] <= 35) {
+      sic[i] += ('A' - 10);
+    } else if (!any) {
+      sic[i] = '*';
+      failure = TRUE;
+    } else if (sic[i] <= 61) {
+      sic[i] += ('a' - 36);
+    } else if (sic[i] == 62) {
+      sic[i] = '\'';
+    } else if (sic[i] == 63) {
+      sic[i] = '(';
+    } else if (sic[i] == 64) {
+      sic[i] = ')';
+    } else if (sic[i] == 65) {
+      sic[i] = '+';
+    } else if (sic[i] == 66) {
+      sic[i] = ',';
+    } else if (sic[i] == 67) {
+      sic[i] = '-';
+    } else if (sic[i] == 68) {
+      sic[i] = '.';
+    } else if (sic[i] == 69) {
+      sic[i] = '/';
+    } else if (sic[i] == 70) {
+      sic[i] = ':';
+    } else if (sic[i] == 71) {
+      sic[i] = '=';
+    } else if (sic[i] == 72) {
+      sic[i] = '?';
+    } else if (sic[i] == 73) {
+      sic[i] = ' ';
+    } else {
+      sic[i] = '*';
+      failure = TRUE;
+    }
+    if (!g_ascii_isprint(sic[i])) {
+      sic[i] = '*';
+      failure = TRUE;
+    }
+  }
+  sic[i] = '\0';
+
+  return failure;
+}
+
+static guint dmp_id_hash (gconstpointer k)
+{
+  const dmp_id_key *dmpx=(const dmp_id_key *)k;
+  return dmpx->id;
+}
+
+static gint dmp_id_hash_equal (gconstpointer k1, gconstpointer k2)
+{
+  const dmp_id_key *dmp1=(const dmp_id_key *)k1;
+  const dmp_id_key *dmp2=(const dmp_id_key *)k2;
+  if (dmp1->id != dmp2->id)
+    return 0;
+
+  return (addresses_equal (&dmp1->src, &dmp2->src) &&
+          addresses_equal (&dmp1->dst, &dmp2->dst));
+}
+
+static void register_dmp_id (packet_info *pinfo, guint8 reason)
+{
+  dmp_id_val *dmp_data = NULL, *pkg_data = NULL;
+  dmp_id_key *dmp_key = NULL;
+  nstime_t    msg_time;
+  guint       msg_id = 0;
+
+  if (pinfo->flags.in_error_pkt) {
+    /* No analysis of error packets */
+    return;
+  }
+
+  nstime_set_zero(&msg_time);
+
+  dmp_key = wmem_new (wmem_file_scope(), dmp_id_key);
+
+  if (!pinfo->fd->visited &&
+      (dmp.msg_type == REPORT || dmp.msg_type == NOTIF))
+  {
+    /* Try to match corresponding message */
+    dmp_key->id = (guint) dmp.subj_id;
+    copy_address_wmem(wmem_file_scope(), &dmp_key->src, &(pinfo->dst));
+    copy_address_wmem(wmem_file_scope(), &dmp_key->dst, &(pinfo->src));
+
+    dmp_data = (dmp_id_val *) wmem_map_lookup (dmp_id_hash_table, dmp_key);
+
+    if (dmp_data) {
+      /* Found message */
+      if (dmp_data->prev_msg_id > 0) {
+        msg_id = dmp_data->prev_msg_id;
+      } else {
+        msg_id = dmp_data->msg_id;
+      }
+      msg_time = dmp_data->msg_time;
+    }
+  }
+
+  if (dmp.msg_type == ACK) {
+    dmp_key->id = (guint) dmp.subj_id;
+    copy_address_wmem(wmem_file_scope(), &dmp_key->src, &(pinfo->dst));
+    copy_address_wmem(wmem_file_scope(), &dmp_key->dst, &(pinfo->src));
+  } else {
+    dmp_key->id = (guint) dmp.msg_id;
+    copy_address_wmem(wmem_file_scope(), &dmp_key->src, &(pinfo->src));
+    copy_address_wmem(wmem_file_scope(), &dmp_key->dst, &(pinfo->dst));
+  }
+
+  dmp_data = (dmp_id_val *) wmem_map_lookup (dmp_id_hash_table, dmp_key);
+
+  if (!pinfo->fd->visited) {
+    if (dmp_data) {
+      if (dmp.msg_type == ACK) {
+        /* Only save this data if positive ack */
+        if (reason == 0) {
+          if (dmp_data->ack_id == 0) {
+            /* Only save reference to first ACK */
+            dmp_data->ack_id = pinfo->num;
+          } else {
+            /* Only count when resending */
+            dmp_data->ack_resend_count++;
+          }
+        }
+      } else {
+        /* Message resent */
+        dmp_data->msg_resend_count++;
+        dmp_data->prev_msg_id = pinfo->num;
+        dmp_data->prev_msg_time = dmp_data->msg_time;
+        dmp_data->msg_time = pinfo->abs_ts;
+      }
+    } else {
+      /* New message */
+      dmp_data = wmem_new0 (wmem_file_scope(), dmp_id_val);
+      dmp_data->msg_type = dmp.msg_type;
+
+      if (dmp.msg_type == ACK) {
+        /* No matching message for this ack */
+        dmp_data->ack_id = pinfo->num;
+      } else {
+        dmp_data->first_msg_time = pinfo->abs_ts;
+        dmp_data->msg_time = pinfo->abs_ts;
+
+        if (dmp.msg_type == REPORT) {
+          dmp_data->rep_id = pinfo->num;
+          dmp_data->msg_id = msg_id;
+          dmp_data->rep_not_msg_time = msg_time;
+        } else if (dmp.msg_type == NOTIF) {
+          dmp_data->not_id = pinfo->num;
+          dmp_data->msg_id = msg_id;
+          dmp_data->rep_not_msg_time = msg_time;
+        } else {
+          dmp_data->msg_id = pinfo->num;
+        }
+
+        wmem_map_insert (dmp_id_hash_table, dmp_key, dmp_data);
+      }
+    }
+
+    pkg_data = wmem_new (wmem_file_scope(), dmp_id_val);
+    *pkg_data = *dmp_data;
+    p_add_proto_data(wmem_file_scope(), pinfo, proto_dmp, 0, pkg_data);
+  } else {
+    /* Fetch last values from data saved in packet */
+    pkg_data = (dmp_id_val *)p_get_proto_data(wmem_file_scope(), pinfo, proto_dmp, 0);
+
+    if (dmp_data && pkg_data && dmp.msg_type != ACK && pkg_data->ack_id == 0) {
+      pkg_data->ack_id = dmp_data->ack_id;
+    }
+  }
+
+  DISSECTOR_ASSERT (pkg_data);
+  dmp.id_val = pkg_data;
+}
+
+static void dmp_add_seq_ack_analysis (tvbuff_t *tvb, packet_info *pinfo,
+                                      proto_tree *dmp_tree, gint offset)
+{
+  proto_tree *analysis_tree = NULL;
+  proto_item *en = NULL, *eh = NULL;
+  nstime_t    ns;
+
+  if (dmp.msg_type > ACK || (dmp.msg_type < ACK && !dmp.checksum) ||
+      dmp.id_val == NULL || pinfo->flags.in_error_pkt)
+  {
+    /* No need for seq/ack analysis */
+    return;
+  }
+
+  analysis_tree = proto_tree_add_subtree(dmp_tree, tvb, 0, 0, ett_analysis, &en, "SEQ/ACK analysis");
+  proto_item_set_generated (en);
+
+  if ((dmp.msg_type == STANAG) || (dmp.msg_type == IPM) ||
+      (dmp.msg_type == REPORT) || (dmp.msg_type == NOTIF)) {
+    if (dmp.id_val->ack_id) {
+      en = proto_tree_add_uint (analysis_tree, hf_analysis_ack_num, tvb,
+                                0, 0, dmp.id_val->ack_id);
+      proto_item_set_generated (en);
+      if (!dmp.checksum) {
+        proto_item_append_text (en, " (unexpected)");
+        expert_add_info(pinfo, en, &ei_analysis_ack_unexpected);
+      }
+    } else if (dmp.checksum && !dmp.id_val->msg_resend_count) {
+      en = proto_tree_add_item (analysis_tree, hf_analysis_ack_missing, tvb, offset, 0, ENC_NA);
+      if (pinfo->fd->visited) {
+        /* We do not know this on first visit and we do not want to
+           add a entry in the "Expert Severity Info" for this note */
+        expert_add_info(pinfo, en, &ei_analysis_ack_missing);
+        proto_item_set_generated (en);
+      }
+    }
+
+    if (dmp.msg_type == REPORT) {
+      if (dmp.id_val->msg_id) {
+        en = proto_tree_add_uint (analysis_tree, hf_analysis_msg_num,
+                                  tvb, 0, 0, dmp.id_val->msg_id);
+        proto_item_set_generated (en);
+
+        nstime_delta (&ns, &pinfo->abs_ts, &dmp.id_val->rep_not_msg_time);
+        en = proto_tree_add_time (analysis_tree, hf_analysis_rep_time,
+                                  tvb, 0, 0, &ns);
+        proto_item_set_generated (en);
+      } else {
+        proto_tree_add_expert (analysis_tree, pinfo, &ei_analysis_msg_missing, tvb, 0, 0);
+      }
+    } else if (dmp.msg_type == NOTIF) {
+      if (dmp.id_val->msg_id) {
+        en = proto_tree_add_uint (analysis_tree, hf_analysis_msg_num,
+                                  tvb, 0, 0, dmp.id_val->msg_id);
+        proto_item_set_generated (en);
+
+        nstime_delta (&ns, &pinfo->abs_ts, &dmp.id_val->rep_not_msg_time);
+        en = proto_tree_add_time (analysis_tree, hf_analysis_not_time,
+                                  tvb, 0, 0, &ns);
+        proto_item_set_generated (en);
+      } else {
+        proto_tree_add_expert (analysis_tree, pinfo, &ei_analysis_msg_missing, tvb, 0, 0);
+      }
+    }
+
+    if (dmp.id_val->msg_resend_count) {
+      en = proto_tree_add_uint (analysis_tree, hf_analysis_retrans_no,
+                                tvb, 0, 0, dmp.id_val->msg_resend_count);
+      proto_item_set_generated (en);
+
+      expert_add_info_format(pinfo, en, &ei_analysis_retrans_no, "Retransmission #%d", dmp.id_val->msg_resend_count);
+
+      if (dmp.msg_type == REPORT) {
+        en = proto_tree_add_uint (analysis_tree, hf_analysis_rep_resend_from,
+                                  tvb, 0, 0, dmp.id_val->rep_id);
+      } else if (dmp.msg_type == NOTIF) {
+        en = proto_tree_add_uint (analysis_tree, hf_analysis_not_resend_from,
+                                  tvb, 0, 0, dmp.id_val->not_id);
+      } else {
+        en = proto_tree_add_uint (analysis_tree, hf_analysis_msg_resend_from,
+                                  tvb, 0, 0, dmp.id_val->msg_id);
+      }
+      proto_item_set_generated (en);
+
+      nstime_delta (&ns, &pinfo->abs_ts, &dmp.id_val->prev_msg_time);
+      en = proto_tree_add_time (analysis_tree, hf_analysis_retrans_time,
+                                tvb, 0, 0, &ns);
+      proto_item_set_generated (en);
+
+      nstime_delta (&ns, &pinfo->abs_ts, &dmp.id_val->first_msg_time);
+      eh = proto_tree_add_time (analysis_tree, hf_analysis_total_retrans_time,
+                                tvb, 0, 0, &ns);
+      proto_item_set_generated (eh);
+
+      if (dmp.id_val->first_msg_time.secs == dmp.id_val->prev_msg_time.secs &&
+          dmp.id_val->first_msg_time.nsecs == dmp.id_val->prev_msg_time.nsecs) {
+        /* Time values does not differ, hide the total time */
+        proto_item_set_hidden (eh);
+      }
+    }
+  } else if (dmp.msg_type == ACK) {
+    if (dmp.id_val->msg_type != ACK) {
+      if (dmp.id_val->msg_type == REPORT) {
+        en = proto_tree_add_uint (analysis_tree, hf_analysis_acks_rep_num,
+                                  tvb, 0, 0, dmp.id_val->rep_id);
+      } else if (dmp.id_val->msg_type == NOTIF) {
+        en = proto_tree_add_uint (analysis_tree, hf_analysis_acks_not_num,
+                                  tvb, 0, 0, dmp.id_val->not_id);
+      } else {
+        en = proto_tree_add_uint (analysis_tree, hf_analysis_acks_msg_num,
+                                  tvb, 0, 0, dmp.id_val->msg_id);
+      }
+      proto_item_set_generated (en);
+
+      nstime_delta (&ns, &pinfo->abs_ts, &dmp.id_val->msg_time);
+      en = proto_tree_add_time (analysis_tree, hf_analysis_ack_time,
+                                tvb, 0, 0, &ns);
+      proto_item_set_generated (en);
+
+      nstime_delta (&ns, &pinfo->abs_ts, &dmp.id_val->first_msg_time);
+      eh = proto_tree_add_time (analysis_tree, hf_analysis_total_time,
+                                tvb, 0, 0, &ns);
+      proto_item_set_generated (eh);
+
+      if (dmp.id_val->first_msg_time.secs == dmp.id_val->msg_time.secs &&
+          dmp.id_val->first_msg_time.nsecs == dmp.id_val->msg_time.nsecs) {
+        /* Time values does not differ, hide the total time */
+        proto_item_set_hidden (eh);
+      } else {
+        /* Different times, add a reference to the message we have ack'ed */
+        proto_item_append_text (en, " (from frame %d)",
+                                dmp.id_val->prev_msg_id);
+      }
+    } else {
+      proto_tree_add_expert (analysis_tree, pinfo, &ei_analysis_msg_missing, tvb, 0, 0);
+    }
+
+    if (dmp.id_val->ack_resend_count) {
+      en = proto_tree_add_uint (analysis_tree, hf_analysis_ack_dup_no,
+                                tvb, 0, 0, dmp.id_val->ack_resend_count);
+      proto_item_set_generated (en);
+
+      expert_add_info_format(pinfo, en, &ei_analysis_ack_dup_no, "Dup ACK #%d", dmp.id_val->ack_resend_count);
+
+      en = proto_tree_add_uint (analysis_tree, hf_analysis_ack_resend_from,
+                                tvb, 0, 0, dmp.id_val->ack_id);
+      proto_item_set_generated (en);
+    }
+  }
+}
+
+static const gchar *dissect_7bit_string (tvbuff_t *tvb, gint offset, gint length, guchar *byte_rest)
+{
+  guchar *encoded, *decoded;
+  guchar  rest = 0, bits = 1;
+  gint    len = 0, i;
+
+  if (length <= 0) {
+    if (byte_rest) {
+      *byte_rest = '\0';
+    }
+    return "";
+  }
+
+  encoded = (guchar *)tvb_memdup (wmem_packet_scope(), tvb, offset, length);
+  decoded = (guchar *)wmem_alloc0 (wmem_packet_scope(), (size_t)(length * 1.2) + 1);
+  for (i = 0; i < length; i++) {
+    decoded[len++] = encoded[i] >> bits | rest;
+    rest = (encoded[i] << (7 - bits) & 0x7F);
+    if (bits == 7) {
+      decoded[len++] = rest;
+      bits = 1;
+      rest = 0;
+    } else {
+      bits++;
+    }
+  }
+
+  if (byte_rest) {
+    *byte_rest = rest;
+  }
+
+  return decoded;
+}
+
+static const gchar *dissect_thales_mts_id (tvbuff_t *tvb, gint offset, gint length, guchar *byte_rest)
+{
+  /* Thales XOmail uses this format: "MTA-NAME/000000000000" */
+  if (length >= 7 && length <= 22) {
+    return wmem_strdup_printf (wmem_packet_scope(), "%s/%08X%04X",
+                               dissect_7bit_string (tvb, offset, length - 6, byte_rest),
+                               tvb_get_ntohl (tvb, offset + length - 6),
+                               tvb_get_ntohs (tvb, offset + length - 2));
+  }
+
+  return ILLEGAL_FORMAT;
+}
+
+static const gchar *dissect_thales_ipm_id (tvbuff_t *tvb, gint offset, gint length, gint modifier, guchar *byte_rest)
+{
+  /* Thales XOmail uses this format: "<prefix>0000 YYMMDDhhmmssZ" */
+  if (length >= 6 && length <= 20 && modifier >= 0 && modifier <= 2) {
+    guint number = tvb_get_ntohs (tvb, offset + length - 6);
+    guint8 number_len = modifier + 2;
+    time_t timev = tvb_get_ntohl(tvb, offset + length - 4);
+    struct tm *tmp = gmtime(&timev);
+
+    if (tmp == NULL)
+      return TIME_NOT_REPRESENTABLE;
+
+    if (modifier == 1 && number >= 1024) {
+      /* The number is in the range 65536-99999 */
+      number_len = 5;
+      number += (65536 - 1024);
+    }
+
+    return wmem_strdup_printf (wmem_packet_scope(), "%s%0*d %02d%02d%02d%02d%02d%02dZ",
+                               (length == 6) ? "" : dissect_7bit_string (tvb, offset, length - 6, byte_rest),
+                               number_len, number,
+                               tmp->tm_year % 100, tmp->tm_mon + 1, tmp->tm_mday,
+                               tmp->tm_hour, tmp->tm_min, tmp->tm_sec);
+  }
+
+  return ILLEGAL_FORMAT;
+}
+
+/* Ref chapter 6.3.7.2.12 SIC */
+static gint dissect_dmp_sic (tvbuff_t *tvb, packet_info *pinfo,
+                             proto_tree *message_tree, gint offset)
+{
+  proto_tree *sic_tree = NULL, *bitmap_tree = NULL, *key_tree = NULL;
+  proto_item *sf = NULL, *bf = NULL, *kf = NULL;
+  guint64     value;
+  guint8      key, bitmap, no, i, length = 0;
+  gboolean    any, no_sic = FALSE, failure = FALSE;
+  gint        bytes = 0, boffset = offset;
+  gchar      *sic = NULL;
+
+  key = tvb_get_guint8 (tvb, offset);
+  sic = (gchar *)wmem_alloc (wmem_packet_scope(), MAX_SIC_LEN);
+
+  if (key <= 0xB6) {
+    /* 2 bytes, single 3-character SIC, characters [A-Z0-9] only */
+
+    value = tvb_get_ntohs (tvb, offset);
+    failure = dmp_dec_xbyte_sic (value, sic, 3, FALSE);
+    sf = proto_tree_add_string_format_value(message_tree, hf_message_sic, tvb,
+                                       offset, 2, sic,
+                                       "%s [A-Z0-9 only]%s", sic,
+                                       failure ? " (invalid)": "");
+    if (failure) {
+      expert_add_info(pinfo, sf, &ei_message_sic_illegal);
+    }
+    offset += 2;
+
+  } else if (key <= 0xBD) {
+    /* 3 bytes, single 3-character SIC, any valid character */
+
+    value = tvb_get_ntohl (tvb, offset);
+    value = (value >> 8) & 0x48FFFF;
+    failure = dmp_dec_xbyte_sic (value, sic, 3, TRUE);
+    sf = proto_tree_add_string_format_value(message_tree, hf_message_sic, tvb,
+                                       offset, 3, sic,
+                                       "%s [any character]%s", sic,
+                                       failure ? " (invalid)": "");
+    if (failure) {
+      expert_add_info(pinfo, sf, &ei_message_sic_illegal);
+    }
+    offset += 3;
+
+  } else if (key <= 0xBF) {
+    /* Reserved (not used) */
+    snprintf (sic, MAX_SIC_LEN, "Reserved");
+    no_sic = TRUE;
+
+  } else if (key <= 0xCF) {
+    /* 2 or more 3-character SICs */
+
+    sf = proto_tree_add_item (message_tree, hf_message_sic_key, tvb, offset, 1, ENC_NA);
+    sic_tree = proto_item_add_subtree (sf, ett_message_sic);
+
+    kf = proto_tree_add_item (sic_tree, hf_message_sic_key_values, tvb, offset, 1, ENC_BIG_ENDIAN);
+    key_tree = proto_item_add_subtree (kf, ett_message_sic_key);
+
+    proto_tree_add_item (key_tree, hf_message_sic_key_type, tvb, offset, 1, ENC_BIG_ENDIAN);
+    proto_tree_add_item (key_tree, hf_message_sic_key_chars, tvb, offset, 1, ENC_BIG_ENDIAN);
+    proto_tree_add_item (key_tree, hf_message_sic_key_num, tvb, offset, 1, ENC_BIG_ENDIAN);
+    offset += 1;
+
+    any = (key & 0x08);
+    no = (key & 0x07) + 1;
+    for (i = 0; i < no; i++) {
+      if (any) {
+        value = tvb_get_ntohl (tvb, offset);
+        value = (value >> 8) & 0x48FFFF;
+        bytes = 3;
+      } else {
+        value = tvb_get_ntohs (tvb, offset);
+        bytes = 2;
+      }
+      failure = dmp_dec_xbyte_sic (value, sic, 3, any);
+      bf = proto_tree_add_string_format (sic_tree, hf_message_sic, tvb,
+                                         offset, bytes, sic,
+                                         "SIC %d: %s%s", i + 1, sic,
+                                         failure ? " (invalid)": "");
+      if (failure) {
+        expert_add_info(pinfo, bf, &ei_message_sic_illegal);
+      }
+      offset += bytes;
+    }
+    proto_item_append_text (sf, ": %d (3 %s character)", no,
+                            any ? "any" : "[A-Z0-9]");
+
+  } else if (key <= 0xDF) {
+    /* 1 or more 3 to 8 character SICs */
+
+    sf = proto_tree_add_item (message_tree, hf_message_sic_key, tvb, offset, 1, ENC_NA);
+    sic_tree = proto_item_add_subtree (sf, ett_message_sic);
+
+    kf = proto_tree_add_item (sic_tree, hf_message_sic_key_values, tvb, offset, 1, ENC_BIG_ENDIAN);
+    key_tree = proto_item_add_subtree (kf, ett_message_sic_key);
+
+    proto_tree_add_item (key_tree, hf_message_sic_key_type, tvb, offset, 1, ENC_BIG_ENDIAN);
+    proto_tree_add_item (key_tree, hf_message_sic_key_chars, tvb, offset, 1, ENC_BIG_ENDIAN);
+    proto_tree_add_item (key_tree, hf_message_sic_key_num, tvb, offset, 1, ENC_BIG_ENDIAN);
+    offset += 1;
+
+    bitmap = tvb_get_guint8 (tvb, offset);
+    bf = proto_tree_add_uint_format (sic_tree, hf_message_sic_bitmap, tvb,
+                                     offset, 1, bitmap,
+                                     "Length Bitmap: 0x%2.2x", bitmap);
+    bitmap_tree = proto_item_add_subtree (bf, ett_message_sic_bitmap);
+    proto_tree_add_item (bitmap_tree, hf_message_sic_bitmap, tvb, offset, 1, ENC_BIG_ENDIAN);
+
+    any = (key & 0x08);
+    no = (key & 0x07) + 1;
+    offset += 1;
+
+    for (i = 0; i < no; i++) {
+      if (bitmap & (1 << (7 - i))) {
+        /* 4 - 8 character */
+        key = tvb_get_guint8 (tvb, offset);
+        if (any) {
+          /* Any valid characters */
+          if ((key & 0xF0) == 0xA0) {        /* bit 7-4: 1010 */
+            length = 4;
+            bytes = 4;
+            value = tvb_get_ntohl (tvb, offset) & 0x0FFFFFFF;
+          } else if ((key & 0xC0) == 0xC0) { /* bit 7-4: 11xx */
+            length = 6;
+            bytes = 5;
+            value = ((guint64)key & 0x3F)<<32|tvb_get_ntohl (tvb, offset + 1);
+          } else if ((key & 0xF0) == 0xB0) { /* bit 7-4: 1011 */
+            length = 7;
+            bytes = 6;
+            value = ((guint64)(tvb_get_ntohs (tvb, offset) & 0x0FFF)) << 32 |
+              tvb_get_ntohl (tvb, offset + 2);
+          } else if ((key & 0xF0) == 0x90) { /* bit 7-4: 1001 */
+            length = 8;
+            bytes = 7;
+            value = ((guint64)((tvb_get_ntohl (tvb, offset)>>8) & 0x0FFF))<<32 |
+              tvb_get_ntohl (tvb, offset + 3);
+          } else {                           /* bit 7-4: 0xxx or 1000 */
+            length = 5;
+            bytes = 4;
+            value = tvb_get_ntohl (tvb, offset);
+          }
+        } else {
+          /* Characterts [A-Z0-9] only */
+          if ((key & 0xE0) == 0xC0) {        /* bit 7-4: 110x */
+            length = 4;
+            bytes = 3;
+            value = (tvb_get_ntohl (tvb, offset) >> 8) & 0x1FFFFF;
+          } else if ((key & 0xF0) == 0xA0) { /* bit 7-4: 1010 */
+            length = 5;
+            bytes = 4;
+            value = tvb_get_ntohl (tvb, offset) & 0x0FFFFFFF;
+          } else if ((key & 0xE0) == 0xE0) { /* bit 7-4: 111x */
+            length = 7;
+            bytes = 5;
+            value = ((guint64)key & 0x1F)<<32 | tvb_get_ntohl (tvb, offset +1);
+          } else if ((key & 0xF0) == 0xB0) { /* bit 7-4: 1011 */
+            length = 8;
+            bytes = 6;
+            value = ((guint64)tvb_get_ntohs (tvb, offset) & 0x0FFF) << 32 |
+              tvb_get_ntohl (tvb, offset + 2);
+          } else {                           /* bit 7-4: 0xxx or 1000 */
+            length = 6;
+            bytes = 4;
+            value = tvb_get_ntohl (tvb, offset);
+          }
+        }
+      } else {
+        /* 3 character */
+        if (any) {
+          value = (tvb_get_ntohl (tvb, offset) >> 8) & 0x48FFFF;
+          length = 3;
+          bytes = 3;
+        } else {
+          value = tvb_get_ntohs (tvb, offset);
+          length = 3;
+          bytes = 2;
+        }
+      }
+      failure = dmp_dec_xbyte_sic (value, sic, length, any);
+      bf = proto_tree_add_string_format (sic_tree, hf_message_sic, tvb,
+                                         offset, bytes, sic,
+                                         "SIC %d: %s (%d bytes: %" PRIx64 ")%s",
+                                         i + 1, sic, bytes, value,
+                                         failure ? " (invalid)": "");
+      if (bitmap & (1 << (7 - i))) {
+        /* Only if 4 - 8 character */
+        bitmap_tree = proto_item_add_subtree (bf, ett_message_sic_bits);
+        if (any) {
+          proto_tree_add_item (bitmap_tree, hf_message_sic_bits_any, tvb, offset, 1, ENC_BIG_ENDIAN);
+        } else {
+          proto_tree_add_item (bitmap_tree, hf_message_sic_bits, tvb, offset, 1, ENC_BIG_ENDIAN);
+        }
+      }
+      if (failure) {
+        expert_add_info(pinfo, bf, &ei_message_sic_illegal);
+      }
+      offset += bytes;
+    }
+    proto_item_append_text (sf, ": %d (3-to-8 %s character)", no,
+                            any ? "any" : "[A-Z0-9]");
+
+  } else if (key == 0xFE) {
+    /* No SIC */
+    snprintf (sic, MAX_SIC_LEN, "Not present");
+    no_sic = TRUE;
+
+  } else {
+    /* Resered (not used) */
+    snprintf (sic, MAX_SIC_LEN, "Reserved");
+    no_sic = TRUE;
+  }
+
+  if (no_sic) {
+    /* Not added any SIC, dump text value */
+    sf = proto_tree_add_string (message_tree, hf_message_sic, tvb, offset, 1, sic);
+    offset += 1;
+  }
+
+  proto_item_set_len (sf, offset - boffset);
+
+  return offset;
+}
+
+/* Ref chapter 5.2.7.1 Direct Originator Encoding */
+static gint dissect_dmp_direct_addr (tvbuff_t *tvb, packet_info *pinfo,
+                                     proto_tree *field_tree, proto_item *tf,
+                                     gint offset, gint rec_no,
+                                     gint rec_ofs, gint addr_type)
+{
+  proto_tree *addr_tree = NULL;
+  proto_item *en = NULL;
+  gint        dir_addr;
+  guint8      value;
+
+  value = tvb_get_guint8 (tvb, offset);
+  dir_addr = (value & 0x7F);
+  if (value & 0x80) {
+    en = proto_tree_add_uint_format (field_tree, hf_addr_dir_address1, tvb,
+                                     offset, 1, value,
+                                     "%sDirect Address (bits 6-0): %d",
+                                     val_to_str_const (addr_type, addr_type_str, ""),
+                                     value & 0x7F);
+    addr_tree = proto_item_add_subtree (en, ett_address_direct);
+    proto_tree_add_item (addr_tree, hf_addr_dir_addr_ext, tvb, offset, 1, ENC_BIG_ENDIAN);
+    proto_tree_add_item (addr_tree, hf_addr_dir_address1, tvb, offset, 1, ENC_BIG_ENDIAN);
+    offset += 1;
+
+    /* Extended 1 */
+    value = tvb_get_guint8 (tvb, offset);
+    dir_addr |= ((value & 0x3F) << 7);
+    en = proto_tree_add_uint_format (field_tree, hf_addr_dir_address2, tvb,
+                                     offset, 1, value,
+                                     "%sDirect Address (bits 12-7): %d",
+                                     val_to_str_const (addr_type, addr_type_str, ""),
+                                     value & 0x3F);
+    addr_tree = proto_item_add_subtree (en, ett_address_direct);
+    proto_tree_add_item (addr_tree, hf_addr_dir_addr_ext, tvb, offset, 1, ENC_BIG_ENDIAN);
+    en = proto_tree_add_item (addr_tree, hf_reserved_0x40, tvb, offset, 1, ENC_BIG_ENDIAN);
+    if (value & 0x40) {
+      expert_add_info(pinfo, en, &ei_reserved_value);
+    }
+    proto_tree_add_item (addr_tree, hf_addr_dir_address2, tvb, offset, 1, ENC_BIG_ENDIAN);
+    offset += 1;
+
+    if (value & 0x80) {
+      /* Extended 2 */
+      value = tvb_get_guint8 (tvb, offset);
+      dir_addr |= ((value & 0x3F) << 13);
+      en = proto_tree_add_uint_format (field_tree, hf_addr_dir_address3, tvb,
+                                       offset, 1, value,
+                                       "%sDirect Address (bits 18-13): %d",
+                                       val_to_str_const (addr_type,addr_type_str,""),
+                                       value & 0x3F);
+      addr_tree = proto_item_add_subtree (en, ett_address_direct);
+      en = proto_tree_add_item (addr_tree, hf_reserved_0xC0, tvb, offset, 1, ENC_BIG_ENDIAN);
+      if (value & 0xC0) {
+        expert_add_info(pinfo, en, &ei_reserved_value);
+      }
+      proto_tree_add_item (addr_tree, hf_addr_dir_address3, tvb, offset, 1, ENC_BIG_ENDIAN);
+      offset += 1;
+    }
+
+    en = proto_tree_add_uint_format (field_tree, hf_addr_dir_address_generated,
+                                     tvb, offset, 0, dir_addr,
+                                     "%sDirect Address: %d",
+                                     val_to_str_const (addr_type, addr_type_str, ""),
+                                     dir_addr);
+    proto_item_set_generated (en);
+  } else {
+    en = proto_tree_add_uint_format (field_tree, hf_addr_dir_address, tvb,
+                                     offset, 1, value,
+                                     "%sDirect Address: %d",
+                                     val_to_str_const (addr_type, addr_type_str, ""),
+                                     value & 0x7F);
+    addr_tree = proto_item_add_subtree (en, ett_address_direct);
+    proto_tree_add_item (addr_tree, hf_addr_dir_addr_ext, tvb, offset, 1, ENC_BIG_ENDIAN);
+    proto_tree_add_item (addr_tree, hf_addr_dir_address1, tvb, offset, 1, ENC_BIG_ENDIAN);
+    offset += 1;
+  }
+
+  if (rec_no != -1) {
+    proto_item_append_text (tf, " %d", rec_no);
+    if (rec_ofs != -1) {
+      proto_item_append_text (tf, " (offset from previous: %d)", rec_ofs);
+    }
+  }
+  proto_item_append_text (tf, ", %sDirect Address: %d",
+                          val_to_str_const (addr_type, addr_type_str, ""), dir_addr);
+
+  return offset;
+}
+
+/* Ref 5.3.14 Extended Address */
+static gint dissect_dmp_ext_addr (tvbuff_t *tvb, packet_info *pinfo,
+                                  proto_tree *field_tree, proto_item *tf,
+                                  gint offset, gint rec_no, gint rec_ofs,
+                                  gint addr_type)
+{
+  proto_tree *addr_tree = NULL, *ext_tree = NULL;
+  proto_item *en = NULL, *ef = NULL;
+  gint        type, length;
+  guint8      value;
+  gint        boffset = offset;
+  gboolean    addr_length_extended = FALSE;
+  asn1_ctx_t  asn1_ctx;
+
+  asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
+
+  value = tvb_get_guint8 (tvb, offset);
+  type = (value & 0xE0) >> 5;
+  length = (value & 0x1F);
+  ef = proto_tree_add_none_format (field_tree, hf_addr_ext_address, tvb,
+                                   offset, -1, "%sExtended Address",
+                                   val_to_str_const (addr_type, addr_type_str, ""));
+  ext_tree = proto_item_add_subtree (ef, ett_address_extended);
+
+  en = proto_tree_add_uint_format (ext_tree, hf_addr_ext_type, tvb,
+                                   offset, 1, value, "Address Type: %s",
+                                   val_to_str_const (type, ext_addr_type,
+                                                     "Reserved"));
+  addr_tree = proto_item_add_subtree (en, ett_address_ext_type);
+  proto_tree_add_item (addr_tree, hf_addr_ext_type, tvb, offset, 1, ENC_BIG_ENDIAN);
+
+  if (value & 0x80) {
+    addr_length_extended = TRUE;
+    en = proto_tree_add_uint_format (ext_tree, hf_addr_ext_length1, tvb,
+                                     offset, 1, value,
+                                     "Address Length (bits 4-0): %d", length);
+    addr_tree = proto_item_add_subtree (en, ett_address_ext_length);
+    proto_tree_add_item (addr_tree, hf_addr_ext_length1, tvb, offset, 1, ENC_BIG_ENDIAN);
+    offset += 1;
+
+    /* Extended */
+    value = tvb_get_guint8 (tvb, offset);
+    type = ((value & 0xE0) >> 5);
+    length |= ((value & 0x1F) << 5);
+
+    en = proto_tree_add_uint_format (ext_tree, hf_addr_ext_type_ext, tvb,
+                                     offset, 1, value, "Address Type Ext: %s",
+                                     val_to_str_const (type, ext_addr_type_ext,
+                                                       "Reserved"));
+    addr_tree = proto_item_add_subtree (en, ett_address_ext_type);
+    proto_tree_add_item (addr_tree, hf_addr_ext_type, tvb, offset, 1, ENC_BIG_ENDIAN);
+
+    en = proto_tree_add_uint_format (ext_tree, hf_addr_ext_length2, tvb,
+                                     offset, 1, value,
+                                     "Address Length (bits 9-5): %d",
+                                     value & 0x1F);
+    addr_tree = proto_item_add_subtree (en, ett_address_ext_length);
+    proto_tree_add_item (addr_tree, hf_addr_ext_length2, tvb, offset, 1, ENC_BIG_ENDIAN);
+    offset += 1;
+  } else {
+    en = proto_tree_add_uint_format (ext_tree, hf_addr_ext_length, tvb,
+                                     offset, 1, value, "Address Length: %d",
+                                     length);
+    addr_tree = proto_item_add_subtree (en, ett_address_ext_length);
+    proto_tree_add_item (addr_tree, hf_addr_ext_length1, tvb, offset, 1, ENC_BIG_ENDIAN);
+    offset += 1;
+  }
+
+  if (type == ASN1_BER) {
+    tvbuff_t *next_tvb = tvb_new_subset_length(tvb, offset, length);
+
+    dissect_p1_ORName (FALSE, next_tvb, 0, &asn1_ctx, ext_tree,
+                         hf_addr_ext_asn1_ber);
+  } else if (type == ASN1_PER) {
+    proto_tree_add_item (ext_tree, hf_addr_ext_asn1_per, tvb, offset, length, ENC_NA);
+  } else {
+    proto_tree_add_item (ext_tree, hf_addr_ext_unknown, tvb, offset, length, ENC_NA);
+  }
+  offset += length;
+
+  if (addr_length_extended) {
+    en = proto_tree_add_uint_format (ext_tree, hf_addr_ext_length_generated,
+                                     tvb, offset, 0, length,
+                                     "Address Length: %d", length);
+    proto_item_set_generated (en);
+  }
+
+  proto_item_append_text (ef, ", Type: %s, Length: %d",
+                          val_to_str_const (type, ext_addr_type, "Reserved"),
+                          length);
+
+  if (rec_no != -1) {
+    proto_item_append_text (tf, " %d", rec_no);
+    if (rec_ofs != -1) {
+      proto_item_append_text (tf, " (offset from previous: %d)", rec_ofs);
+    }
+  }
+  proto_item_append_text (tf, ", %sExtended Address Type: %s",
+                          val_to_str_const (addr_type, addr_type_str, ""),
+                          val_to_str_const (type, ext_addr_type_short, "Reserved"));
+
+  proto_item_set_len (ef, offset - boffset);
+
+  return offset;
+}
+
+/* Ref chapter 5.2.8.1 Extended Originator Encoding */
+static gint dissect_dmp_originator (tvbuff_t *tvb, packet_info *pinfo,
+                                    proto_tree *envelope_tree, gint offset)
+{
+  proto_tree *field_tree = NULL, *rec_tree = NULL;
+  proto_item *en = NULL, *tf = NULL;
+  guint8      value, dmp_addr_form;
+  gint        boffset = offset;
+  gboolean    p2_addr = FALSE;
+
+  tf = proto_tree_add_item (envelope_tree, hf_addr_originator, tvb, offset, -1, ENC_NA);
+  field_tree = proto_item_add_subtree (tf, ett_address);
+
+  if (dmp.addr_enc == DIRECT_ADDR) {
+    offset = dissect_dmp_direct_addr (tvb, pinfo, field_tree, tf,
+                                      offset, -1, -1, ORIGINATOR);
+  } else {
+    value = tvb_get_guint8 (tvb, offset);
+    dmp_addr_form = (value & 0xE0) >> 5;
+
+    if (dmp.version == DMP_VERSION_1 && !(dmp.prot_id == PROT_NAT && dmp_nat_decode == NAT_DECODE_THALES)) {
+      en = proto_tree_add_uint_format (field_tree, hf_addr_ext_form_orig_v1, tvb,
+                                       offset, 1, value,
+                                       "Address Form: %s",
+                                       val_to_str_const (dmp_addr_form,
+                                                         addr_form_orig_v1, "Reserved"));
+      rec_tree = proto_item_add_subtree (en, ett_address_ext_form);
+      proto_tree_add_item (rec_tree, hf_addr_ext_form_orig_v1, tvb, offset, 1, ENC_BIG_ENDIAN);
+    } else {
+      en = proto_tree_add_uint_format (field_tree, hf_addr_ext_form_orig, tvb,
+                                       offset, 1, value,
+                                       "Address Form: %s",
+                                       val_to_str_const (dmp_addr_form,
+                                                         addr_form_orig, "Reserved"));
+      rec_tree = proto_item_add_subtree (en, ett_address_ext_form);
+      proto_tree_add_item (rec_tree, hf_addr_ext_form_orig, tvb, offset, 1, ENC_BIG_ENDIAN);
+    }
+
+    en = proto_tree_add_item (rec_tree, hf_reserved_0x1F, tvb, offset, 1, ENC_BIG_ENDIAN);
+    if (value & 0x1F) {
+      expert_add_info(pinfo, en, &ei_reserved_value);
+    }
+    offset += 1;
+
+    if (dmp.version == DMP_VERSION_1 && !(dmp.prot_id == PROT_NAT && dmp_nat_decode == NAT_DECODE_THALES)) {
+      switch (dmp_addr_form) {
+
+      case P1_DIRECT:
+        offset = dissect_dmp_direct_addr (tvb, pinfo, field_tree,
+                                          tf, offset, -1, -1,
+                                          ORIGINATOR);
+        break;
+
+      case P1_EXTENDED:
+        offset = dissect_dmp_ext_addr (tvb, pinfo, field_tree, tf, offset, -1,
+                                       -1, ORIGINATOR);
+        break;
+
+      default:
+        proto_item_append_text (tf, " (invalid address form)");
+        break;
+
+      }
+    } else {
+      switch (dmp_addr_form) {
+
+      case P1_DIRECT:
+      case P1_P2_DIRECT:
+      case P1_DIRECT_P2_EXTENDED:
+        offset = dissect_dmp_direct_addr (tvb, pinfo, field_tree,
+                                          tf, offset, -1, -1,
+                                          ORIGINATOR);
+        break;
+
+      case P1_EXTENDED:
+      case P1_EXTENDED_P2_DIRECT:
+      case P1_P2_EXTENDED:
+        offset = dissect_dmp_ext_addr (tvb, pinfo, field_tree, tf, offset, -1,
+                                       -1, ORIGINATOR);
+        break;
+
+      default:
+        proto_item_append_text (tf, " (invalid address form)");
+        break;
+
+      }
+
+      switch (dmp_addr_form) {
+
+      case P1_P2_DIRECT:
+      case P1_EXTENDED_P2_DIRECT:
+        offset = dissect_dmp_direct_addr (tvb, pinfo, field_tree,
+                                          tf, offset, -1, -1,
+                                          ORIG_P2_ADDRESS);
+        p2_addr = TRUE;
+        break;
+
+      case P1_DIRECT_P2_EXTENDED:
+      case P1_P2_EXTENDED:
+        offset = dissect_dmp_ext_addr (tvb, pinfo, field_tree, tf, offset, -1,
+                                       -1, ORIG_P2_ADDRESS);
+        p2_addr = TRUE;
+        break;
+
+      }
+    }
+
+    if (p2_addr) {
+      if (dmp.msg_type == NOTIF) {
+        en = proto_tree_add_boolean (field_tree, hf_addr_int_rec, tvb,
+                                     offset, 0, TRUE);
+      } else {
+        en = proto_tree_add_boolean (field_tree, hf_addr_dl_expanded, tvb,
+                                     offset, 0, TRUE);
+      }
+      proto_item_set_generated (en);
+    }
+  }
+  proto_item_set_len (tf, offset - boffset);
+
+  return offset;
+}
+
+static void dmp_add_recipient_info (proto_item *tf, guint8 rep_req,
+                                    guint8 not_req, gboolean action)
+{
+  if (rep_req || not_req) {
+    proto_item_append_text (tf, ", Request:");
+  }
+  if (rep_req) {
+    proto_item_append_text (tf, "%s",
+                            val_to_str_const (rep_req, report_vals_short, ""));
+  }
+  if (not_req) {
+    dmp.notif_req = TRUE;
+    proto_item_append_text (tf, "%s",
+                            val_to_str_const (not_req, notif_vals_short, ""));
+  }
+  if (action) {
+    if (dmp.msg_type == STANAG) {
+      proto_item_append_text (tf, " (Action)");
+    } else if (dmp.msg_type == IPM) {
+      proto_item_append_text (tf, " (To)");
+    }
+  } else {
+    if (dmp.msg_type == STANAG) {
+      proto_item_append_text (tf, " (Info)");
+    } else if (dmp.msg_type == IPM) {
+      proto_item_append_text (tf, " (Cc)");
+    }
+  }
+}
+
+/* Ref chapter 5.2.7 Direct Recipient Encoding */
+static gint dissect_dmp_direct_encoding (tvbuff_t *tvb, packet_info *pinfo,
+                                         proto_tree *field_tree, proto_item *tf,
+                                         gint offset, guint *prev_rec_no)
+{
+
+  proto_tree *addr_tree = NULL, *rec_tree = NULL;
+  proto_item *en = NULL;
+  guint8      rep_req = 0, not_req = 0, value;
+  gint        rec_no, rec_ofs = -1, dir_addr;
+  gboolean    action = FALSE, dir_addr_extended = FALSE;
+
+  value = tvb_get_guint8 (tvb, offset);
+  rec_no = (value & 0xF0) >> 4;
+  rep_req = (value & 0x0C) >> 2;
+  not_req = (value & 0x03);
+
+  if (rep_req == 0x03) {
+    en = proto_tree_add_uint_format (field_tree, hf_addr_dir_rec_no1,
+                                     tvb, offset, 1, value,
+                                     "Recipient Number (bits 3-0): %d"
+                                     " (offset from previous)",
+                                     (value & 0xF0) >> 4);
+  } else {
+    en = proto_tree_add_uint_format (field_tree, hf_addr_dir_rec_no,
+                                     tvb, offset, 1, value,
+                                     "Recipient Number Offset: %d"
+                                     " (offset from previous)",
+                                     (value & 0xF0) >> 4);
+  }
+  rec_tree = proto_item_add_subtree (en, ett_address_rec_no);
+  proto_tree_add_item (rec_tree, hf_addr_dir_rec_no1, tvb, offset, 1, ENC_BIG_ENDIAN);
+  proto_tree_add_item (rec_tree, hf_addr_dir_rep_req1, tvb, offset, 1, ENC_BIG_ENDIAN);
+  proto_tree_add_item (rec_tree, hf_addr_dir_not_req1, tvb, offset, 1, ENC_BIG_ENDIAN);
+  offset += 1;
+
+  value = tvb_get_guint8 (tvb, offset);
+  dir_addr = (value & 0x7F);
+  action = (value & 0x80);
+  if (not_req == 0x03) {
+    en = proto_tree_add_uint_format (field_tree, hf_addr_dir_address1,
+                                     tvb, offset, 1, value,
+                                     "Direct Address (bits 6-0): %d",
+                                     value & 0x7F);
+  } else {
+    en = proto_tree_add_uint_format (field_tree, hf_addr_dir_address,
+                                     tvb, offset, 1, value,
+                                     "Direct Address: %d",
+                                     value & 0x7F);
+  }
+  addr_tree = proto_item_add_subtree (en, ett_address_direct);
+  proto_tree_add_item (addr_tree, hf_addr_dir_action, tvb, offset, 1, ENC_BIG_ENDIAN);
+  proto_tree_add_item (addr_tree, hf_addr_dir_address1, tvb, offset, 1, ENC_BIG_ENDIAN);
+  offset += 1;
+
+  if (rep_req == 0x03) {
+    /* Extended Recipient Number 1 */
+    value = tvb_get_guint8 (tvb, offset);
+    rec_no |= ((value & 0x3F) << 4);
+    rec_ofs = rec_no;
+    rep_req = (value & 0xC0) >> 6;
+
+    en = proto_tree_add_uint_format (field_tree, hf_addr_dir_rec_no2,
+                                     tvb, offset, 1, value,
+                                     "Recipient Number (bits 9-4): %d"
+                                     " (offset from previous)",
+                                     value & 0x3F);
+    rec_tree = proto_item_add_subtree (en, ett_address_rec_no);
+    proto_tree_add_item (rec_tree, hf_addr_dir_rep_req2, tvb, offset, 1, ENC_BIG_ENDIAN);
+    proto_tree_add_item (rec_tree, hf_addr_dir_rec_no2, tvb, offset, 1, ENC_BIG_ENDIAN);
+    offset += 1;
+
+    if (rep_req == 0x03) {
+      /* Extended Recipient Number 2 */
+      value = tvb_get_guint8 (tvb, offset);
+      rec_no |= ((value & 0x1F) << 10);
+      rec_ofs = rec_no;
+      rep_req = (value & 0xC0) >> 6;
+
+      en = proto_tree_add_uint_format (field_tree, hf_addr_dir_rec_no3,
+                                       tvb, offset, 1, value,
+                                       "Recipient Number (bits 14-10): %d"
+                                       " (offset from previous)",
+                                       value & 0x1F);
+      rec_tree = proto_item_add_subtree (en, ett_address_rec_no);
+      proto_tree_add_item (rec_tree, hf_addr_dir_rep_req3, tvb, offset, 1, ENC_BIG_ENDIAN);
+      en = proto_tree_add_item (rec_tree, hf_reserved_0x20, tvb, offset, 1, ENC_BIG_ENDIAN);
+      if (value & 0x20) {
+        expert_add_info(pinfo, en, &ei_reserved_value);
+      }
+      proto_tree_add_item (rec_tree, hf_addr_dir_rec_no3, tvb, offset, 1, ENC_BIG_ENDIAN);
+      offset += 1;
+    }
+  }
+
+  if (not_req == 0x03) {
+    /* Extended Direct Address 1 */
+    dir_addr_extended = TRUE;
+    value = tvb_get_guint8 (tvb, offset);
+    dir_addr |= ((value & 0x3F) << 7);
+    not_req = (value & 0xC0) >> 6;
+
+    en = proto_tree_add_uint_format (field_tree, hf_addr_dir_address2, tvb,
+                                     offset, 1, value,
+                                     "Direct Address (bits 12-7): %d",
+                                     value & 0x3F);
+    addr_tree = proto_item_add_subtree (en, ett_address_direct);
+    proto_tree_add_item (addr_tree, hf_addr_dir_not_req2, tvb, offset, 1, ENC_BIG_ENDIAN);
+    proto_tree_add_item (addr_tree, hf_addr_dir_address2, tvb, offset, 1, ENC_BIG_ENDIAN);
+    offset += 1;
+
+    if (not_req == 0x03) {
+      /* Extended Direct Address 2 */
+      value = tvb_get_guint8 (tvb, offset);
+      dir_addr |= ((value & 0x3F) << 13);
+      not_req = (value & 0xC0) >> 6;
+
+      en = proto_tree_add_uint_format (field_tree, hf_addr_dir_address3, tvb,
+                                       offset, 1, value,
+                                       "Direct Address (bits 18-13): %d",
+                                       value & 0x3F);
+      addr_tree = proto_item_add_subtree (en, ett_address_direct);
+      proto_tree_add_item (addr_tree, hf_addr_dir_not_req3, tvb, offset, 1, ENC_BIG_ENDIAN);
+      proto_tree_add_item (addr_tree, hf_addr_dir_address3, tvb, offset, 1, ENC_BIG_ENDIAN);
+      offset += 1;
+    }
+  }
+
+  rec_no += *prev_rec_no;
+  if (dmp.version == DMP_VERSION_1 && !(dmp.prot_id == PROT_NAT && dmp_nat_decode == NAT_DECODE_THALES)) {
+    rec_no++;
+  }
+  *prev_rec_no = rec_no;
+
+  en = proto_tree_add_uint_format (field_tree, hf_addr_dir_rec_no_generated,
+                                   tvb, offset, 0, rec_no,
+                                   "Recipient Number: %d", rec_no);
+  if (rec_no > 32767) {
+    proto_item_append_text (en, " (maximum 32767)");
+    expert_add_info(pinfo, en, &ei_addr_dir_rec_no_generated);
+  }
+  proto_item_set_generated (en);
+
+  if (dir_addr_extended) {
+    en = proto_tree_add_uint_format (field_tree, hf_addr_dir_address_generated,
+                                     tvb, offset, 0, dir_addr,
+                                     "Direct Address: %d", dir_addr);
+    proto_item_set_generated (en);
+  }
+
+  proto_item_append_text (tf, " %d", rec_no);
+  if (rec_ofs != -1) {
+    proto_item_append_text (tf, " (offset from previous: %d)", rec_ofs);
+  }
+
+  proto_item_append_text (tf, ", Direct Address: %d", dir_addr);
+  dmp_add_recipient_info (tf, rep_req, not_req, action);
+
+  return offset;
+}
+
+/* Ref 5.2.8.2 Extended Recipient Encoding */
+static gint dissect_dmp_ext_encoding (tvbuff_t *tvb, packet_info *pinfo,
+                                      proto_tree *field_tree,
+                                      proto_item *tf, gint offset,
+                                      guint *prev_rec_no)
+{
+  proto_tree *addr_tree = NULL;
+  proto_item *en = NULL;
+  guint8      rep_req = 0, not_req = 0;
+  guint8      value, dmp_addr_form;
+  gboolean    action = FALSE;
+  gint        rec_no, rec_ofs = -1;
+
+  value = tvb_get_guint8 (tvb, offset);
+  dmp_addr_form = (value & 0xE0) >> 5;
+  action = (value & 0x10);
+  en = proto_tree_add_uint_format (field_tree, hf_addr_ext_form, tvb,
+                                   offset, 1, value,
+                                   "Address Form: %s",
+                                   val_to_str_const (dmp_addr_form,
+                                                     addr_form, "Reserved"));
+  addr_tree = proto_item_add_subtree (en, ett_address_ext_form);
+  proto_tree_add_item (addr_tree, hf_addr_ext_form, tvb, offset, 1, ENC_BIG_ENDIAN);
+
+  en = proto_tree_add_boolean_format (field_tree, hf_addr_ext_action, tvb,
+                                      offset, 1, value, "Action: %s",
+                                      action ? "Yes" : "No");
+  addr_tree = proto_item_add_subtree (en, ett_address_ext_action);
+  proto_tree_add_item (addr_tree, hf_addr_ext_action, tvb, offset, 1, ENC_BIG_ENDIAN);
+
+  rep_req = (value & 0x0C) >> 2;
+  en = proto_tree_add_uint_format (field_tree, hf_addr_ext_rep_req, tvb,
+                                   offset, 1, value,
+                                   "Report Request: %s",
+                                   val_to_str_const ((value & 0x0C) >> 2,
+                                                     report_vals, "Reserved"));
+  addr_tree = proto_item_add_subtree (en, ett_address_ext_rep_req);
+  proto_tree_add_item (addr_tree, hf_addr_ext_rep_req, tvb, offset, 1, ENC_BIG_ENDIAN);
+
+  not_req = (value & 0x03);
+  en = proto_tree_add_uint_format (field_tree, hf_addr_ext_not_req, tvb,
+                                   offset, 1, value,
+                                   "Notification Request: %s",
+                                   val_to_str_const (value & 0x03,
+                                                     notif_vals, "Reserved"));
+  addr_tree = proto_item_add_subtree (en, ett_address_ext_not_req);
+  proto_tree_add_item (addr_tree, hf_addr_ext_not_req, tvb, offset, 1, ENC_BIG_ENDIAN);
+  offset += 1;
+
+  value = tvb_get_guint8 (tvb, offset);
+  rec_no = (value & 0x7F);
+  if (value & 0x80) {
+    en = proto_tree_add_uint_format (field_tree, hf_addr_ext_rec_no1, tvb,
+                                     offset, 1, value,
+                                     "Recipient Number (bits 6-0): %d"
+                                     " (offset from previous)",
+                                     value & 0x7F);
+    addr_tree = proto_item_add_subtree (en, ett_address_ext_rec_no);
+    proto_tree_add_item (addr_tree, hf_addr_ext_rec_ext, tvb, offset, 1, ENC_BIG_ENDIAN);
+    proto_tree_add_item (addr_tree, hf_addr_ext_rec_no1, tvb, offset, 1, ENC_BIG_ENDIAN);
+    offset += 1;
+
+    /* Extended */
+    value = tvb_get_guint8 (tvb, offset);
+    rec_no |= (value << 7);
+    rec_ofs = rec_no;
+    en = proto_tree_add_uint_format (field_tree, hf_addr_ext_rec_no2, tvb,
+                                     offset, 1, value,
+                                     "Recipient Number (bits 14-7): %d"
+                                     " (offset from previous)", value);
+    addr_tree = proto_item_add_subtree (en, ett_address_ext_rec_no);
+    proto_tree_add_item (addr_tree, hf_addr_ext_rec_no2, tvb, offset, 1, ENC_BIG_ENDIAN);
+    offset += 1;
+
+  } else {
+    en = proto_tree_add_uint_format (field_tree, hf_addr_ext_rec_no, tvb,
+                                     offset, 1, value,
+                                     "Recipient Number Offset: %d"
+                                     " (offset from previous)",
+                                     value & 0x7F);
+    addr_tree = proto_item_add_subtree (en, ett_address_ext_rec_no);
+    proto_tree_add_item (addr_tree, hf_addr_ext_rec_ext, tvb, offset, 1, ENC_BIG_ENDIAN);
+    proto_tree_add_item (addr_tree, hf_addr_ext_rec_no1, tvb, offset, 1, ENC_BIG_ENDIAN);
+    offset += 1;
+
+  }
+
+  rec_no += *prev_rec_no;
+  if (dmp.version == DMP_VERSION_1 && !(dmp.prot_id == PROT_NAT && dmp_nat_decode == NAT_DECODE_THALES)) {
+    rec_no++;
+  }
+  *prev_rec_no = rec_no;
+
+  en = proto_tree_add_uint_format (field_tree, hf_addr_ext_rec_no_generated,
+                                   tvb, offset, 0, rec_no,
+                                   "Recipient Number: %d", rec_no);
+  if (rec_no > 32767) {
+    proto_item_append_text (en, " (maximum 32767)");
+    expert_add_info(pinfo, en, &ei_addr_ext_rec_no_generated);
+  }
+  proto_item_set_generated (en);
+
+  switch (dmp_addr_form) {
+
+  case P1_DIRECT:
+  case P1_P2_DIRECT:
+  case P1_DIRECT_P2_EXTENDED:
+    offset = dissect_dmp_direct_addr (tvb, pinfo, field_tree, tf, offset,
+                                      rec_no, rec_ofs, P1_ADDRESS);
+    break;
+
+  case P1_EXTENDED:
+  case P1_EXTENDED_P2_DIRECT:
+  case P1_P2_EXTENDED:
+    offset = dissect_dmp_ext_addr (tvb, pinfo, field_tree, tf, offset,
+                                   rec_no, rec_ofs, P1_ADDRESS);
+    break;
+
+  }
+
+  switch (dmp_addr_form) {
+
+  case P2_DIRECT:
+  case P1_P2_DIRECT:
+  case P1_EXTENDED_P2_DIRECT:
+    offset = dissect_dmp_direct_addr (tvb, pinfo, field_tree, tf, offset,
+                                      rec_no, rec_ofs, P2_ADDRESS);
+    break;
+
+  case P2_EXTENDED:
+  case P1_DIRECT_P2_EXTENDED:
+  case P1_P2_EXTENDED:
+    offset = dissect_dmp_ext_addr (tvb, pinfo, field_tree, tf, offset,
+                                   rec_no, rec_ofs, P2_ADDRESS);
+    break;
+
+  }
+
+  dmp_add_recipient_info (tf, rep_req, not_req, action);
+
+  return offset;
+}
+
+/* Ref chapter 5.2 Address encoding */
+static gint dissect_dmp_address (tvbuff_t *tvb, packet_info *pinfo,
+                                 proto_tree *envelope_tree,
+                                 gint offset, guint *prev_rec_no,
+                                 gboolean reporting_name)
+{
+  proto_tree *field_tree = NULL;
+  proto_item *tf = NULL;
+  gint        boffset = offset;
+
+  if (reporting_name) {
+    tf = proto_tree_add_item (envelope_tree, hf_addr_reporting_name, tvb, offset, -1, ENC_NA);
+  } else {
+    tf = proto_tree_add_none_format (envelope_tree, hf_addr_recipient, tvb,
+                                     offset, -1, "Recipient Number");
+  }
+  field_tree = proto_item_add_subtree (tf, ett_address);
+
+  if (dmp.addr_enc == DIRECT_ADDR) {
+    offset = dissect_dmp_direct_encoding (tvb, pinfo, field_tree, tf,
+                                          offset, prev_rec_no);
+  } else {
+    offset = dissect_dmp_ext_encoding (tvb, pinfo, field_tree, tf, offset,
+                                       prev_rec_no);
+  }
+
+  proto_item_set_len (tf, offset - boffset);
+
+  return offset;
+}
+
+/* Ref chapter 6.2.9 Acknowledgement */
+static gint dissect_dmp_ack (tvbuff_t *tvb, packet_info *pinfo,
+                             proto_tree *dmp_tree, gint offset)
+{
+  proto_tree *ack_tree = NULL, *recip_tree = NULL;
+  proto_item *en = NULL, *rt = NULL;
+  proto_item *hidden_item;
+  guint       prev_rec_no = 0;
+  gint        rec_len, rec_no = 0;
+  gint        boffset = offset;
+
+  en = proto_tree_add_item (dmp_tree, hf_ack, tvb, offset, 4, ENC_NA);
+  ack_tree = proto_item_add_subtree (en, ett_ack);
+
+  dmp.ack_reason = tvb_get_guint8 (tvb, offset);
+  proto_item_append_text (en, ", Reason: %s",
+                          val_to_str_const (dmp.ack_reason, ack_reason, "Reserved"));
+
+  rt = proto_tree_add_item (ack_tree, hf_ack_reason, tvb, offset, 1, ENC_BIG_ENDIAN);
+  if (dmp.ack_reason != 0) {
+    expert_add_info_format(pinfo, rt, &ei_ack_reason, "ACK reason: %s", val_to_str_const (dmp.ack_reason, ack_reason, "Reserved"));
+  }
+  offset += 1;
+
+  proto_tree_add_item (ack_tree, hf_ack_diagnostic, tvb, offset, 1, ENC_BIG_ENDIAN);
+  offset += 1;
+
+  /* Subject Message Identifier */
+  dmp.subj_id = tvb_get_ntohs (tvb, offset);
+  proto_tree_add_item (ack_tree, hf_message_subj_id, tvb, offset, 2, ENC_BIG_ENDIAN);
+  hidden_item = proto_tree_add_item (ack_tree, hf_dmp_id, tvb, offset, 2, ENC_BIG_ENDIAN);
+  proto_item_set_hidden (hidden_item);
+  offset += 2;
+
+  if (use_seq_ack_analysis) {
+    register_dmp_id (pinfo, dmp.ack_reason);
+  }
+
+  if (dmp.ack_rec_present) {
+    /* Recipient List */
+    rec_len = tvb_reported_length (tvb);
+    if (dmp.checksum) {
+      rec_len -= 2;
+    }
+    if (offset < rec_len) {
+      rt = proto_tree_add_item (ack_tree, hf_ack_recips, tvb, offset, -1, ENC_NA);
+      recip_tree = proto_item_add_subtree (rt, ett_ack_recips);
+      while (offset < rec_len) {
+        offset = dissect_dmp_address (tvb, pinfo, recip_tree, offset,
+                                      &prev_rec_no, FALSE);
+        rec_no++;
+      }
+      proto_item_append_text (rt, ", No Recipients: %d", rec_no);
+      proto_item_set_len (rt, offset - boffset - 4);
+      proto_item_set_len (en, offset - boffset);
+    }
+  }
+
+  return offset;
+}
+
+static gint dissect_mts_identifier (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
+                                    gint offset, gboolean subject)
+{
+  proto_item *ti, *hidden_item;
+  const gchar *mts_id;
+  guchar byte_rest = 0;
+
+  if (dmp.msg_id_type == X400_MSG_ID || dmp_nat_decode == NAT_DECODE_DMP) {
+    mts_id = dissect_7bit_string (tvb, offset, dmp.mts_id_length, &byte_rest);
+  } else if (dmp_nat_decode == NAT_DECODE_THALES) {
+    mts_id = dissect_thales_mts_id (tvb, offset, dmp.mts_id_length, &byte_rest);
+  } else {
+    mts_id = tvb_bytes_to_str(wmem_packet_scope(), tvb, offset, dmp.mts_id_length);
+  }
+  proto_item_append_text (dmp.mts_id_item, " (%zu bytes decompressed)", strlen(mts_id));
+  mts_id = format_text(wmem_packet_scope(), mts_id, strlen(mts_id));
+  if (subject) {
+    ti = proto_tree_add_string (tree, hf_message_subj_mts_id, tvb, offset, dmp.mts_id_length, mts_id);
+    hidden_item = proto_tree_add_string (tree, hf_mts_id, tvb, offset, dmp.mts_id_length, mts_id);
+    /* Read from hash, for analysis */
+    dmp.subj_id = GPOINTER_TO_UINT (wmem_map_lookup (dmp_long_id_hash_table, mts_id));
+  } else {
+    ti = proto_tree_add_string (tree, hf_envelope_mts_id, tvb, offset, dmp.mts_id_length, mts_id);
+    hidden_item = proto_tree_add_string (tree, hf_mts_id, tvb, offset, dmp.mts_id_length, mts_id);
+    /* Insert into hash, for analysis */
+    wmem_map_insert (dmp_long_id_hash_table, wmem_strdup (wmem_file_scope(), mts_id), GUINT_TO_POINTER ((guint)dmp.msg_id));
+  }
+  proto_item_set_hidden (hidden_item);
+  offset += dmp.mts_id_length;
+
+  if (byte_rest) {
+    expert_add_info (pinfo, ti, &ei_7bit_string_unused_bits);
+  }
+
+  return offset;
+}
+
+static gint dissect_ipm_identifier (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
+                                    gint offset, gboolean subject)
+{
+  proto_tree *field_tree;
+  proto_item *ti, *tf, *hidden_item;
+  const gchar *ipm_id;
+  gint        length, modifier, ipm_id_length;
+  guchar      byte_rest = 0;
+
+  length = tvb_get_guint8 (tvb, offset);
+  modifier = (length & 0xC0) >> 6;
+  ipm_id_length = length & 0x3F;
+
+  tf = proto_tree_add_uint_format (tree, hf_envelope_ipm_id_length,
+                                   tvb, offset, 1, ipm_id_length,
+                                   "IPM Identifier Length: %u",
+                                   ipm_id_length);
+  field_tree = proto_item_add_subtree (tf, ett_envelope_ipm_id_length);
+  if ((dmp.msg_id_type == NAT_MSG_ID || modifier != IPM_MODIFIER_X400) && dmp_nat_decode == NAT_DECODE_THALES) {
+    proto_tree_add_item (field_tree, hf_thales_ipm_id_modifier, tvb, offset, 1, ENC_BIG_ENDIAN);
+  } else {
+    proto_tree_add_item (field_tree, hf_envelope_ipm_id_modifier, tvb, offset, 1, ENC_BIG_ENDIAN);
+  }
+  proto_tree_add_item (field_tree, hf_envelope_ipm_id_length, tvb, offset, 1, ENC_BIG_ENDIAN);
+  offset += 1;
+
+  if (modifier == IPM_MODIFIER_X400 || dmp_nat_decode == NAT_DECODE_DMP) {
+    ipm_id = dissect_7bit_string (tvb, offset, ipm_id_length, &byte_rest);
+  } else if (dmp_nat_decode == NAT_DECODE_THALES) {
+    ipm_id = dissect_thales_ipm_id (tvb, offset, ipm_id_length, modifier, &byte_rest);
+  } else {
+    ipm_id = tvb_bytes_to_str(wmem_packet_scope(), tvb, offset, ipm_id_length);
+  }
+  proto_item_append_text (tf, " (%zu bytes decompressed)", strlen(ipm_id));
+  ipm_id = format_text(wmem_packet_scope(), ipm_id, strlen(ipm_id));
+  if (subject) {
+    ti = proto_tree_add_string (tree, hf_message_subj_ipm_id, tvb, offset, ipm_id_length, ipm_id);
+    hidden_item = proto_tree_add_string (tree, hf_ipm_id, tvb, offset, ipm_id_length, ipm_id);
+    /* Read from hash, for analysis */
+    dmp.subj_id = GPOINTER_TO_UINT (wmem_map_lookup (dmp_long_id_hash_table, ipm_id));
+  } else {
+    ti = proto_tree_add_string (tree, hf_envelope_ipm_id, tvb, offset, ipm_id_length, ipm_id);
+    hidden_item = proto_tree_add_string (tree, hf_ipm_id, tvb, offset, ipm_id_length, ipm_id);
+    /* Insert into hash, for analysis */
+    wmem_map_insert (dmp_long_id_hash_table, wmem_strdup (wmem_file_scope(), ipm_id), GUINT_TO_POINTER ((guint)dmp.msg_id));
+  }
+  proto_item_set_hidden (hidden_item);
+  offset += ipm_id_length;
+
+  if (byte_rest) {
+    expert_add_info (pinfo, ti, &ei_7bit_string_unused_bits);
+  }
+
+  return offset;
+}
+
+/* Ref chapter 6.2.7 Envelope structure */
+static gint dissect_dmp_envelope (tvbuff_t *tvb, packet_info *pinfo,
+                                  proto_tree *dmp_tree, gint offset)
+{
+  proto_tree *envelope_tree = NULL;
+  proto_tree *field_tree = NULL;
+  proto_item *en = NULL, *tf = NULL, *vf = NULL;
+  proto_item *hidden_item;
+  guint8      envelope, time_diff;
+  guint16     subm_time, no_rec, value16;
+  gint32      secs = 0;
+  gchar      *env_flags = NULL;
+  guint       prev_rec_no = 0;
+  gint        boffset = offset, i;
+  gboolean    using_short_id = FALSE;
+
+  en = proto_tree_add_item (dmp_tree, hf_envelope, tvb, offset, 10, ENC_NA);
+  envelope_tree = proto_item_add_subtree (en, ett_envelope);
+
+  envelope = tvb_get_guint8 (tvb, offset);
+  dmp.prot_id = (envelope & 0xF8) >> 3;
+  dmp.version = (envelope & 0x07) + 1;
+
+  /* Protocol Version */
+  tf = proto_tree_add_uint_format (envelope_tree, hf_envelope_version,
+                                   tvb, offset, 1, dmp.version,
+                                   "Protocol Version: %d", dmp.version);
+
+  field_tree = proto_item_add_subtree (tf, ett_envelope_version);
+  vf = proto_tree_add_item (field_tree, hf_envelope_protocol_id, tvb, offset, 1, ENC_BIG_ENDIAN);
+  if (dmp.prot_id == PROT_NAT) {
+    proto_item_append_text (vf, " (national version of DMP)");
+    proto_item_append_text (tf, " (national)");
+  } else if (dmp.prot_id == PROT_DMP) {
+    proto_item_append_text (vf, " (correct)");
+  } else {
+    proto_item_append_text (vf, " (incorrect, should be 0x1d)");
+  }
+  vf = proto_tree_add_item (field_tree, hf_envelope_version_value, tvb, offset, 1, ENC_BIG_ENDIAN);
+  offset += 1;
+
+  if (dmp.version > DMP_VERSION_2) {
+    /* Unsupported DMP Version */
+    proto_item_append_text (vf, " (unsupported)");
+    proto_item_append_text (tf, " (unsupported)");
+    expert_add_info_format(pinfo, vf, &ei_envelope_version_value, "Unsupported DMP Version: %d", dmp.version);
+    return offset;
+  }
+
+  envelope = tvb_get_guint8 (tvb, offset);
+  dmp.addr_enc = ((envelope & 0x10) >> 4);
+  dmp.checksum = ((envelope & 0x08) >> 3);
+  dmp.msg_type = (envelope & 0x07);
+
+  if (dmp.msg_type != ACK) {
+    /* Hop count */
+    tf = proto_tree_add_uint_format (envelope_tree, hf_envelope_hop_count,
+                                     tvb, offset, 1, envelope,
+                                     "Hop Count: %d", (envelope & 0xE0) >> 5);
+    field_tree = proto_item_add_subtree (tf, ett_envelope_hop_count);
+    proto_tree_add_item (field_tree, hf_envelope_hop_count_value, tvb, offset, 1, ENC_BIG_ENDIAN);
+  } else {
+    if (dmp.version >= DMP_VERSION_2) {
+      /* Extensions Present */
+      dmp.extensions = (envelope & 0x80);
+      tf = proto_tree_add_boolean_format (envelope_tree, hf_envelope_extensions,
+                                          tvb, offset, 1, envelope,
+                                          "Extensions: %s",
+                                          tfs_get_string(envelope & 0x80, &tfs_present_absent));
+      field_tree = proto_item_add_subtree (tf, ett_envelope_extensions);
+      proto_tree_add_item (field_tree, hf_envelope_extensions, tvb, offset, 1, ENC_BIG_ENDIAN);
+    }
+
+    /* Recipient Present */
+    dmp.ack_rec_present = (envelope & 0x20);
+    tf = proto_tree_add_boolean_format (envelope_tree,hf_envelope_rec_present,
+                                        tvb, offset, 1, envelope,
+                                        "Recipient Present: %s",
+                                        tfs_get_string(envelope & 0x20, &tfs_present_absent));
+    field_tree = proto_item_add_subtree (tf, ett_envelope_rec_present);
+    proto_tree_add_item (field_tree, hf_envelope_rec_present, tvb, offset, 1, ENC_BIG_ENDIAN);
+  }
+
+  /* Address Encoding */
+  tf = proto_tree_add_boolean_format (envelope_tree, hf_envelope_addr_enc,
+                                      tvb, offset, 1, envelope,
+                                      "Address Encoding: %s",
+                                      tfs_get_string(envelope & 0x10, &addr_enc));
+  field_tree = proto_item_add_subtree (tf, ett_envelope_addr_enc);
+  proto_tree_add_item (field_tree, hf_envelope_addr_enc, tvb, offset, 1, ENC_BIG_ENDIAN);
+
+  /* Checksum Present */
+  tf = proto_tree_add_boolean_format (envelope_tree, hf_envelope_checksum,
+                                      tvb, offset, 1, envelope,
+                                      "Checksum: %s",
+                                      (envelope & 0x08) ? "Used" : "Not used");
+  field_tree = proto_item_add_subtree (tf, ett_envelope_checksum);
+  proto_tree_add_item (field_tree, hf_envelope_checksum, tvb, offset, 1, ENC_BIG_ENDIAN);
+
+  /* Content Type */
+  tf = proto_tree_add_uint_format (envelope_tree, hf_envelope_type,
+                                   tvb, offset, 1, envelope,
+                                   "Content Type: %s (%d)",
+                                   val_to_str_const (envelope & 0x07,
+                                                     type_vals, "Unknown"),
+                                   envelope & 0x07);
+  field_tree = proto_item_add_subtree (tf, ett_envelope_cont_type);
+  proto_tree_add_item (field_tree, hf_envelope_type, tvb, offset, 1, ENC_BIG_ENDIAN);
+
+  proto_item_append_text (en, ", Checksum %s", (envelope >> 3) & 0x01 ? "Used" : "Not used");
+  offset += 1;
+
+  if (dmp.msg_type >= ACK) {
+    proto_item_set_len (en, offset - boffset);
+    return offset;
+  }
+
+  if (dmp.version >= DMP_VERSION_2) {
+    envelope = tvb_get_guint8 (tvb, offset);
+    /* Extensions Present */
+    tf = proto_tree_add_boolean_format (envelope_tree, hf_envelope_extensions,
+                                        tvb, offset, 1, envelope,
+                                        "Extensions: %s",
+                                        (envelope & 0x80) ? "Present" : "Absent");
+    field_tree = proto_item_add_subtree (tf, ett_envelope_extensions);
+    proto_tree_add_item (field_tree, hf_envelope_extensions, tvb, offset, 1, ENC_BIG_ENDIAN);
+    dmp.extensions = (envelope & 0x80);
+
+    /* Message Identifier Type */
+    dmp.msg_id_type = (envelope & 0x60) >> 5;
+    tf = proto_tree_add_uint_format (envelope_tree, hf_envelope_msg_id_type,
+                                     tvb, offset, 1, envelope,
+                                     "Message Identifier Type: %s (%d)",
+                                     val_to_str_const (dmp.msg_id_type, msg_id_type_vals, "Unknown"),
+                                     dmp.msg_id_type);
+    field_tree = proto_item_add_subtree (tf, ett_envelope_msg_id_type);
+    proto_tree_add_item (field_tree, hf_envelope_msg_id_type, tvb, offset, 1, ENC_BIG_ENDIAN);
+
+    if (dmp.msg_id_type == X400_MSG_ID || dmp.msg_id_type == NAT_MSG_ID) {
+      /* MTS Identifier Length */
+      dmp.mts_id_length = (envelope & 0x1F);
+      dmp.mts_id_item = proto_tree_add_uint_format (envelope_tree, hf_envelope_mts_id_length,
+                                                    tvb, offset, 1, envelope,
+                                                    "MTS Identifier Length: %u",
+                                                    dmp.mts_id_length);
+      field_tree = proto_item_add_subtree (dmp.mts_id_item, ett_envelope_mts_id_length);
+      proto_tree_add_item (field_tree, hf_envelope_mts_id_length, tvb, offset, 1, ENC_BIG_ENDIAN);
+      offset += 1;
+    } else {
+      proto_tree_add_item (field_tree, hf_envelope_msg_id_length, tvb, offset, 1, ENC_BIG_ENDIAN);
+      if (envelope & 0x10) {
+        /* Using Short Identifier (12 bits) */
+        using_short_id = TRUE;
+      } else {
+        tf = proto_tree_add_item (field_tree, hf_reserved_0x0F, tvb, offset, 1, ENC_BIG_ENDIAN);
+        if (envelope & 0x0F) {
+          expert_add_info(pinfo, tf, &ei_reserved_value);
+        }
+        offset += 1;
+      }
+    }
+  }
+
+  /* Message Identifier */
+  dmp.msg_id = tvb_get_ntohs (tvb, offset);
+  if (using_short_id) {
+    dmp.msg_id &= 0x0FFF;
+  }
+  tf = proto_tree_add_uint (envelope_tree, hf_envelope_msg_id, tvb, offset, 2, dmp.msg_id);
+  hidden_item = proto_tree_add_uint (envelope_tree, hf_dmp_id, tvb, offset, 2, dmp.msg_id);
+  if (using_short_id) {
+    field_tree = proto_item_add_subtree (tf, ett_envelope_msg_id);
+    proto_tree_add_item (field_tree, hf_envelope_msg_id_12bit, tvb, offset, 2, ENC_BIG_ENDIAN);
+  } else if (dmp.version >= DMP_VERSION_2 && dmp.msg_id_type == ONLY_DMP_ID && dmp.msg_id < 4096) {
+    expert_add_info(pinfo, tf, &ei_envelope_msg_id);
+  }
+  proto_item_set_hidden (hidden_item);
+  offset += 2;
+
+  if (dmp.version >= DMP_VERSION_2) {
+    if ((dmp.msg_type != REPORT) && (dmp.msg_id_type == X400_MSG_ID || dmp.msg_id_type == NAT_MSG_ID)) {
+      offset = dissect_mts_identifier (tvb, pinfo, envelope_tree, offset, FALSE);
+    }
+  }
+
+  /* Submission Time */
+  subm_time = tvb_get_ntohs (tvb, offset);
+  dmp.subm_time = dmp_dec_subm_time ((guint16)(subm_time & 0x7FFF),
+                                     (gint32) pinfo->abs_ts.secs);
+  tf = proto_tree_add_uint_format (envelope_tree, hf_envelope_subm_time, tvb,
+                                   offset, 2, subm_time,
+                                   "Submission time: %s",
+                                   (subm_time & 0x7FFF) >= 0x7FF8 ?
+                                   "Reserved" :
+                                   abs_time_secs_to_str (wmem_packet_scope(), dmp.subm_time, ABSOLUTE_TIME_LOCAL, TRUE));
+  field_tree = proto_item_add_subtree (tf, ett_envelope_subm_time);
+  proto_tree_add_item (field_tree, hf_envelope_time_diff_present, tvb, offset, 2, ENC_BIG_ENDIAN);
+  proto_tree_add_item (field_tree, hf_envelope_subm_time_value, tvb, offset, 2, ENC_BIG_ENDIAN);
+  offset += 2;
+
+  if (subm_time & 0x8000) {
+    /* Timed Difference */
+    time_diff = tvb_get_guint8 (tvb, offset);
+    tf = proto_tree_add_uint_format (envelope_tree, hf_envelope_time_diff,
+                                     tvb, offset, 1, time_diff,
+                                     "Time Difference: ");
+    field_tree = proto_item_add_subtree (tf, ett_envelope_time_diff);
+    proto_tree_add_item (field_tree, hf_envelope_time_diff_value, tvb, offset, 1, ENC_BIG_ENDIAN);
+    secs = dmp_dec_time_diff (time_diff);
+    if (secs == DMP_TIME_RESERVED) {
+      proto_item_append_text (tf, "Reserved (0x%2.2x)", time_diff);
+    } else {
+      proto_item_append_text (tf, "%s", signed_time_secs_to_str(wmem_packet_scope(), secs));
+    }
+    offset += 1;
+  }
+
+  /* Envelope Flags */
+  envelope = tvb_get_guint8 (tvb, offset);
+  tf = proto_tree_add_uint_format (envelope_tree, hf_envelope_flags,
+                                   tvb, offset, 1, envelope,
+                                   "Envelope Flags");
+
+  field_tree = proto_item_add_subtree (tf, ett_envelope_flags);
+  proto_tree_add_item (field_tree, hf_envelope_content_id_discarded, tvb, offset, 1, ENC_BIG_ENDIAN);
+  proto_tree_add_item (field_tree, hf_envelope_recip_reassign_prohib, tvb, offset, 1, ENC_BIG_ENDIAN);
+  proto_tree_add_item (field_tree, hf_envelope_dl_expansion_prohib, tvb, offset, 1, ENC_BIG_ENDIAN);
+
+  if (envelope & 0xE0) {
+    env_flags = wmem_strdup_printf (wmem_packet_scope(), "%s%s%s",
+                                    (envelope & 0x80) ? ", ContId discarded" : "",
+                                    (envelope & 0x40) ? ", Reass prohibited" : "",
+                                    (envelope & 0x20) ? ", DLE prohibited"   : "");
+    proto_item_append_text (tf, ":%s", &env_flags[1]);
+  } else {
+    proto_item_append_text (tf, " (none)");
+  }
+
+  /* Recipient Count */
+  no_rec = (envelope & 0x1F);
+  tf = proto_tree_add_uint_format (envelope_tree, hf_envelope_recipients,
+                                   tvb, offset, 1, envelope,
+                                   "Recipient Count: %d", no_rec);
+
+  field_tree = proto_item_add_subtree (tf, ett_envelope_recipients);
+  proto_tree_add_item (field_tree, hf_envelope_recipients, tvb, offset, 1, ENC_BIG_ENDIAN);
+  offset += 1;
+
+  if (no_rec == 0) {
+    /* Extended Recipient Count */
+    value16 = tvb_get_ntohs (tvb, offset);
+    no_rec = value16 & 0x7FFF;
+    tf = proto_tree_add_uint_format (envelope_tree,hf_envelope_ext_recipients,
+                                     tvb, offset, 2, value16,
+                                     "Extended Recipient Count: %d%s", no_rec,
+                                     (no_rec < 32 ?
+                                      " (incorrect, reserved value)" : ""));
+
+    field_tree = proto_item_add_subtree (tf, ett_envelope_ext_recipients);
+    en = proto_tree_add_item (field_tree, hf_reserved_0x8000, tvb, offset, 2, ENC_BIG_ENDIAN);
+    if (value16 & 0x8000) {
+      expert_add_info(pinfo, en, &ei_reserved_value);
+    }
+    proto_tree_add_item (field_tree, hf_envelope_ext_recipients, tvb, offset, 2, ENC_BIG_ENDIAN);
+    offset += 2;
+  }
+
+  if (dmp.msg_type != REPORT) {
+    /* Originator - Not present for reports */
+    offset = dissect_dmp_originator (tvb, pinfo, envelope_tree, offset);
+  }
+
+  for (i = 0; i < no_rec; i++) {
+    /* Recipient(s) */
+    offset = dissect_dmp_address (tvb, pinfo, envelope_tree, offset,
+                                  &prev_rec_no, FALSE);
+  }
+
+  if (dmp.version >= DMP_VERSION_2) {
+    if ((dmp.msg_id_type == X400_MSG_ID || dmp.msg_id_type == NAT_MSG_ID) &&
+        dmp.notif_req && (dmp.msg_type == STANAG || dmp.msg_type == IPM))
+    {
+      offset = dissect_ipm_identifier (tvb, pinfo, envelope_tree, offset, FALSE);
+    }
+  }
+
+  proto_item_set_len (en, offset - boffset);
+
+  return offset;
+}
+
+/*
+ * Ref chapter 6.3.7.1 STANAG 4406 message structure
+ * and chapter 6.3.8.1 IPM 88 message structure
+ */
+static gint dissect_dmp_message (tvbuff_t *tvb, packet_info *pinfo,
+                                 proto_tree *dmp_tree, gint offset)
+{
+  tvbuff_t   *body_tvb = NULL;
+  proto_tree *message_tree = NULL;
+  proto_tree *field_tree = NULL;
+  proto_item *en = NULL, *tf = NULL, *tr = NULL;
+  guint8      message, eit = 0, compr_alg = ALGORITHM_NONE;
+  gint        len, boffset = offset, body_offset = 0, body_len = 0;
+
+  en = proto_tree_add_item (dmp_tree, hf_message_body, tvb, offset, -1, ENC_NA);
+  message_tree = proto_item_add_subtree (en, ett_message);
+
+  if (dmp.body_format == FREE_TEXT_SUBJECT) {
+    len = tvb_strsize (tvb, offset);
+    proto_tree_add_item (message_tree, hf_message_subject, tvb, offset, len, ENC_ASCII);
+    offset += len;
+  }
+
+  if (dmp.body_format == FREE_TEXT || dmp.body_format == FREE_TEXT_SUBJECT) {
+    message = tvb_get_guint8 (tvb, offset);
+    eit = (message & 0xE0) >> 5;
+    compr_alg = (message & 0x18) >> 3;
+    /* Encoded Information Type */
+    tf = proto_tree_add_uint_format (message_tree, hf_message_eit,
+                                     tvb, offset, 1, message, "EIT: %s (%d)",
+                                     val_to_str_const (eit, eit_vals, "Unknown"),
+                                     eit);
+    field_tree = proto_item_add_subtree (tf, ett_message_eit);
+    proto_tree_add_item (field_tree, hf_message_eit, tvb, offset, 1, ENC_BIG_ENDIAN);
+    proto_item_append_text (en, ", Type: %s",
+                            val_to_str_const (eit, eit_vals, "Unknown"));
+
+    /* Compression Algorithm */
+    tf = proto_tree_add_uint_format (message_tree, hf_message_compr,
+                                     tvb, offset, 1, message,
+                                     "Compression Algorithm: %s (%d)",
+                                     val_to_str_const (compr_alg, compression_vals, "Unknown"),
+                                     compr_alg);
+    field_tree = proto_item_add_subtree (tf, ett_message_compr);
+    tr = proto_tree_add_item (field_tree, hf_message_compr, tvb, offset, 1, ENC_BIG_ENDIAN);
+    if (compr_alg == ALGORITHM_ZLIB) {
+      proto_item_append_text (en, " (compressed)");
+    } else if (compr_alg != ALGORITHM_NONE) {
+      expert_add_info(pinfo, tr, &ei_message_compr);
+    }
+
+    if (message & 0x07) {
+      /* Reserved */
+      tf = proto_tree_add_uint_format (message_tree, hf_reserved_0x07,
+                                       tvb, offset, 1, message,
+                                       "Reserved: %d",  message & 0x07);
+      field_tree = proto_item_add_subtree (tf, ett_message_body_reserved);
+      tf = proto_tree_add_item (field_tree, hf_reserved_0x07, tvb, offset, 1, ENC_BIG_ENDIAN);
+      expert_add_info(pinfo, tf, &ei_reserved_value);
+    }
+    offset += 1;
+  }
+
+  len = tvb_reported_length_remaining (tvb, offset);
+  if (dmp.checksum) {
+    len -= 2;
+  }
+
+  if (compr_alg == ALGORITHM_ZLIB) {
+    tf = proto_tree_add_item (message_tree, hf_message_body_compressed,
+                              tvb, offset, len, ENC_NA);
+    proto_item_append_text (tf, ", Length: %d", len);
+  } else {
+    tf = proto_tree_add_item (message_tree, hf_message_body_data,
+                              tvb, offset, len, ENC_NA);
+    proto_item_set_text (tf, "User data, Length: %d", len);
+  }
+
+  if (dmp.body_format == STRUCTURED) {
+    /* Structured Message ID */
+    field_tree = proto_item_add_subtree (tf, ett_message_body);
+    proto_tree_add_item (field_tree, hf_message_body_structured, tvb, offset, len, ENC_NA);
+  } else if (len > 0 && (dmp.body_format == FREE_TEXT ||
+                         dmp.body_format == FREE_TEXT_SUBJECT)) {
+    if (compr_alg == ALGORITHM_ZLIB) {
+      if ((body_tvb = tvb_child_uncompress (tvb, tvb, offset, len)) != NULL) {
+        body_len = tvb_captured_length (body_tvb);
+        add_new_data_source (pinfo, body_tvb, "Uncompressed User data");
+        tf = proto_tree_add_item (message_tree, hf_message_body_data,
+                                  body_tvb, 0, body_len, ENC_NA);
+        proto_item_set_text (tf, "User data, Length: %d", body_len);
+        proto_item_set_generated (tf);
+      } else {
+        proto_tree_add_expert (message_tree, pinfo, &ei_message_body_uncompress, tvb, offset, len);
+      }
+    } else {
+      body_tvb = tvb;
+      body_offset = offset;
+      body_len = len;
+    }
+
+    if (eit != EIT_BILATERAL && body_len > 0) {
+      field_tree = proto_item_add_subtree (tf, ett_message_body);
+      proto_tree_add_item (field_tree, hf_message_body_plain, body_tvb,
+                           body_offset, body_len, ENC_ASCII);
+    }
+  }
+  offset += len;
+
+  proto_item_set_len (en, offset - boffset);
+
+  return offset;
+}
+
+/* Ref chapter 6.3.9.1 Report structure */
+static gint dissect_dmp_report (tvbuff_t *tvb, packet_info *pinfo,
+                                proto_tree *dmp_tree, gint offset,
+                                guint *prev_rec_no, gint num)
+{
+  proto_tree *report_tree = NULL;
+  proto_tree *field_tree = NULL;
+  proto_item *en = NULL, *ei = NULL, *tf = NULL;
+  guint8      report;
+  gboolean    info_present;
+  gint32      secs = 0;
+  gint        len, boffset = offset;
+  gint        rep_type = 0;
+
+  report = tvb_get_guint8 (tvb, offset);
+  rep_type = (report & 0x80) >> 7;
+  if (rep_type) {
+    en = proto_tree_add_item (dmp_tree, hf_non_delivery_report, tvb, offset, 4, ENC_NA);
+  } else {
+    en = proto_tree_add_item (dmp_tree, hf_delivery_report, tvb, offset, 4, ENC_NA);
+  }
+  proto_item_append_text (en, " (#%d)", num);
+
+  report_tree = proto_item_add_subtree (en, ett_report);
+
+  /* Report Type */
+  tf = proto_tree_add_boolean_format (report_tree, hf_report_type,
+                                      tvb, offset, 1, report,
+                                      "Report Type: %s",
+                                      tfs_get_string(rep_type, &report_type));
+  field_tree = proto_item_add_subtree (tf, ett_report_type);
+  proto_tree_add_item (field_tree, hf_report_type, tvb, offset, 1, ENC_BIG_ENDIAN);
+
+  if (rep_type == DR) {
+    dmp.dr = TRUE;
+    /* Info Present */
+    info_present = (report & 0x40);
+    tf = proto_tree_add_boolean_format (report_tree,hf_report_info_present_dr,
+                                        tvb, offset, 1, report,
+                                        "Info Present: %s",
+                                        tfs_get_string(report & 0x40, &tfs_present_absent));
+    field_tree = proto_item_add_subtree (tf, ett_report_info_present_dr);
+    proto_tree_add_item (field_tree, hf_report_info_present_dr, tvb, offset, 1, ENC_BIG_ENDIAN);
+
+    /* Address Encoding */
+    dmp.addr_enc = ((report & 0x20) >> 5);
+    tf = proto_tree_add_boolean_format (report_tree, hf_report_addr_enc_dr,
+                                        tvb, offset, 1, report,
+                                        "Address Encoding: %s",
+                                        tfs_get_string(report & 0x20, &addr_enc));
+    field_tree = proto_item_add_subtree (tf, ett_report_addr_enc_dr);
+    proto_tree_add_item (field_tree, hf_report_addr_enc_dr, tvb, offset, 1, ENC_BIG_ENDIAN);
+
+    if (report & 0x1F) {
+      /* Reserved */
+      tf = proto_tree_add_uint_format (report_tree, hf_reserved_0x1F,
+                                       tvb, offset, 1, report,
+                                       "Reserved: %d", report & 0x1F);
+      field_tree = proto_item_add_subtree (tf, ett_report_reserved);
+      tf = proto_tree_add_item (field_tree, hf_reserved_0x1F, tvb, offset, 1, ENC_BIG_ENDIAN);
+      expert_add_info(pinfo, tf, &ei_reserved_value);
+
+    }
+    offset += 1;
+
+    /* Delivery Time */
+    report = tvb_get_guint8 (tvb, offset);
+    tf = proto_tree_add_uint_format (report_tree, hf_report_del_time,
+                                     tvb, offset, 1, report,
+                                     "Delivery Time: ");
+    field_tree = proto_item_add_subtree (tf, ett_report_del_time);
+    ei = proto_tree_add_item (field_tree, hf_report_del_time_val, tvb, offset, 1, ENC_BIG_ENDIAN);
+    secs = dmp_dec_del_time (report);
+    if (secs == DMP_TIME_RESERVED) {
+      proto_item_append_text (tf, "Reserved (0x%2.2x)", report);
+      proto_item_append_text (ei, " (Reserved)");
+    } else {
+      proto_item_append_text (tf, "%s (%s)", signed_time_secs_to_str(wmem_packet_scope(), secs),
+                              abs_time_secs_to_str (wmem_packet_scope(), dmp.subm_time - secs, ABSOLUTE_TIME_LOCAL, TRUE));
+      proto_item_append_text (ei, " (%s from submission time)", signed_time_secs_to_str(wmem_packet_scope(), secs));
+    }
+  } else {
+    dmp.ndr = TRUE;
+    /* Address Encoding */
+    dmp.addr_enc = ((report & 0x40) >> 6);
+    tf = proto_tree_add_boolean_format (report_tree, hf_report_addr_enc_ndr,
+                                        tvb, offset, 1, report,
+                                        "Address Encoding: %s",
+                                        tfs_get_string(report & 0x40, &addr_enc));
+    field_tree = proto_item_add_subtree (tf, ett_report_addr_enc_ndr);
+    proto_tree_add_item (field_tree, hf_report_addr_enc_ndr, tvb, offset, 1, ENC_BIG_ENDIAN);
+
+    /* Reason */
+    tf = proto_tree_add_uint_format (report_tree, hf_report_reason,
+                                     tvb, offset, 1, report,
+                                     "Reason%s: %s (%d)",
+                                     ((report & 0x3F) < 0x3D) ? " (P1)":"",
+                                     non_del_reason_str (report & 0x3F),
+                                     report & 0x3F);
+    field_tree = proto_item_add_subtree (tf, ett_report_reason);
+    proto_tree_add_item (field_tree, hf_report_reason, tvb, offset, 1, ENC_BIG_ENDIAN);
+    offset += 1;
+
+    /* Info Present */
+    report = tvb_get_guint8 (tvb, offset);
+    info_present = (report & 0x80);
+    tf = proto_tree_add_boolean_format (report_tree,
+                                        hf_report_info_present_ndr,
+                                        tvb, offset, 1, report,
+                                        "Info Present: %s", (report & 0x80) ? "Present" : "Absent");
+    field_tree = proto_item_add_subtree (tf, ett_report_info_present_ndr);
+    proto_tree_add_item (field_tree, hf_report_info_present_ndr, tvb, offset, 1, ENC_BIG_ENDIAN);
+
+    /* Diagnostic */
+    tf = proto_tree_add_uint_format (report_tree, hf_report_diagn,
+                                     tvb, offset, 1, report,
+                                     "Diagnostic%s: %s (%d)",
+                                     ((report & 0x7F) < 0x7C) ? " (P1)":"",
+                                     non_del_diagn_str (report & 0x7F),
+                                     report & 0x7F);
+    field_tree = proto_item_add_subtree (tf, ett_report_diagn);
+    proto_tree_add_item (field_tree, hf_report_diagn, tvb, offset, 1, ENC_BIG_ENDIAN);
+  }
+  offset += 1;
+
+  offset = dissect_dmp_address (tvb, pinfo, report_tree, offset,
+                                prev_rec_no, TRUE);
+
+  if (info_present) {
+    /* Supplementary Information */
+    len = tvb_strsize (tvb, offset);
+    tf = proto_tree_add_uint_format (report_tree, hf_report_suppl_info_len,
+                                     tvb, offset, len, len,
+                                     "Supplementary Information, Length: %d",
+                                     len - 1);
+    if (len > 1) {
+      if ((offset - boffset + len) > 128) {
+        proto_item_append_text (tf, " (incorrect, should be less than %d)",
+                                128 - (offset - boffset));
+      }
+      field_tree = proto_item_add_subtree (tf, ett_report_suppl_info);
+      proto_tree_add_item (field_tree, hf_report_suppl_info, tvb, offset, len, ENC_ASCII);
+    }
+    offset += len;
+  }
+
+  proto_item_set_len (en, offset - boffset);
+
+  return offset;
+}
+
+/* Ref chapter 6.3.10.1 Notification structure */
+static gint dissect_dmp_notification (tvbuff_t *tvb, packet_info *pinfo _U_,
+                                      proto_tree *dmp_tree, gint offset)
+{
+  proto_tree *notif_tree = NULL;
+  proto_tree *field_tree = NULL;
+  proto_item *en = NULL, *ei = NULL, *tf = NULL;
+  guint8      notif, rec_time, on_typex = 0xFF;
+  gint        len, boffset = offset;
+  gint32      secs = 0;
+
+  if (dmp.notif_type == RN) {
+    en = proto_tree_add_item (dmp_tree, hf_receipt_notif, tvb, offset, 4, ENC_NA);
+  } else if (dmp.notif_type == NRN) {
+    en = proto_tree_add_item (dmp_tree, hf_non_receipt_notif, tvb, offset, 4, ENC_NA);
+  } else if (dmp.notif_type == ON) {
+    en = proto_tree_add_item (dmp_tree, hf_other_notif, tvb, offset, 4, ENC_NA);
+  } else {
+    return offset;
+  }
+  notif_tree = proto_item_add_subtree (en, ett_notif);
+
+  if (dmp.notif_type == RN || dmp.notif_type == ON) {
+    /* Receipt Time */
+    rec_time = tvb_get_guint8 (tvb, offset);
+    tf = proto_tree_add_uint_format (notif_tree, hf_notif_rec_time,
+                                     tvb, offset, 1, rec_time,
+                                     "Receipt Time: ");
+    field_tree = proto_item_add_subtree (tf, ett_notif_rec_time);
+    ei = proto_tree_add_item (field_tree, hf_notif_rec_time_val, tvb, offset, 1, ENC_BIG_ENDIAN);
+    secs = dmp_dec_exp_time (rec_time);
+    if (secs == DMP_TIME_NOT_PRESENT) {
+      proto_item_append_text (tf, "Not present");
+      proto_item_append_text (ei, " (not present)");
+    } else if (secs == DMP_TIME_RESERVED) {
+      proto_item_append_text (tf, "Reserved (0x%2.2x)", rec_time);
+      proto_item_append_text (ei, " (Reserved)");
+    } else {
+      proto_item_append_text (tf, "%s (%s)", signed_time_secs_to_str(wmem_packet_scope(), secs),
+                              abs_time_secs_to_str (wmem_packet_scope(), dmp.subm_time - secs, ABSOLUTE_TIME_LOCAL, TRUE));
+      proto_item_append_text (ei, " (%s from submission time)", signed_time_secs_to_str(wmem_packet_scope(), secs));
+    }
+    offset += 1;
+
+    if (dmp.notif_type == ON) {
+      /* ON Type */
+      on_typex = tvb_get_guint8 (tvb, offset);
+      proto_tree_add_item (notif_tree, hf_notif_on_type, tvb, offset, 1, ENC_BIG_ENDIAN);
+      offset += 1;
+    }
+
+    /* Supplementary Information */
+    len = tvb_strsize (tvb, offset);
+    tf = proto_tree_add_uint_format (notif_tree, hf_notif_suppl_info_len,
+                                     tvb, offset, len, len,
+                                     "Supplementary Information, Length: %d",
+                                     len - 1);
+    if (len > 1) {
+      if ((offset - boffset + len) > 128) {
+        proto_item_append_text (tf, " (incorrect, should be less than %d)",
+                                128 - (offset - boffset));
+      }
+      field_tree = proto_item_add_subtree (tf, ett_notif_suppl_info);
+      proto_tree_add_item (field_tree, hf_notif_suppl_info, tvb, offset, len, ENC_ASCII);
+    }
+    offset += len;
+
+    if ((dmp.notif_type == ON) && (on_typex < 0x03)) {
+      /* ACP127 Receipient */
+      len = tvb_strsize (tvb, offset);
+      tf = proto_tree_add_uint_format (notif_tree, hf_notif_acp127,
+                                       tvb, offset, len, len,
+                                       "ACP127 Recipient, Length: %d",
+                                       len - 1);
+      if (len > 1) {
+        if (len > 64) {
+          proto_item_append_text (tf, " (incorrect, must be less than 64)");
+        }
+        field_tree = proto_item_add_subtree (tf, ett_notif_acp127recip);
+        proto_tree_add_item (field_tree, hf_notif_acp127recip, tvb, offset, len, ENC_ASCII);
+      }
+      offset += len;
+    }
+  } else if (dmp.notif_type == NRN) {
+    /* Non-Recipient Reason */
+    notif = tvb_get_guint8 (tvb, offset);
+    proto_tree_add_uint_format (notif_tree, hf_notif_non_rec_reason,
+                                tvb, offset, 1, notif,
+                                "Non-Receipt Reason%s: %s (%d)",
+                                (notif < 0x10) ? " (P22)" : "",
+                                nrn_reason_str (notif), notif);
+    offset += 1;
+
+    /* Discard Reason */
+    notif = tvb_get_guint8 (tvb, offset);
+    proto_tree_add_uint_format (notif_tree, hf_notif_discard_reason,
+                                tvb, offset, 1, notif,
+                                "Discard Reason%s: %s (%d)",
+                                (notif < 0x10) ? " (P22)" : "",
+                                discard_reason_str (notif), notif);
+    offset += 1;
+  }
+
+  proto_item_set_len (en, offset - boffset);
+
+  return offset;
+}
+
+/* Ref chapter 6.2.1.2.8 SecurityCategories */
+static gint dissect_dmp_security_category (tvbuff_t *tvb, packet_info *pinfo,
+                                           proto_tree *tree,
+                                           const gchar **label_string,
+                                           gint offset, guint8 *ext)
+{
+  proto_tree *field_tree = NULL;
+  proto_item *tf = NULL, *tr = NULL;
+  gchar      *sec_cat = NULL;
+  guint8      message;
+  gboolean    country_code = FALSE;
+
+  message = tvb_get_guint8 (tvb, offset);
+  tf = proto_tree_add_uint_format (tree, hf_message_sec_cat_nat, tvb,
+                                   offset, 1, message, "Security Categories");
+  field_tree = proto_item_add_subtree (tf, ett_message_sec_cat);
+
+  switch (*ext) {
+
+  case SEC_CAT_EXT_NONE:
+    proto_tree_add_item (field_tree, hf_message_sec_cat_cl, tvb, offset, 1, ENC_BIG_ENDIAN);
+    proto_tree_add_item (field_tree, hf_message_sec_cat_cs, tvb, offset, 1, ENC_BIG_ENDIAN);
+    proto_tree_add_item (field_tree, hf_message_sec_cat_ex, tvb, offset, 1, ENC_BIG_ENDIAN);
+    proto_tree_add_item (field_tree, hf_message_sec_cat_ne, tvb, offset, 1, ENC_BIG_ENDIAN);
+
+    tr = proto_tree_add_item (field_tree, hf_reserved_0x08, tvb, offset, 1, ENC_BIG_ENDIAN);
+    if (message & 0x08) {
+      expert_add_info(pinfo, tr, &ei_reserved_value);
+    }
+    tr = proto_tree_add_item (field_tree, hf_reserved_0x04, tvb, offset, 1, ENC_BIG_ENDIAN);
+    if (message & 0x04) {
+      expert_add_info(pinfo, tr, &ei_reserved_value);
+    }
+
+    if (message & 0xF0) {
+      sec_cat = wmem_strdup_printf (wmem_packet_scope(), "%s%s%s%s",
+                                    (message & 0x80) ? ",cl" : "",
+                                    (message & 0x40) ? ",cs" : "",
+                                    (message & 0x20) ? ",ex" : "",
+                                    (message & 0x10) ? ",ne" : "");
+      proto_item_append_text (tf, ": %s", &sec_cat[1]);
+      *label_string = wmem_strconcat(wmem_packet_scope(), *label_string, sec_cat, NULL);
+    }
+    break;
+
+  case SEC_CAT_EXT_PERMISSIVE:
+    if ((message >> 2) == 0x3F) {
+      /* Fake entry because nat_pol_id defines 0x3F as reserved */
+      proto_tree_add_uint_format (field_tree, hf_message_sec_cat_permissive, tvb, offset, 1,
+                                  message, "1111 11.. = Next byte has Country Code (0x3F)");
+      country_code = TRUE;
+    } else {
+      tr = proto_tree_add_item (field_tree, hf_message_sec_cat_permissive, tvb, offset, 1, ENC_BIG_ENDIAN);
+      proto_item_append_text (tf, ": rel-to-%s", get_nat_pol_id_short (message >> 2));
+      *label_string = wmem_strdup_printf(wmem_packet_scope(), "%s,rel-to-%s", *label_string, get_nat_pol_id_short (message >> 2));
+      if ((message >> 2) == 0) {
+        expert_add_info(pinfo, tr, &ei_reserved_value);
+      }
+    }
+    break;
+
+  case SEC_CAT_EXT_RESTRICTIVE:
+    proto_tree_add_item (field_tree, hf_message_sec_cat_restrictive, tvb, offset, 1, ENC_BIG_ENDIAN);
+    proto_item_append_text (tf, " (restrictive: 0x%2.2x)", message >> 2);
+    break;
+
+  default:
+    break;
+  }
+
+  proto_item_append_text (tf, " (0x%2.2x)", message);
+  *ext = 0; /* Reset extended bits */
+
+  if (dmp.version == 1) {
+    tr = proto_tree_add_item (field_tree, hf_reserved_0x02, tvb, offset, 1, ENC_BIG_ENDIAN);
+    if (message & 0x02) {
+      expert_add_info(pinfo, tr, &ei_reserved_value);
+    }
+    tr = proto_tree_add_item (field_tree, hf_reserved_0x01, tvb, offset, 1, ENC_BIG_ENDIAN);
+    if (message & 0x01) {
+      expert_add_info(pinfo, tr, &ei_reserved_value);
+    }
+    offset += 1;
+  } else {
+    tr = proto_tree_add_item (field_tree, hf_message_sec_cat_extended, tvb, offset, 1, ENC_BIG_ENDIAN);
+    if ((message & 0x01) && (message & 0x02)) {
+      expert_add_info(pinfo, tr, &ei_reserved_value);
+    } else if (message & 0x01 || message & 0x02) {
+      proto_item_append_text (tf, " (extended)");
+      *ext = message & 0x03;
+    }
+    offset += 1;
+
+    if (country_code) {
+      proto_tree_add_item (field_tree, hf_message_sec_cat_country_code, tvb, offset, 1, ENC_BIG_ENDIAN);
+      proto_item_append_text (tf, " (rel-to country-code: %d)", tvb_get_guint8 (tvb, offset));
+      proto_item_set_len (tf, 2);
+      offset += 1;
+    }
+  }
+
+  return offset;
+}
+
+/*
+ * Ref chapter 6.3.7.1 STANAG 4406 message structure
+ * and chapter 6.3.8.1 IPM 88 message structure
+ * and chapter 6.3.9.1 Report structure
+ * and chapter 6.3.10.1 Notification structure
+ */
+static gint dissect_dmp_content (tvbuff_t *tvb, packet_info *pinfo,
+                                 proto_tree *dmp_tree, gint offset)
+{
+  proto_tree *message_tree = NULL;
+  proto_tree *field_tree = NULL;
+  proto_item *en = NULL, *ei = NULL, *tf = NULL;
+  proto_item *hidden_item;
+  const char  *label_string = wmem_strdup (wmem_packet_scope(), "");
+  const gchar *class_name = NULL;
+  guint8      message, dmp_sec_pol, dmp_sec_class, dmp_nation = 0, exp_time, dtg;
+  gint32      secs = 0;
+  guint       prev_rec_no = 0;
+  gint        rep_len, rep_no = 1;
+  gint        loffset, boffset = offset;
+
+  if (dmp.msg_type == REPORT) {
+    en = proto_tree_add_item (dmp_tree, hf_report_content, tvb, offset, 7, ENC_NA);
+  } else if (dmp.msg_type == NOTIF) {
+    en = proto_tree_add_item (dmp_tree, hf_notif_content, tvb, offset, 7, ENC_NA);
+  } else {
+    en = proto_tree_add_item (dmp_tree, hf_message_content, tvb, offset, 7, ENC_NA);
+  }
+  message_tree = proto_item_add_subtree (en, ett_content);
+
+  if (dmp.msg_type == STANAG || dmp.msg_type == IPM) {
+    message = tvb_get_guint8 (tvb, offset);
+    dmp.body_format = (message & 0x03);
+
+    if (dmp.msg_type == STANAG) {
+      /* Message Type */
+      dmp.st_type = (message & 0xC0) >> 6;
+      tf = proto_tree_add_uint_format (message_tree, hf_message_st_type,
+                                       tvb, offset, 1, message,
+                                       "Message Type: %s (%d)",
+                                       val_to_str_const (dmp.st_type,
+                                                         message_type_vals, ""),
+                                       dmp.st_type);
+      field_tree = proto_item_add_subtree (tf, ett_message_st_type);
+      proto_tree_add_item (field_tree, hf_message_st_type, tvb, offset, 1, ENC_BIG_ENDIAN);
+
+      if ((message & 0x20) >> 5) {
+        /* Reserved */
+        tf = proto_tree_add_uint_format (message_tree, hf_reserved_0x20,
+                                         tvb, offset, 1, message,
+                                         "Reserved: %d", (message & 0x20)>>5);
+        field_tree = proto_item_add_subtree (tf, ett_message_reserved);
+        tf = proto_tree_add_item (field_tree, hf_reserved_0x20, tvb, offset, 1, ENC_BIG_ENDIAN);
+        expert_add_info(pinfo, tf, &ei_reserved_value);
+      }
+
+      /* Precedence */
+      dmp.prec = (message & 0x1C) >> 2;
+      tf = proto_tree_add_uint_format (message_tree, hf_message_precedence,
+                                       tvb, offset, 1, message,
+                                       "Precedence: %s (%d)",
+                                       val_to_str_const (dmp.prec, precedence, ""),
+                                       dmp.prec);
+      field_tree = proto_item_add_subtree (tf, ett_message_precedence);
+      proto_tree_add_item (field_tree, hf_message_precedence, tvb, offset, 1, ENC_BIG_ENDIAN);
+
+    } else {
+      if ((message & 0xE0) >> 5) {
+        /* Reserved */
+        tf = proto_tree_add_uint_format (message_tree, hf_reserved_0xE0,
+                                         tvb, offset, 1, message,
+                                         "Reserved: %d", (message & 0xE0)>>5);
+        field_tree = proto_item_add_subtree (tf, ett_message_reserved);
+        tf = proto_tree_add_item (field_tree, hf_reserved_0xE0, tvb, offset, 1, ENC_BIG_ENDIAN);
+        expert_add_info(pinfo, tf, &ei_reserved_value);
+      }
+
+      /* Importance */
+      dmp.prec = (message & 0x1C) >> 2;
+      tf = proto_tree_add_uint_format (message_tree, hf_message_importance,
+                                       tvb, offset, 1, message,
+                                       "Importance: %s (%d)",
+                                       val_to_str_const (dmp.prec, importance, ""),
+                                       dmp.prec);
+      field_tree = proto_item_add_subtree (tf, ett_message_importance);
+      proto_tree_add_item (field_tree, hf_message_importance, tvb, offset, 1, ENC_BIG_ENDIAN);
+    }
+
+    /* Body Format */
+    tf = proto_tree_add_uint_format (message_tree, hf_message_body_format,
+                                     tvb, offset, 1, message,
+                                     "Body Format: %s (%d)",
+                                     val_to_str_const (message & 0x03,
+                                                       body_format_vals, ""),
+                                     message & 0x03);
+    field_tree = proto_item_add_subtree (tf, ett_message_body_format);
+    proto_tree_add_item (field_tree, hf_message_body_format, tvb, offset, 1, ENC_BIG_ENDIAN);
+    offset += 1;
+  }
+
+  message = tvb_get_guint8 (tvb, offset);
+  /* Security Classification */
+  dmp_sec_class = (message & 0xE0) >> 5;
+  dmp_sec_pol = (message & 0x1C) >> 2;
+  if (dmp_sec_pol == EXTENDED_NATIONAL) {
+    dmp_nation = tvb_get_guint8 (tvb, offset + 1);
+  }
+
+  loffset = offset; /* Offset to start of security label */
+  if (dmp_sec_pol == NATIONAL && dmp_local_nation != 0) {
+    class_name = dmp_national_sec_class (dmp_local_nation, dmp_sec_class);
+  } else if (dmp_sec_pol == EXTENDED_NATIONAL) {
+    class_name = dmp_national_sec_class (dmp_nation, dmp_sec_class);
+  }
+  if ((dmp_sec_pol == NATO || dmp_sec_pol == NATIONAL) && !class_name) {
+    class_name = val_to_str_const (dmp_sec_class, sec_class, "");
+  }
+  if (class_name && class_name[0]) {
+    tf = proto_tree_add_uint_format (message_tree, hf_message_sec_class_val,
+                                     tvb, offset, 1, message,
+                                     "Security Classification: %s (%d)",
+                                     class_name, dmp_sec_class);
+  } else {
+    tf = proto_tree_add_uint_format (message_tree, hf_message_sec_class_val,
+                                     tvb, offset, 1, message,
+                                     "Security Classification: %d",
+                                     dmp_sec_class);
+  }
+  field_tree = proto_item_add_subtree (tf, ett_message_sec_class);
+  tf = proto_tree_add_item (field_tree, hf_message_sec_class_val, tvb, offset, 1, ENC_BIG_ENDIAN);
+  if (class_name) {
+    proto_item_append_text (tf, " (%s)", class_name);
+    label_string = wmem_strconcat(wmem_packet_scope(), label_string, class_name, NULL);
+  }
+
+  /* Security Policy */
+  tf = proto_tree_add_uint_format (message_tree, hf_message_sec_pol,
+                                   tvb, offset, 1, message,
+                                   "Security Policy: %s (%d)",
+                                   val_to_str (dmp_sec_pol, sec_pol, "%d"),
+                                   dmp_sec_pol);
+  field_tree = proto_item_add_subtree (tf, ett_message_sec_pol);
+  proto_tree_add_item (field_tree, hf_message_sec_pol, tvb, offset, 1, ENC_BIG_ENDIAN);
+
+  if (dmp.msg_type == STANAG || dmp.msg_type == IPM) {
+    /* Heading Flags */
+    tf = proto_tree_add_item (message_tree, hf_message_heading_flags, tvb, offset, 1, ENC_NA);
+    field_tree = proto_item_add_subtree (tf, ett_message_heading_flags);
+    proto_tree_add_item (field_tree, hf_message_auth_users, tvb, offset, 1, ENC_BIG_ENDIAN);
+    proto_tree_add_item (field_tree, hf_message_subject_disc, tvb, offset, 1, ENC_BIG_ENDIAN);
+    if (message & 0x03) {
+      proto_item_append_text (tf, ": %s%s%s discarded",
+                              (message & 0x02) ? "Authorizing users" : "",
+                              (message & 0x03) == 0x03 ? " and " : "",
+                              (message & 0x01) ? "Subject" : "");
+    } else {
+      proto_item_append_text (tf, " (none)");
+    }
+  } else if (dmp.msg_type == NOTIF) {
+    /* Notification Type */
+    dmp.notif_type = (message & 0x03);
+    tf = proto_tree_add_uint_format (message_tree, hf_notif_type,
+                                     tvb, offset, 1, message,
+                                     "Notification Type: %s",
+                                     val_to_str_const (dmp.notif_type, notif_type,
+                                                       "Reserved"));
+    field_tree = proto_item_add_subtree (tf, ett_notif_type);
+    proto_tree_add_item (field_tree, hf_notif_type, tvb, offset, 1, ENC_BIG_ENDIAN);
+  } else if (message & 0x02) {
+    /* Reserved */
+    tf = proto_tree_add_uint_format (message_tree, hf_reserved_0x02,
+                                     tvb, offset, 1, message,
+                                     "Reserved: %d", message & 0x02);
+    field_tree = proto_item_add_subtree (tf, ett_message_reserved);
+    tf = proto_tree_add_item (field_tree, hf_reserved_0x02, tvb, offset, 1, ENC_BIG_ENDIAN);
+    expert_add_info(pinfo, tf, &ei_reserved_value);
+  }
+  offset += 1;
+
+  if (dmp_sec_pol == NATIONAL && dmp_local_nation != 0) {
+    /* Show configured national policy */
+    tf = proto_tree_add_uint (message_tree, hf_message_national_policy_id,
+                              tvb, offset, 0, dmp_local_nation);
+    proto_item_set_generated (tf);
+  } else if (dmp_sec_pol == EXTENDED_NATIONAL) {
+    /* National Policy Identifier */
+    proto_tree_add_item (message_tree, hf_message_national_policy_id, tvb, offset, 1, ENC_BIG_ENDIAN);
+    offset += 1;
+  } else if (dmp_sec_pol == EXTENDED_MISSION) {
+    /* Mission Policy Identifier */
+    message = tvb_get_guint8 (tvb, offset);
+    if (message == 0xFF) {
+      proto_tree_add_uint_format_value (message_tree, hf_message_mission_policy_id,
+                                        tvb, offset, 1, message,
+                                        "Reserved (0xFF)");
+    } else {
+      proto_tree_add_item (message_tree, hf_message_mission_policy_id, tvb, offset, 1, ENC_BIG_ENDIAN);
+    }
+    offset += 1;
+  }
+
+  /* Security Categories */
+  if (dmp_sec_pol == NATO || dmp_sec_pol == NATIONAL || dmp_sec_pol == EXTENDED_NATIONAL) {
+    guint8 ext = 0;
+    guint  sec_cat_count = 0;
+    do {
+      offset = dissect_dmp_security_category (tvb, pinfo, message_tree, &label_string, offset, &ext);
+      sec_cat_count++;
+    } while (ext != 0 && sec_cat_count < G_MAXUINT8);
+    if (sec_cat_count == G_MAXUINT8) {
+      /* This is a arbitrary limit to avoid a long dissector loop. */
+      expert_add_info(pinfo, en, &ei_too_many_sec_cat);
+    }
+    proto_item_append_text (en, ", Security Label: %s", label_string);
+    tf = proto_tree_add_string (message_tree, hf_message_sec_label, tvb, loffset,
+                                offset - loffset, label_string);
+    proto_item_set_generated (tf);
+  } else {
+    tf = proto_tree_add_item (message_tree, hf_message_sec_cat_val, tvb, offset, 1, ENC_BIG_ENDIAN);
+    field_tree = proto_item_add_subtree (tf, ett_message_sec_cat);
+
+    proto_tree_add_item (field_tree, hf_message_sec_cat_bit7, tvb, offset, 1, ENC_BIG_ENDIAN);
+    proto_tree_add_item (field_tree, hf_message_sec_cat_bit6, tvb, offset, 1, ENC_BIG_ENDIAN);
+    proto_tree_add_item (field_tree, hf_message_sec_cat_bit5, tvb, offset, 1, ENC_BIG_ENDIAN);
+    proto_tree_add_item (field_tree, hf_message_sec_cat_bit4, tvb, offset, 1, ENC_BIG_ENDIAN);
+    proto_tree_add_item (field_tree, hf_message_sec_cat_bit3, tvb, offset, 1, ENC_BIG_ENDIAN);
+    proto_tree_add_item (field_tree, hf_message_sec_cat_bit2, tvb, offset, 1, ENC_BIG_ENDIAN);
+    proto_tree_add_item (field_tree, hf_message_sec_cat_bit1, tvb, offset, 1, ENC_BIG_ENDIAN);
+    proto_tree_add_item (field_tree, hf_message_sec_cat_bit0, tvb, offset, 1, ENC_BIG_ENDIAN);
+    offset += 1;
+  }
+
+  if (dmp.msg_type == STANAG || dmp.msg_type == IPM) {
+    /* Expiry Time */
+    exp_time = tvb_get_guint8 (tvb, offset);
+    tf = proto_tree_add_uint_format (message_tree, hf_message_exp_time,
+                                     tvb, offset, 1, exp_time,
+                                     "Expiry Time: ");
+    field_tree = proto_item_add_subtree (tf, ett_message_exp_time);
+    ei = proto_tree_add_item (field_tree, hf_message_exp_time_val, tvb, offset, 1, ENC_BIG_ENDIAN);
+    secs = dmp_dec_exp_time (exp_time);
+    if (secs == DMP_TIME_NOT_PRESENT) {
+      proto_item_append_text (tf, "Not present");
+      proto_item_append_text (ei, " (not present)");
+    } else if (secs == DMP_TIME_RESERVED) {
+      proto_item_append_text (tf, "Reserved (0x%2.2x)", exp_time);
+      proto_item_append_text (ei, " (Reserved)");
+    } else {
+      proto_item_append_text (tf, "%s (%s)", signed_time_secs_to_str(wmem_packet_scope(), secs),
+                              abs_time_secs_to_str (wmem_packet_scope(), dmp.subm_time + secs, ABSOLUTE_TIME_LOCAL, TRUE));
+      proto_item_append_text (ei, " (%s from submission time)", signed_time_secs_to_str(wmem_packet_scope(), secs));
+    }
+    offset += 1;
+  }
+
+  if (dmp.msg_type == STANAG) {
+    dtg = tvb_get_guint8 (tvb, offset);
+    tf = proto_tree_add_uint_format (message_tree, hf_message_dtg, tvb, offset, 1, dtg, "DTG: ");
+    field_tree = proto_item_add_subtree (tf, ett_message_dtg);
+    proto_tree_add_item (field_tree, hf_message_dtg_sign, tvb, offset, 1, ENC_BIG_ENDIAN);
+    proto_tree_add_item (field_tree, hf_message_dtg_val, tvb, offset, 1, ENC_BIG_ENDIAN);
+    secs = dmp_dec_dtg (dtg & 0x7F);
+    if (secs == DMP_TIME_NOT_PRESENT) {
+      proto_item_append_text (tf, "Not present");
+    } else if (secs == DMP_TIME_RESERVED) {
+      proto_item_append_text (tf, "Reserved (0x%2.2x)", dtg & 0x7F);
+    } else if (secs == 0) {
+      proto_item_append_text (tf, "0 minutes in the %s (%s)",
+                              tfs_get_string(dtg & 0x80, &dtg_sign),
+                              abs_time_secs_to_str (wmem_packet_scope(), dmp.subm_time, ABSOLUTE_TIME_LOCAL, TRUE));
+    } else {
+      proto_item_append_text (tf, "%s in the %s (%s)", signed_time_secs_to_str(wmem_packet_scope(), secs),
+                              tfs_get_string(dtg & 0x80, &dtg_sign), (dtg & 0x80) ?
+                              abs_time_secs_to_str (wmem_packet_scope(), dmp.subm_time + secs, ABSOLUTE_TIME_LOCAL, TRUE) :
+                              abs_time_secs_to_str (wmem_packet_scope(), dmp.subm_time - secs, ABSOLUTE_TIME_LOCAL, TRUE));
+    }
+    offset += 1;
+  }
+
+  if (dmp.msg_type == STANAG) {
+    /* SIC */
+    offset = dissect_dmp_sic (tvb, pinfo, message_tree, offset);
+  } else if (dmp.msg_type == REPORT || dmp.msg_type == NOTIF) {
+    if (dmp.version == DMP_VERSION_1 || dmp.msg_id_type == ONLY_DMP_ID) {
+      /* Subject Message Identifier */
+      dmp.subj_id = tvb_get_ntohs (tvb, offset);
+      proto_tree_add_item (message_tree, hf_message_subj_id, tvb, offset, 2, ENC_BIG_ENDIAN);
+      hidden_item = proto_tree_add_item (message_tree, hf_dmp_id, tvb, offset, 2, ENC_BIG_ENDIAN);
+      proto_item_set_hidden (hidden_item);
+      offset += 2;
+    } else if (dmp.msg_id_type == X400_MSG_ID || dmp.msg_id_type == NAT_MSG_ID) {
+      if (dmp.msg_type == REPORT) {
+        /* Subject MTS Identifier */
+        offset = dissect_mts_identifier (tvb, pinfo, message_tree, offset, TRUE);
+      } else {
+        /* Subject IPM Identifier */
+        offset = dissect_ipm_identifier (tvb, pinfo, message_tree, offset, TRUE);
+      }
+      if (dmp.subj_id) {
+        tf = proto_tree_add_uint (message_tree, hf_message_subj_id, tvb, offset, 0, dmp.subj_id);
+        proto_item_set_generated (tf);
+        hidden_item = proto_tree_add_uint (message_tree, hf_dmp_id, tvb, offset, 0, dmp.subj_id);
+        proto_item_set_generated (hidden_item);
+        proto_item_set_hidden (hidden_item);
+      }
+    }
+  }
+
+  if (use_seq_ack_analysis) {
+    register_dmp_id (pinfo, 0);
+  }
+
+  proto_item_set_len (en, offset - boffset);
+
+  if  (dmp.msg_type == STANAG || dmp.msg_type == IPM) {
+    /* User Data */
+    offset = dissect_dmp_message (tvb, pinfo, dmp_tree, offset);
+  } else if (dmp.msg_type == REPORT) {
+    /* One or more Delivery Report or Non-Delivery Report Data */
+    rep_len = tvb_reported_length (tvb);
+    if (dmp.checksum) {
+      rep_len -= 2;
+    }
+    while (offset < rep_len) {
+      offset = dissect_dmp_report (tvb, pinfo, dmp_tree, offset, &prev_rec_no, rep_no++);
+    }
+  } else if (dmp.msg_type == NOTIF) {
+    /* Notification Data */
+    offset = dissect_dmp_notification (tvb, pinfo, dmp_tree, offset);
+  }
+
+  return offset;
+}
+
+static gint dissect_dmp_extensions (tvbuff_t *tvb, packet_info *pinfo _U_,
+                                    proto_tree *dmp_tree, gint offset)
+{
+  proto_tree *exts_tree, *ext_tree, *hdr_tree;
+  proto_item *exts_item, *en;
+  guint8      ext_hdr, ext_length;
+  gboolean    more_extensions = TRUE;
+  gint        num_ext = 0, boffset = offset;
+
+  exts_item = proto_tree_add_item (dmp_tree, hf_extensions, tvb, offset, -1, ENC_NA);
+  exts_tree = proto_item_add_subtree (exts_item, ett_extensions);
+
+  while (more_extensions) {
+    /* Extensions Present */
+    ext_hdr = tvb_get_guint8 (tvb, offset);
+    more_extensions = (ext_hdr & 0x80);
+    ext_length = (ext_hdr & 0x7F) + 1;
+
+    en = proto_tree_add_none_format (exts_tree, hf_extension, tvb, offset, ext_length + 1,
+                                     "Extension (#%d)", num_ext + 1);
+    ext_tree = proto_item_add_subtree (en, ett_extension);
+
+    en = proto_tree_add_none_format (ext_tree, hf_extension_header, tvb, offset, 1,
+                                     "Extension Length: %u, More %s", ext_length,
+                                     (ext_hdr & 0x80) ? "Present" : "Not present");
+    hdr_tree = proto_item_add_subtree (en, ett_extension_header);
+    proto_tree_add_item (hdr_tree, hf_extension_more, tvb, offset, 1, ENC_BIG_ENDIAN);
+    proto_tree_add_item (hdr_tree, hf_extension_length, tvb, offset, 1, ENC_BIG_ENDIAN);
+    offset += 1;
+
+    proto_tree_add_item (ext_tree, hf_extension_data, tvb, offset, ext_length, ENC_NA);
+    offset += ext_length;
+    num_ext++;
+  }
+
+  proto_item_append_text (exts_item, " (%d item%s)", num_ext, plurality (num_ext, "", "s"));
+  proto_item_set_len (exts_item, offset - boffset);
+
+  return offset;
+}
+
+static int dissect_dmp (tvbuff_t *tvb, packet_info *pinfo,
+                         proto_tree *tree, void *data _U_)
+{
+  proto_tree *dmp_tree;
+  proto_item *ti;
+  guint16     checksum1 = 0, checksum2 = 1;
+  gint        length, offset = 0;
+  gboolean    retrans_or_dup_ack = FALSE;
+
+  col_set_str (pinfo->cinfo, COL_PROTOCOL, "DMP");
+  col_clear (pinfo->cinfo, COL_INFO);
+
+  /* Initialize global data structure */
+  memset (&dmp, 0, sizeof (dmp));
+
+  ti = proto_tree_add_item (tree, proto_dmp, tvb, offset, -1, ENC_NA);
+  dmp_tree = proto_item_add_subtree (ti, ett_dmp);
+
+  offset = dissect_dmp_envelope (tvb, pinfo, dmp_tree, offset);
+
+  if (dmp.version > DMP_VERSION_2) {
+    /* Unsupported DMP Version, no point to continue */
+    col_add_fstr (pinfo->cinfo, COL_INFO, "Unsupported Version: %d", dmp.version);
+    return 0;
+  }
+
+  if (dmp.extensions) {
+    offset = dissect_dmp_extensions (tvb, pinfo, dmp_tree, offset);
+  }
+
+  if ((dmp.msg_type == STANAG) || (dmp.msg_type == IPM) ||
+      (dmp.msg_type == REPORT) || (dmp.msg_type == NOTIF))
+  {
+    offset = dissect_dmp_content (tvb, pinfo, dmp_tree, offset);
+  } else if (dmp.msg_type == ACK) {
+    offset = dissect_dmp_ack (tvb, pinfo, dmp_tree, offset);
+  }
+
+  if (dmp.checksum) {
+    length = tvb_captured_length (tvb);
+    checksum1 = crc16_x25_ccitt_tvb (tvb, length - 2);
+    checksum2 = tvb_get_ntohs (tvb, offset);
+
+    proto_tree_add_checksum(dmp_tree, tvb, offset, hf_checksum, hf_checksum_status, &ei_checksum_bad, pinfo, checksum1, ENC_BIG_ENDIAN, PROTO_CHECKSUM_VERIFY);
+    offset += 2;
+  }
+
+  if (use_seq_ack_analysis) {
+    dmp_add_seq_ack_analysis (tvb, pinfo, dmp_tree, offset);
+  }
+
+  if (((dmp.msg_type == STANAG) || (dmp.msg_type == IPM) ||
+       (dmp.msg_type == REPORT) || (dmp.msg_type == NOTIF)) &&
+      dmp.id_val && dmp.id_val->msg_resend_count)
+  {
+    guint retrans_num;
+    if (dmp.msg_type == REPORT) {
+      retrans_num = dmp.id_val->rep_id;
+    } else if (dmp.msg_type == NOTIF) {
+      retrans_num = dmp.id_val->not_id;
+    } else {
+      retrans_num = dmp.id_val->msg_id;
+    }
+    col_append_fstr (pinfo->cinfo, COL_INFO, "[Retrans %d#%d] ",
+                     retrans_num, dmp.id_val->msg_resend_count);
+    retrans_or_dup_ack = TRUE;
+  } else if (dmp.msg_type == ACK && dmp.id_val && dmp.id_val->ack_resend_count) {
+    col_append_fstr (pinfo->cinfo, COL_INFO, "[Dup ACK %d#%d] ",
+                     dmp.id_val->ack_id, dmp.id_val->ack_resend_count);
+    retrans_or_dup_ack = TRUE;
+  }
+  if (dmp_align && !retrans_or_dup_ack) {
+    if (dmp.msg_type == ACK) {
+      /* ACK does not have "Msg Id" */
+      col_append_fstr (pinfo->cinfo, COL_INFO, "%-45.45s", msg_type_to_str ());
+    } else {
+      col_append_fstr (pinfo->cinfo, COL_INFO, "%-31.31s", msg_type_to_str ());
+    }
+  } else {
+    col_append_str (pinfo->cinfo, COL_INFO, msg_type_to_str ());
+  }
+  if ((dmp.msg_type == STANAG) || (dmp.msg_type == IPM) ||
+      (dmp.msg_type == REPORT) || (dmp.msg_type == NOTIF))
+  {
+    if (dmp_align && !retrans_or_dup_ack) {
+      col_append_fstr (pinfo->cinfo, COL_INFO, " Msg Id: %5d", dmp.msg_id);
+    } else {
+      col_append_fstr (pinfo->cinfo, COL_INFO, ", Msg Id: %d", dmp.msg_id);
+    }
+  }
+  if ((dmp.msg_type == REPORT) || (dmp.msg_type == NOTIF) ||
+      (dmp.msg_type == ACK))
+  {
+    if (dmp_align && !retrans_or_dup_ack) {
+      col_append_fstr (pinfo->cinfo, COL_INFO, "  Subj Id: %5d",
+                       dmp.subj_id);
+    } else {
+      col_append_fstr (pinfo->cinfo, COL_INFO, ", Subj Id: %d",
+                       dmp.subj_id);
+    }
+  }
+  if (dmp.checksum && (checksum1 != checksum2)) {
+    col_append_str (pinfo->cinfo, COL_INFO, ", Checksum incorrect");
+  }
+
+  proto_item_append_text (ti, ", Version: %d%s, %s", dmp.version,
+                          (dmp.prot_id == PROT_NAT ? " (national)" : ""),
+                          msg_type_to_str());
+
+  return offset;
+}
+
+void proto_register_dmp (void)
+{
+  static hf_register_info hf[] = {
+    /*
+    ** DMP Identifier
+    */
+    { &hf_dmp_id,
+      { "DMP Identifier", "dmp.id", FT_UINT16, BASE_DEC,
+        NULL, 0x0, NULL, HFILL} },
+
+    /* MTS Identifier */
+    { &hf_mts_id,
+      { "MTS Identifier", "dmp.mts", FT_STRING, BASE_NONE,
+        NULL, 0x0, NULL, HFILL } },
+
+    /* IPM Identifier */
+    { &hf_ipm_id,
+      { "IPM Identifier", "dmp.ipm", FT_STRING, BASE_NONE,
+        NULL, 0x0, NULL, HFILL } },
+
+    /*
+    ** Envelope
+    */
+    { &hf_envelope,
+      { "Envelope", "dmp.envelope", FT_NONE, BASE_NONE,
+        NULL, 0x0, NULL, HFILL} },
+
+    /* Protocol data */
+    { &hf_envelope_protocol_id,
+      { "Protocol Identifier", "dmp.protocol_id", FT_UINT8,
+        BASE_HEX, NULL, 0xF8, NULL, HFILL} },
+    { &hf_envelope_version,
+      { "Protocol Version", "dmp.version", FT_UINT8, BASE_DEC,
+        VALS(version_vals), 0x07, NULL, HFILL } },
+    { &hf_envelope_version_value,
+      { "Protocol Version", "dmp.version_value", FT_UINT8, BASE_DEC,
+        VALS(version_vals), 0x07, NULL, HFILL } },
+
+    /* Envelope elements (byte 1) */
+    { &hf_envelope_hop_count,
+      { "Hop Count", "dmp.hop_count", FT_UINT8, BASE_DEC,
+        NULL, 0xE0, NULL, HFILL } },
+    { &hf_envelope_hop_count_value,
+      { "Hop Count", "dmp.hop_count_value", FT_UINT8, BASE_DEC,
+        NULL, 0xE0, NULL, HFILL } },
+    { &hf_envelope_rec_present,
+      { "Recipient Present", "dmp.rec_present", FT_BOOLEAN, 8,
+        TFS (&tfs_present_absent), 0x20, NULL, HFILL } },
+    { &hf_envelope_addr_enc,
+      { "Address Encoding", "dmp.addr_encoding", FT_BOOLEAN, 8,
+        TFS (&addr_enc), 0x10, NULL, HFILL } },
+    { &hf_envelope_checksum,
+      { "Checksum", "dmp.checksum_used", FT_BOOLEAN, 8,
+        TFS (&tfs_used_notused), 0x08, "Checksum Used", HFILL } },
+    { &hf_envelope_type,
+      { "Content Type", "dmp.content_type", FT_UINT8, BASE_DEC,
+        VALS(type_vals), 0x07, NULL, HFILL } },
+
+    /* Envelope elements (byte 2) */
+    { &hf_envelope_extensions,
+      { "Extensions", "dmp.extensions_used", FT_BOOLEAN, 8,
+        TFS (&tfs_present_absent), 0x80, "Extensions Used", HFILL } },
+    { &hf_envelope_msg_id_type,
+      { "Message Identifier Type", "dmp.msg_id_type", FT_UINT8, BASE_DEC,
+        VALS(msg_id_type_vals), 0x60, NULL, HFILL } },
+    { &hf_envelope_msg_id_length,
+      { "Message Identifier Length", "dmp.msg_id_short", FT_UINT8, BASE_DEC,
+        VALS(msg_id_length_vals), 0x10, NULL, HFILL} },
+    { &hf_envelope_mts_id_length,
+      { "MTS Identifier Length", "dmp.mts_id_length", FT_UINT8, BASE_DEC,
+        NULL, 0x1F, NULL, HFILL } },
+    { &hf_envelope_ipm_id_modifier,
+      { "IPM Identifier Modifier", "dmp.ipm_id_modifier", FT_UINT8, BASE_DEC,
+        VALS(ipm_id_modifier), 0xC0, NULL, HFILL } },
+    { &hf_envelope_ipm_id_length,
+      { "IPM Identifier Length", "dmp.ipm_id_length", FT_UINT8, BASE_DEC,
+        NULL, 0x3F, NULL, HFILL } },
+
+    { &hf_thales_ipm_id_modifier,
+      { "IPM Identifier Modifier", "dmp.ipm_id_modifier", FT_UINT8, BASE_DEC,
+        VALS(thales_ipm_id_modifier), 0xC0, "Thales XOmail IPM Identifier Modifier", HFILL } },
+
+    /* Message identifier */
+    { &hf_envelope_msg_id,
+      { "Message Identifier", "dmp.msg_id", FT_UINT16, BASE_DEC,
+        NULL, 0x0, NULL, HFILL} },
+    { &hf_envelope_msg_id_12bit,
+      { "Message Identifier", "dmp.msg_id", FT_UINT16, BASE_DEC,
+        NULL, 0x0FFF, NULL, HFILL} },
+
+    /* MTS Identifier */
+    { &hf_envelope_mts_id,
+      { "MTS Identifier", "dmp.mts_id", FT_STRING, BASE_NONE,
+        NULL, 0x0, NULL, HFILL } },
+
+    /* IPM Identifier */
+    { &hf_envelope_ipm_id,
+      { "IPM Identifier", "dmp.ipm_id", FT_STRING, BASE_NONE,
+        NULL, 0x0, NULL, HFILL } },
+
+    /* Extensions */
+    { &hf_extensions,
+      { "Extensions", "dmp.extensions", FT_NONE, BASE_NONE,
+        NULL, 0x0, NULL, HFILL} },
+    { &hf_extension,
+      { "Extension", "dmp.extension", FT_NONE, BASE_NONE,
+        NULL, 0x0, NULL, HFILL } },
+    { &hf_extension_header,
+      { "Extension Header", "dmp.extension_header", FT_NONE, BASE_NONE,
+        NULL, 0x0, NULL, HFILL} },
+    { &hf_extension_more,
+      { "More Extensions", "dmp.extension_more", FT_BOOLEAN, 8,
+        TFS (&tfs_present_absent), 0x80, NULL, HFILL } },
+    { &hf_extension_length,
+      { "Extension Length (minus one)", "dmp.extension_length", FT_UINT8, BASE_DEC,
+        NULL, 0x7F, "Extension Length minus one", HFILL } },
+    { &hf_extension_data,
+      { "Extension Data", "dmp.extension_data", FT_BYTES, BASE_NONE,
+        NULL, 0x0, NULL, HFILL } },
+
+    /* Submission time */
+    { &hf_envelope_subm_time,
+      { "Submission Time", "dmp.subm_time", FT_UINT16, BASE_HEX,
+        NULL, 0x0, NULL, HFILL } },
+    { &hf_envelope_time_diff_present,
+      { "Time Diff", "dmp.time_diff_present", FT_BOOLEAN, 16,
+        TFS (&tfs_present_absent), 0x8000, "Time Diff Present", HFILL } },
+    { &hf_envelope_subm_time_value,
+      { "Submission Time Value", "dmp.subm_time_value", FT_UINT16,
+        BASE_HEX, NULL, 0x7FFF, NULL, HFILL } },
+    { &hf_envelope_time_diff,
+      { "Time Difference", "dmp.time_diff", FT_UINT8, BASE_HEX,
+        NULL, 0x0, NULL, HFILL } },
+    { &hf_envelope_time_diff_value,
+      { "Time Difference Value", "dmp.time_diff_value", FT_UINT8,
+        BASE_HEX, NULL, 0x0, NULL, HFILL } },
+
+    /* Envelope flags */
+    { &hf_envelope_flags,
+      { "Flags", "dmp.envelope_flags", FT_UINT8, BASE_DEC,
+        NULL, 0x0, "Envelope Flags", HFILL} },
+    { &hf_envelope_content_id_discarded,
+      { "Content Identifier discarded", "dmp.cont_id_discarded",
+        FT_BOOLEAN, 8, TFS(&tfs_yes_no), 0x80,
+        NULL, HFILL } },
+    { &hf_envelope_recip_reassign_prohib,
+      { "Recipient reassign prohibited","dmp.recip_reassign_prohib",
+        FT_BOOLEAN, 8, TFS(&tfs_yes_no), 0x40,
+        NULL, HFILL } },
+    { &hf_envelope_dl_expansion_prohib,
+      { "DL expansion prohibited", "dmp.dl_expansion_prohib",
+        FT_BOOLEAN, 8, TFS(&tfs_yes_no), 0x20, NULL,
+        HFILL } },
+
+    /* Recipient Count */
+    { &hf_envelope_recipients,
+      { "Recipient Count", "dmp.rec_count", FT_UINT8, BASE_DEC,
+        NULL, 0x1F, NULL, HFILL} },
+    { &hf_envelope_ext_recipients,
+      { "Extended Recipient Count", "dmp.ext_rec_count", FT_UINT16,
+        BASE_DEC, NULL, 0x7FFF, NULL, HFILL} },
+
+    /*
+    ** Address
+    */
+    { &hf_addr_recipient,
+      { "Recipient Number", "dmp.recipient", FT_NONE, BASE_NONE,
+        NULL, 0x0, "Recipient", HFILL } },
+    { &hf_addr_originator,
+      { "Originator", "dmp.originator", FT_NONE, BASE_NONE,
+        NULL, 0x0, NULL, HFILL } },
+    { &hf_addr_reporting_name,
+      { "Reporting Name Number", "dmp.reporting_name", FT_NONE,
+        BASE_NONE, NULL, 0x0, "Reporting Name", HFILL } },
+    { &hf_addr_dl_expanded,
+      { "DL Expanded", "dmp.dl_expanded", FT_BOOLEAN, BASE_NONE,
+        NULL, 0x0, "Message has been DL expanded", HFILL } },
+    { &hf_addr_int_rec,
+      { "Intended Recipient", "dmp.int_rec", FT_BOOLEAN, BASE_NONE,
+        NULL, 0x0, "Message has an intended recipient", HFILL } },
+
+    /*
+    ** Address Direct
+    */
+    { &hf_addr_dir_addr_ext,
+      { "Address Extended", "dmp.addr_ext", FT_BOOLEAN, 8,
+        NULL, 0x80, NULL, HFILL } },
+    { &hf_addr_dir_rec_no,
+      { "Recipient Number Offset", "dmp.rec_no_offset", FT_UINT8,
+        BASE_DEC, NULL, 0xF0, NULL, HFILL } },
+    { &hf_addr_dir_rec_no_generated,
+      { "Recipient Number", "dmp.rec_no", FT_UINT32,
+        BASE_DEC, NULL, 0x0, "Recipient Number Offset", HFILL } },
+    { &hf_addr_dir_rec_no1,
+      { "Recipient Number (bits 3-0)", "dmp.rec_no_offset1", FT_UINT8,
+        BASE_DEC, NULL, 0xF0, "Recipient Number (bits 3-0) Offset", HFILL } },
+    { &hf_addr_dir_rec_no2,
+      { "Recipient Number (bits 9-4)", "dmp.rec_no_offset2", FT_UINT8,
+        BASE_DEC, NULL, 0x3F, "Recipient Number (bits 9-4) Offset", HFILL } },
+    { &hf_addr_dir_rec_no3,
+      { "Recipient Number (bits 14-10)", "dmp.rec_no_offset3", FT_UINT8,
+        BASE_DEC, NULL, 0x1F, "Recipient Number (bits 14-10) Offset",HFILL } },
+    { &hf_addr_dir_rep_req1,
+      { "Report Request", "dmp.rep_rec", FT_UINT8, BASE_HEX,
+        VALS (report_vals_ext), 0x0C, NULL, HFILL } },
+    { &hf_addr_dir_rep_req2,
+      { "Report Request", "dmp.rep_rec", FT_UINT8, BASE_HEX,
+        VALS (report_vals_ext), 0xC0, NULL, HFILL } },
+    { &hf_addr_dir_rep_req3,
+      { "Report Request", "dmp.rep_rec", FT_UINT8, BASE_HEX,
+        VALS (report_vals), 0xC0, NULL, HFILL } },
+    { &hf_addr_dir_not_req1,
+      { "Notification Request", "dmp.not_req", FT_UINT8, BASE_HEX,
+        VALS (notif_vals_ext), 0x03, NULL, HFILL } },
+    { &hf_addr_dir_not_req2,
+      { "Notification Request", "dmp.not_req", FT_UINT8, BASE_HEX,
+        VALS (notif_vals_ext), 0xC0, NULL, HFILL } },
+    { &hf_addr_dir_not_req3,
+      { "Notification Request", "dmp.not_req", FT_UINT8, BASE_HEX,
+        VALS (notif_vals), 0xC0, NULL, HFILL } },
+    { &hf_addr_dir_action,
+      { "Action", "dmp.action", FT_BOOLEAN, 8,
+        TFS (&tfs_yes_no), 0x80, NULL, HFILL } },
+    { &hf_addr_dir_address,
+      { "Direct Address", "dmp.direct_addr", FT_UINT8,
+        BASE_DEC, NULL, 0x7F, NULL, HFILL } },
+    { &hf_addr_dir_address_generated,
+      { "Direct Address", "dmp.direct_addr", FT_UINT32,
+        BASE_DEC, NULL, 0x0, NULL, HFILL } },
+    { &hf_addr_dir_address1,
+      { "Direct Address (bits 6-0)", "dmp.direct_addr1", FT_UINT8,
+        BASE_DEC, NULL, 0x7F, NULL, HFILL } },
+    { &hf_addr_dir_address2,
+      { "Direct Address (bits 12-7)", "dmp.direct_addr2", FT_UINT8,
+        BASE_DEC, NULL, 0x3F, NULL, HFILL } },
+    { &hf_addr_dir_address3,
+      { "Direct Address (bits 18-13)", "dmp.direct_addr3", FT_UINT8,
+        BASE_DEC, NULL, 0x3F, NULL, HFILL } },
+
+    /*
+    ** Address Extended
+    */
+    { &hf_addr_ext_form,
+      { "Address Form", "dmp.addr_form", FT_UINT8, BASE_DEC,
+        VALS (addr_form), 0xE0, NULL, HFILL } },
+    { &hf_addr_ext_form_orig_v1,
+      { "Address Form", "dmp.addr_form", FT_UINT8, BASE_DEC,
+        VALS (addr_form_orig_v1), 0xE0, NULL, HFILL } },
+    { &hf_addr_ext_form_orig,
+      { "Address Form", "dmp.addr_form", FT_UINT8, BASE_DEC,
+        VALS (addr_form_orig), 0xE0, NULL, HFILL } },
+    { &hf_addr_ext_action,
+      { "Action", "dmp.action", FT_BOOLEAN, 8,
+        TFS (&tfs_yes_no), 0x10, NULL, HFILL } },
+    { &hf_addr_ext_rep_req,
+      { "Report Request", "dmp.rep_rec", FT_UINT8, BASE_HEX,
+        VALS (report_vals), 0x0C, NULL, HFILL } },
+    { &hf_addr_ext_not_req,
+      { "Notification Request", "dmp.not_req", FT_UINT8, BASE_HEX,
+        VALS (notif_vals), 0x03, NULL, HFILL } },
+    { &hf_addr_ext_rec_ext,
+      { "Recipient Number Extended", "dmp.rec_no_ext", FT_BOOLEAN, 8,
+        NULL, 0x80, NULL, HFILL } },
+    { &hf_addr_ext_rec_no,
+      { "Recipient Number Offset", "dmp.rec_no_offset", FT_UINT8,
+        BASE_DEC, NULL, 0x7F, NULL, HFILL } },
+    { &hf_addr_ext_rec_no_generated,
+      { "Recipient Number", "dmp.rec_no", FT_UINT32,
+        BASE_DEC, NULL, 0x0, NULL, HFILL } },
+    { &hf_addr_ext_rec_no1,
+      { "Recipient Number (bits 6-0)", "dmp.rec_no_offset1", FT_UINT8,
+        BASE_DEC, NULL, 0x7F, "Recipient Number (bits 6-0) Offset", HFILL } },
+    { &hf_addr_ext_rec_no2,
+      { "Recipient Number (bits 14-7)", "dmp.rec_no_offset2", FT_UINT8,
+        BASE_DEC, NULL, 0x0, "Recipient Number (bits 14-7) Offset", HFILL } },
+    { &hf_addr_ext_address,
+      { "Extended Address", "dmp.addr_form_ext", FT_NONE, BASE_NONE,
+        NULL, 0x0, NULL, HFILL } },
+    { &hf_addr_ext_type,
+      { "Address Type", "dmp.addr_type", FT_UINT8, BASE_DEC,
+        VALS (ext_addr_type), 0xE0, NULL, HFILL } },
+    { &hf_addr_ext_type_ext,
+      { "Address Type Extended", "dmp.addr_type_ext", FT_UINT8,
+        BASE_DEC, VALS (ext_addr_type_ext), 0xE0, NULL,
+        HFILL } },
+    { &hf_addr_ext_length,
+      { "Address Length", "dmp.addr_length", FT_UINT8,
+        BASE_DEC, NULL, 0x1F, NULL, HFILL } },
+    { &hf_addr_ext_length_generated,
+      { "Address Length", "dmp.addr_length", FT_UINT32,
+        BASE_DEC, NULL, 0x0, NULL, HFILL } },
+    { &hf_addr_ext_length1,
+      { "Address Length (bits 4-0)", "dmp.addr_length1", FT_UINT8,
+        BASE_DEC, NULL, 0x1F, NULL, HFILL } },
+    { &hf_addr_ext_length2,
+      { "Address Length (bits 9-5)", "dmp.addr_length2", FT_UINT8,
+        BASE_DEC, NULL, 0x1F, NULL, HFILL } },
+    { &hf_addr_ext_asn1_ber,
+      { "ASN.1 BER-encoded OR-name", "dmp.or_name", FT_NONE,
+        BASE_NONE, NULL, 0x0, NULL, HFILL } },
+    { &hf_addr_ext_asn1_per,
+      { "ASN.1 PER-encoded OR-name", "dmp.asn1_per", FT_BYTES,
+        BASE_NONE, NULL, 0x0, NULL, HFILL } },
+    { &hf_addr_ext_unknown,
+      { "Unknown encoded address", "dmp.addr_unknown", FT_BYTES,
+        BASE_NONE, NULL, 0x0, NULL, HFILL } },
+
+    /*
+    ** Message content
+    */
+    { &hf_message_content,
+      { "Message Content", "dmp.message", FT_NONE, BASE_NONE,
+        NULL, 0x0, NULL, HFILL } },
+    { &hf_report_content,
+      { "Report Content", "dmp.report", FT_NONE, BASE_NONE,
+        NULL, 0x0, NULL, HFILL } },
+    { &hf_notif_content,
+      { "Notification Content", "dmp.notification", FT_NONE, BASE_NONE,
+        NULL, 0x0, NULL, HFILL } },
+
+    { &hf_message_st_type,
+      { "Message type", "dmp.msg_type", FT_UINT8, BASE_DEC,
+        VALS (message_type_vals), 0xC0, NULL, HFILL } },
+    { &hf_message_precedence,
+      { "Precedence", "dmp.precedence", FT_UINT8, BASE_DEC,
+        VALS (precedence), 0x1C, NULL, HFILL } },
+    { &hf_message_importance,
+      { "Importance", "dmp.importance", FT_UINT8, BASE_DEC,
+        VALS (importance), 0x1C, NULL, HFILL } },
+    { &hf_message_body_format,
+      { "Body format", "dmp.body_format", FT_UINT8, BASE_DEC,
+        VALS (body_format_vals), 0x03, NULL, HFILL } },
+
+    /* Security Values */
+    { &hf_message_sec_label,
+      { "Security Label", "dmp.sec_label", FT_STRING, BASE_NONE,
+        NULL, 0x0, NULL, HFILL } },
+    { &hf_message_sec_class_val,
+      { "Security Classification", "dmp.sec_class", FT_UINT8,
+        BASE_DEC, NULL, 0xE0, NULL, HFILL} },
+    { &hf_message_sec_pol,
+      { "Security Policy", "dmp.sec_pol", FT_UINT8, BASE_DEC,
+        VALS (sec_pol), 0x1C, NULL, HFILL } },
+    { &hf_message_heading_flags,
+      { "Heading Flags", "dmp.heading_flags", FT_NONE, BASE_NONE,
+        NULL, 0x0, NULL, HFILL } },
+    { &hf_message_auth_users,
+      { "Authorizing users discarded", "dmp.auth_discarded",
+        FT_BOOLEAN, 8, TFS (&tfs_yes_no), 0x02,
+        NULL, HFILL } },
+    { &hf_message_subject_disc,
+      { "Subject discarded", "dmp.subject_discarded", FT_BOOLEAN, 8,
+        TFS (&tfs_yes_no), 0x01, NULL, HFILL } },
+
+    /* National Policy Identifier */
+    { &hf_message_national_policy_id,
+      { "National Policy Identifier", "dmp.nat_pol_id", FT_UINT8,
+        BASE_DEC, VALS(nat_pol_id), 0x0, NULL,
+        HFILL } },
+
+    /* Mission Policy Identifier */
+    { &hf_message_mission_policy_id,
+      { "Mission Policy Identifier", "dmp.mission_pol_id", FT_UINT8,
+        BASE_DEC, NULL, 0x0, NULL,
+        HFILL } },
+
+    /* Security Categories */
+    { &hf_message_sec_cat_nat,
+      { "Security Categories", "dmp.sec_cat", FT_UINT8, BASE_HEX,
+        NULL, 0x0, NULL, HFILL } },
+    { &hf_message_sec_cat_val,
+      { "Security Categories", "dmp.sec_cat", FT_UINT8, BASE_HEX,
+        NULL, 0x0, NULL, HFILL } },
+    { &hf_message_sec_cat_cl,
+      { "Clear", "dmp.sec_cat.cl", FT_BOOLEAN, 8,
+        TFS (&tfs_set_notset), 0x80, NULL, HFILL } },
+    { &hf_message_sec_cat_cs,
+      { "Crypto Security", "dmp.sec_cat.cs", FT_BOOLEAN, 8,
+        TFS (&tfs_set_notset), 0x40, NULL, HFILL } },
+    { &hf_message_sec_cat_ex,
+      { "Exclusive", "dmp.sec_cat.ex", FT_BOOLEAN, 8,
+        TFS (&tfs_set_notset), 0x20, NULL, HFILL } },
+    { &hf_message_sec_cat_ne,
+      { "National Eyes Only", "dmp.sec_cat.ne", FT_BOOLEAN, 8,
+        TFS (&tfs_set_notset), 0x10, NULL, HFILL } },
+    { &hf_message_sec_cat_permissive,
+      { "Releasable to", "dmp.sec_cat.permissive", FT_UINT8, BASE_HEX,
+        VALS (nat_pol_id), 0xFC, NULL, HFILL } },
+    { &hf_message_sec_cat_country_code,
+      { "Country Code", "dmp.sec_cat.country", FT_UINT8, BASE_DEC,
+        NULL, 0x00, NULL, HFILL } },
+    { &hf_message_sec_cat_restrictive,
+      { "Restrictive", "dmp.sec_cat.restrictive", FT_UINT8, BASE_HEX,
+        NULL, 0xFC, NULL, HFILL } },
+    { &hf_message_sec_cat_extended,
+      { "Extended", "dmp.sec_cat.extended", FT_UINT8, BASE_HEX,
+        VALS (ext_sec_cat), 0x03, "Extended Security Category", HFILL } },
+    { &hf_message_sec_cat_bit0,
+      { "Bit 0", "dmp.sec_cat.bit0", FT_BOOLEAN, 8,
+        TFS (&tfs_set_notset), 0x01, NULL, HFILL } },
+    { &hf_message_sec_cat_bit1,
+      { "Bit 1", "dmp.sec_cat.bit1", FT_BOOLEAN, 8,
+        TFS (&tfs_set_notset), 0x02, NULL, HFILL } },
+    { &hf_message_sec_cat_bit2,
+      { "Bit 2", "dmp.sec_cat.bit2", FT_BOOLEAN, 8,
+        TFS (&tfs_set_notset), 0x04, NULL, HFILL } },
+    { &hf_message_sec_cat_bit3,
+      { "Bit 3", "dmp.sec_cat.bit3", FT_BOOLEAN, 8,
+        TFS (&tfs_set_notset), 0x08, NULL, HFILL } },
+    { &hf_message_sec_cat_bit4,
+      { "Bit 4", "dmp.sec_cat.bit4", FT_BOOLEAN, 8,
+        TFS (&tfs_set_notset), 0x10, NULL, HFILL } },
+    { &hf_message_sec_cat_bit5,
+      { "Bit 5", "dmp.sec_cat.bit5", FT_BOOLEAN, 8,
+        TFS (&tfs_set_notset), 0x20, NULL, HFILL } },
+    { &hf_message_sec_cat_bit6,
+      { "Bit 6", "dmp.sec_cat.bit6", FT_BOOLEAN, 8,
+        TFS (&tfs_set_notset), 0x40, NULL, HFILL } },
+    { &hf_message_sec_cat_bit7,
+      { "Bit 7", "dmp.sec_cat.bit7", FT_BOOLEAN, 8,
+        TFS (&tfs_set_notset), 0x80, NULL, HFILL } },
+
+    /* Expiry Time */
+    { &hf_message_exp_time,
+      { "Expiry Time", "dmp.expiry_time", FT_UINT8, BASE_HEX,
+        NULL, 0x0, NULL, HFILL } },
+    { &hf_message_exp_time_val,
+      { "Expiry Time Value", "dmp.expiry_time_val", FT_UINT8, BASE_HEX,
+        NULL, 0x0, NULL, HFILL } },
+
+    /* DTG */
+    { &hf_message_dtg,
+      { "DTG", "dmp.dtg", FT_UINT8, BASE_HEX,
+        NULL, 0x0, NULL, HFILL } },
+    { &hf_message_dtg_sign,
+      { "DTG in the", "dmp.dtg.sign", FT_BOOLEAN, 8, TFS (&dtg_sign),
+        0x80, "Sign", HFILL } },
+    { &hf_message_dtg_val,
+      { "DTG Value", "dmp.dtg.val", FT_UINT8, BASE_HEX, NULL,
+        0x7F, NULL, HFILL } },
+
+    /* SIC */
+    { &hf_message_sic,
+      { "SIC", "dmp.sic", FT_STRING, BASE_NONE,
+        NULL, 0x0, NULL, HFILL } },
+    { &hf_message_sic_key,
+      { "SICs", "dmp.sic_key", FT_NONE, BASE_NONE,
+        NULL, 0x0, "SIC Content", HFILL } },
+    { &hf_message_sic_key_values,
+      { "Content Byte", "dmp.sic_key.values", FT_UINT8, BASE_HEX,
+        NULL, 0x0, "SIC Content Byte", HFILL } },
+    { &hf_message_sic_key_type,
+      { "Type", "dmp.sic_key.type", FT_UINT8, BASE_HEX,
+        VALS (sic_key_type), 0xF0, "SIC Content Type", HFILL } },
+    { &hf_message_sic_key_chars,
+      { "Valid Characters", "dmp.sic_key.chars", FT_BOOLEAN, 8,
+        TFS (&sic_key_chars), 0x08, "SIC Valid Characters", HFILL } },
+    { &hf_message_sic_key_num,
+      { "Number of SICs", "dmp.sic_key.num", FT_UINT8, BASE_HEX,
+        VALS (sic_key_num), 0x07, NULL, HFILL } },
+    { &hf_message_sic_bitmap,
+      { "Length Bitmap (0 = 3 bytes, 1 = 4-8 bytes)", "dmp.sic_bitmap",
+        FT_UINT8, BASE_HEX, NULL, 0xFF, "SIC Length Bitmap", HFILL } },
+    { &hf_message_sic_bits,
+      { "Bit 7-4", "dmp.sic_bits", FT_UINT8, BASE_HEX,
+        VALS(sic_bit_vals), 0xF0, "SIC Bit 7-4, Characters [A-Z0-9] only",
+        HFILL } },
+    { &hf_message_sic_bits_any,
+      { "Bit 7-4", "dmp.sic_bits_any", FT_UINT8, BASE_HEX,
+        VALS(sic_bit_any_vals), 0xF0, "SIC Bit 7-4, Any valid characters",
+        HFILL } },
+
+    /* Subject Message Id */
+    { &hf_message_subj_id,
+      { "Subject Message Identifier", "dmp.subj_id", FT_UINT16,
+        BASE_DEC, NULL, 0x0, NULL, HFILL } },
+
+    /* Subject MTS Identifier */
+    { &hf_message_subj_mts_id,
+      { "Subject MTS Identifier", "dmp.subj_mts_id", FT_STRING, BASE_NONE,
+        NULL, 0x0, NULL, HFILL } },
+
+    /* Subject IPM Identifier */
+    { &hf_message_subj_ipm_id,
+      { "Subject IPM Identifier", "dmp.subj_ipm_id", FT_STRING, BASE_NONE,
+        NULL, 0x0, NULL, HFILL } },
+
+    /*
+    ** Message body
+    */
+    { &hf_message_body,
+      { "Message Body", "dmp.body", FT_NONE, BASE_NONE, NULL,
+        0x0, NULL, HFILL} },
+
+    /* Body Id */
+    { &hf_message_eit,
+      { "EIT", "dmp.body.eit", FT_UINT8, BASE_DEC,
+        VALS(eit_vals), 0xE0, "Encoded Information Type", HFILL } },
+    { &hf_message_compr,
+      { "Compression", "dmp.body.compression", FT_UINT8, BASE_DEC,
+        VALS(compression_vals), 0x18, NULL, HFILL } },
+
+    /* Subject */
+    { &hf_message_subject,
+      { "Subject", "dmp.subject", FT_STRINGZ, BASE_NONE,
+        NULL, 0x0, NULL, HFILL } },
+
+    /* Message Body */
+    { &hf_message_body_data,
+      { "User data", "dmp.body.data", FT_BYTES, BASE_NONE,
+        NULL, 0x0, NULL, HFILL } },
+    { &hf_message_body_compressed,
+      { "Compressed User data", "dmp.body.compressed", FT_NONE, BASE_NONE,
+        NULL, 0x0, NULL, HFILL } },
+    { &hf_message_body_plain,
+      { "Message Body", "dmp.body.plain", FT_STRING, BASE_NONE,
+        NULL, 0x0, NULL, HFILL } },
+    { &hf_message_body_structured,
+      { "Structured Body", "dmp.body.structured", FT_BYTES, BASE_NONE,
+        NULL, 0x0, NULL, HFILL } },
+
+    /*
+    ** Report
+    */
+    { &hf_delivery_report,
+      { "Delivery Report", "dmp.dr", FT_NONE, BASE_NONE, NULL,
+        0x0, NULL, HFILL} },
+    { &hf_non_delivery_report,
+      { "Non-Delivery Report", "dmp.ndr", FT_NONE, BASE_NONE, NULL,
+        0x0, NULL, HFILL} },
+
+    { &hf_report_type,
+      { "Report Type", "dmp.report_type", FT_BOOLEAN, 8,
+        TFS (&report_type), 0x80, NULL, HFILL } },
+    { &hf_report_info_present_dr,
+      { "Info Present", "dmp.info_present", FT_BOOLEAN, 8,
+        TFS (&tfs_present_absent), 0x40, NULL, HFILL } },
+    { &hf_report_addr_enc_dr,
+      { "Address Encoding", "dmp.addr_encoding", FT_BOOLEAN, 8,
+        TFS (&addr_enc), 0x20, NULL, HFILL } },
+    { &hf_report_del_time,
+      { "Delivery Time", "dmp.delivery_time", FT_UINT8, BASE_HEX,
+        NULL, 0x0, NULL, HFILL } },
+    { &hf_report_del_time_val,
+      { "Delivery Time Value", "dmp.delivery_time_val", FT_UINT8,
+        BASE_HEX, NULL, 0x0, NULL, HFILL } },
+    { &hf_report_addr_enc_ndr,
+      { "Address Encoding", "dmp.addr_encoding", FT_BOOLEAN, 8,
+        TFS (&addr_enc), 0x40, NULL, HFILL } },
+    { &hf_report_reason,
+      { "Reason (P1)", "dmp.report_reason", FT_UINT8, BASE_DEC,
+        VALS (p1_NonDeliveryReasonCode_vals), 0x3F,
+        "Reason", HFILL } },
+    { &hf_report_info_present_ndr,
+      { "Info Present", "dmp.info_present", FT_BOOLEAN, 8,
+        TFS (&tfs_present_absent), 0x80, NULL, HFILL } },
+    { &hf_report_diagn,
+      { "Diagnostic (P1)", "dmp.report_diagnostic", FT_UINT8, BASE_DEC,
+        VALS (p1_NonDeliveryDiagnosticCode_vals), 0x7F,
+        "Diagnostic", HFILL } },
+    { &hf_report_suppl_info_len,
+      { "Supplementary Information", "dmp.suppl_info_len", FT_UINT8,
+        BASE_DEC, NULL, 0x0, "Supplementary Information Length", HFILL } },
+    { &hf_report_suppl_info,
+      { "Supplementary Information", "dmp.suppl_info", FT_STRINGZ,
+        BASE_NONE, NULL, 0x0, NULL, HFILL } },
+
+    /*
+    ** Notification
+    */
+    { &hf_receipt_notif,
+      { "Receipt Notification (RN)", "dmp.rn", FT_NONE, BASE_NONE,
+        NULL, 0x0, NULL, HFILL} },
+    { &hf_non_receipt_notif,
+      { "Non-Receipt Notification (NRN)", "dmp.nrn", FT_NONE, BASE_NONE,
+        NULL, 0x0, NULL, HFILL} },
+    { &hf_other_notif,
+      { "Other Notification (ON)", "dmp.on", FT_NONE, BASE_NONE,
+        NULL, 0x0, NULL, HFILL} },
+
+    { &hf_notif_type,
+      { "Notification Type", "dmp.notif_type", FT_UINT8, BASE_DEC,
+        VALS (notif_type), 0x03, NULL, HFILL } },
+    { &hf_notif_rec_time,
+      { "Receipt Time", "dmp.receipt_time", FT_UINT8, BASE_HEX,
+        NULL, 0x0, NULL, HFILL } },
+    { &hf_notif_rec_time_val,
+      { "Receipt Time Value", "dmp.receipt_time_val", FT_UINT8,
+        BASE_HEX, NULL, 0x0, NULL, HFILL } },
+    { &hf_notif_suppl_info_len,
+      { "Supplementary Information", "dmp.suppl_info_len",
+        FT_UINT8, BASE_DEC, NULL, 0x0, "Supplementary Information Length",
+        HFILL } },
+    { &hf_notif_suppl_info,
+      { "Supplementary Information", "dmp.suppl_info",
+        FT_STRINGZ, BASE_NONE, NULL, 0x0, NULL,
+        HFILL } },
+    { &hf_notif_non_rec_reason,
+      { "Non-Receipt Reason", "dmp.notif_non_rec_reason",
+        FT_UINT8, BASE_DEC, VALS (p22_NonReceiptReasonField_vals), 0x0,
+        NULL, HFILL } },
+    { &hf_notif_discard_reason,
+      { "Discard Reason", "dmp.notif_discard_reason", FT_UINT8,
+        BASE_DEC, VALS (p22_DiscardReasonField_vals), 0x0,
+        NULL, HFILL } },
+    { &hf_notif_on_type,
+      { "ON Type", "dmp.notif_on_type", FT_UINT8, BASE_DEC,
+        VALS (on_type), 0x0, NULL, HFILL } },
+    { &hf_notif_acp127,
+      { "ACP127 Recipient", "dmp.acp127recip_len", FT_UINT8,
+        BASE_DEC, NULL, 0x0, "ACP 127 Recipient Length", HFILL } },
+    { &hf_notif_acp127recip,
+      { "ACP127 Recipient", "dmp.acp127recip", FT_STRINGZ,
+        BASE_NONE, NULL, 0x0, "ACP 127 Recipient", HFILL } },
+
+    /*
+    ** Acknowledgement
+    */
+    { &hf_ack,
+      { "Acknowledgement", "dmp.ack", FT_NONE, BASE_NONE,
+        NULL, 0x0, NULL, HFILL } },
+    { &hf_ack_reason,
+      { "Ack Reason", "dmp.ack_reason", FT_UINT8, BASE_DEC,
+        VALS (ack_reason), 0x0, "Reason", HFILL } },
+    { &hf_ack_diagnostic,
+      { "Ack Diagnostic", "dmp.ack_diagnostic", FT_UINT8, BASE_DEC,
+        NULL, 0x0, "Diagnostic", HFILL } },
+    { &hf_ack_recips,
+      { "Recipient List", "dmp.ack_rec_list", FT_NONE, BASE_NONE,
+        NULL, 0x0, NULL, HFILL } },
+
+    /*
+    ** Checksum
+    */
+    { &hf_checksum,
+      { "Checksum", "dmp.checksum", FT_UINT16, BASE_HEX,
+        NULL, 0x0, NULL, HFILL } },
+    { &hf_checksum_status,
+      { "Checksum Status", "dmp.checksum.status", FT_UINT8, BASE_NONE,
+        VALS(proto_checksum_vals), 0x0, NULL, HFILL } },
+
+    /*
+    ** Ack matching / Resend
+    */
+    { &hf_analysis_ack_time,
+      { "Acknowledgement Time", "dmp.analysis.ack_time", FT_RELATIVE_TIME, BASE_NONE,
+        NULL, 0x0, "The time between the Message and the Acknowledge", HFILL } },
+    { &hf_analysis_rep_time,
+      { "Report Reply Time", "dmp.analysis.report_time", FT_RELATIVE_TIME, BASE_NONE,
+        NULL, 0x0, "The time between the Message and the Report", HFILL } },
+    { &hf_analysis_not_time,
+      { "Notification Reply Time", "dmp.analysis.notif_time", FT_RELATIVE_TIME, BASE_NONE,
+        NULL, 0x0, "The time between the Message and the Notification", HFILL } },
+    { &hf_analysis_total_time,
+      { "Total Time", "dmp.analysis.total_time", FT_RELATIVE_TIME, BASE_NONE,
+        NULL, 0x0, "The time between the first Message and the Acknowledge", HFILL } },
+    { &hf_analysis_retrans_time,
+      { "Retransmission Time", "dmp.analysis.retrans_time", FT_RELATIVE_TIME, BASE_NONE,
+        NULL, 0x0, "The time between the last Message and this Message", HFILL } },
+    { &hf_analysis_total_retrans_time,
+      { "Total Retransmission Time", "dmp.analysis.total_retrans_time", FT_RELATIVE_TIME, BASE_NONE,
+        NULL, 0x0, "The time between the first Message and this Message", HFILL } },
+    { &hf_analysis_msg_num,
+      { "Message in", "dmp.analysis.msg_in", FT_FRAMENUM, BASE_NONE,
+        NULL, 0x0, "This packet has a Message in this frame", HFILL } },
+    { &hf_analysis_acks_msg_num,
+      { "This is an Ack to the Message in", "dmp.analysis.acks_msg_in", FT_FRAMENUM, BASE_NONE,
+        FRAMENUM_TYPE(FT_FRAMENUM_ACK), 0x0, "This packet ACKs a Message in this frame", HFILL } },
+    { &hf_analysis_ack_num,
+      { "Acknowledgement in", "dmp.analysis.ack_in", FT_FRAMENUM, BASE_NONE,
+        NULL, 0x0, "This packet has an Acknowledgement in this frame", HFILL } },
+    { &hf_analysis_acks_rep_num,
+      { "This is an Ack to the Report in", "dmp.analysis.acks_report_in", FT_FRAMENUM, BASE_NONE,
+        FRAMENUM_TYPE(FT_FRAMENUM_ACK), 0x0, "This packet ACKs a Report in this frame", HFILL } },
+#if 0
+    { &hf_analysis_rep_num,
+      { "Report in", "dmp.analysis.report_in", FT_FRAMENUM, BASE_NONE,
+        NULL, 0x0, "This packet has a Report in this frame", HFILL } },
+    { &hf_analysis_not_num,
+      { "Notification in", "dmp.analysis.notif_in", FT_FRAMENUM, BASE_NONE,
+        NULL, 0x0, "This packet has a Notification in this frame", HFILL } },
+#endif
+    { &hf_analysis_acks_not_num,
+      { "This is an Ack to the Notification in", "dmp.analysis.acks_notif_in", FT_FRAMENUM, BASE_NONE,
+        FRAMENUM_TYPE(FT_FRAMENUM_ACK), 0x0, "This packet ACKs a Notification in this frame", HFILL } },
+    { &hf_analysis_ack_missing,
+      { "Acknowledgement missing", "dmp.analysis.ack_missing", FT_NONE, BASE_NONE,
+        NULL, 0x0, "The acknowledgement for this packet is missing", HFILL } },
+    { &hf_analysis_retrans_no,
+      { "Retransmission #", "dmp.analysis.retrans_no", FT_UINT32, BASE_DEC,
+        NULL, 0x0, "Retransmission count", HFILL } },
+    { &hf_analysis_ack_dup_no,
+      { "Duplicate ACK #", "dmp.analysis.dup_ack_no", FT_UINT32, BASE_DEC,
+        NULL, 0x0, "Duplicate Acknowledgement count", HFILL } },
+    { &hf_analysis_msg_resend_from,
+      { "Retransmission of Message sent in", "dmp.analysis.msg_first_sent_in",
+        FT_FRAMENUM, BASE_NONE,
+        NULL, 0x0, "This Message was first sent in this frame", HFILL } },
+    { &hf_analysis_rep_resend_from,
+      { "Retransmission of Report sent in", "dmp.analysis.report_first_sent_in",
+        FT_FRAMENUM, BASE_NONE,
+        NULL, 0x0, "This Report was first sent in this frame", HFILL } },
+    { &hf_analysis_not_resend_from,
+      { "Retransmission of Notification sent in", "dmp.analysis.notif_first_sent_in",
+        FT_FRAMENUM, BASE_NONE,
+        NULL, 0x0, "This Notification was first sent in this frame", HFILL } },
+    { &hf_analysis_ack_resend_from,
+      { "Retransmission of Acknowledgement sent in", "dmp.analysis.ack_first_sent_in",
+        FT_FRAMENUM, BASE_NONE,
+        NULL, 0x0, "This Acknowledgement was first sent in this frame", HFILL } },
+
+    /*
+    ** Reserved values
+    */
+    { &hf_reserved_0x01,
+      { "Reserved", "dmp.reserved", FT_UINT8, BASE_DEC,
+        NULL, 0x01, NULL, HFILL } },
+    { &hf_reserved_0x02,
+      { "Reserved", "dmp.reserved", FT_UINT8, BASE_DEC,
+        NULL, 0x02, NULL, HFILL } },
+    { &hf_reserved_0x04,
+      { "Reserved", "dmp.reserved", FT_UINT8, BASE_DEC,
+        NULL, 0x04, NULL, HFILL } },
+    { &hf_reserved_0x07,
+      { "Reserved", "dmp.reserved", FT_UINT8, BASE_DEC,
+        NULL, 0x07, NULL, HFILL } },
+    { &hf_reserved_0x08,
+      { "Reserved", "dmp.reserved", FT_UINT8, BASE_DEC,
+        NULL, 0x08, NULL, HFILL } },
+    { &hf_reserved_0x0F,
+      { "Reserved", "dmp.reserved", FT_UINT8, BASE_DEC,
+        NULL, 0x0F, NULL, HFILL } },
+    { &hf_reserved_0x1F,
+      { "Reserved", "dmp.reserved", FT_UINT8, BASE_DEC,
+        NULL, 0x1F, NULL, HFILL } },
+    { &hf_reserved_0x20,
+      { "Reserved", "dmp.reserved", FT_UINT8, BASE_DEC,
+        NULL, 0x20, NULL, HFILL } },
+    { &hf_reserved_0x40,
+      { "Reserved", "dmp.reserved", FT_UINT8, BASE_DEC,
+        NULL, 0x40, NULL, HFILL } },
+    { &hf_reserved_0xC0,
+      { "Reserved", "dmp.reserved", FT_UINT8, BASE_DEC,
+        NULL, 0xC0, NULL, HFILL } },
+    { &hf_reserved_0xE0,
+      { "Reserved", "dmp.reserved", FT_UINT8, BASE_DEC,
+        NULL, 0xE0, NULL, HFILL } },
+    { &hf_reserved_0x8000,
+      { "Reserved", "dmp.reserved", FT_UINT16, BASE_DEC,
+        NULL, 0x8000, NULL, HFILL } },
+  };
+
+  static gint *ett[] = {
+    &ett_dmp,
+    &ett_envelope,
+    &ett_envelope_version,
+    &ett_envelope_hop_count,
+    &ett_envelope_rec_present,
+    &ett_envelope_addr_enc,
+    &ett_envelope_checksum,
+    &ett_envelope_extensions,
+    &ett_envelope_msg_id_type,
+    &ett_envelope_msg_id,
+    &ett_envelope_mts_id_length,
+    &ett_envelope_ipm_id_length,
+    &ett_envelope_cont_type,
+    &ett_envelope_subm_time,
+    &ett_envelope_time_diff,
+    &ett_envelope_flags,
+    &ett_envelope_recipients,
+    &ett_envelope_ext_recipients,
+    &ett_envelope_addresses,
+    &ett_address,
+    &ett_address_direct,
+    &ett_address_rec_no,
+    &ett_address_extended,
+    &ett_address_ext_form,
+    &ett_address_ext_rec_no,
+    &ett_address_ext_action,
+    &ett_address_ext_rep_req,
+    &ett_address_ext_not_req,
+    &ett_address_ext_type,
+    &ett_address_ext_length,
+    &ett_extensions,
+    &ett_extension,
+    &ett_extension_header,
+    &ett_content,
+    &ett_message,
+    &ett_message_st_type,
+    &ett_message_reserved,
+    &ett_message_precedence,
+    &ett_message_importance,
+    &ett_message_body_format,
+    &ett_message_sec_class,
+    &ett_message_sec_pol,
+    &ett_message_sec_cat,
+    &ett_message_heading_flags,
+    &ett_message_exp_time,
+    &ett_message_dtg,
+    &ett_message_sic,
+    &ett_message_sic_key,
+    &ett_message_sic_bitmap,
+    &ett_message_sic_bits,
+    &ett_message_eit,
+    &ett_message_compr,
+    &ett_message_body_reserved,
+    &ett_message_body,
+    &ett_report,
+    &ett_report_type,
+    &ett_report_info_present_dr,
+    &ett_report_info_present_ndr,
+    &ett_report_addr_enc_dr,
+    &ett_report_addr_enc_ndr,
+    &ett_report_reserved,
+    &ett_report_del_time,
+    &ett_report_reason,
+    &ett_report_suppl_info,
+    &ett_report_diagn,
+    &ett_notif,
+    &ett_notif_type,
+    &ett_notif_rec_time,
+    &ett_notif_suppl_info,
+    &ett_notif_acp127recip,
+    &ett_ack,
+    &ett_ack_recips,
+    &ett_analysis
+  };
+
+  static ei_register_info ei[] = {
+    { &ei_reserved_value,
+      { "dmp.reserved.expert", PI_UNDECODED, PI_WARN,
+        "Reserved value", EXPFILL } },
+    { &ei_message_sic_illegal,
+      { "dmp.sic.illegal", PI_UNDECODED, PI_NOTE,
+        "Illegal SIC", EXPFILL } },
+    { &ei_analysis_ack_unexpected,
+      { "dmp.analysis.ack_unexpected", PI_SEQUENCE, PI_NOTE,
+        "Unexpected ACK", EXPFILL } },
+    { &ei_analysis_ack_missing,
+      { "dmp.analysis.ack_missing.expert", PI_SEQUENCE, PI_NOTE,
+        "Acknowledgement missing", EXPFILL } },
+    { &ei_analysis_msg_missing,
+      { "dmp.analysis.msg_missing", PI_SEQUENCE, PI_NOTE,
+        "Message missing", EXPFILL } },
+    { &ei_analysis_retrans_no,
+      { "dmp.analysis.retrans_no.expert", PI_SEQUENCE, PI_NOTE,
+        "Retransmission #", EXPFILL } },
+    { &ei_analysis_ack_dup_no,
+      { "dmp.analysis.dup_ack_no.expert", PI_SEQUENCE, PI_NOTE,
+        "Dup ACK #", EXPFILL } },
+    { &ei_addr_dir_rec_no_generated,
+      { "dmp.rec_no.expert", PI_MALFORMED, PI_WARN,
+        "Recipient number too big", EXPFILL } },
+    { &ei_addr_ext_rec_no_generated,
+      { "dmp.rec_no.expert", PI_MALFORMED, PI_WARN,
+        "Recipient number too big", EXPFILL } },
+    { &ei_ack_reason,
+      { "dmp.ack_reason.expert", PI_RESPONSE_CODE, PI_NOTE,
+        "ACK reason: %s", EXPFILL } },
+    { &ei_envelope_version_value,
+      { "dmp.version_value.unsupported", PI_UNDECODED, PI_ERROR,
+        "Unsupported DMP Version", EXPFILL } },
+    { &ei_envelope_msg_id,
+      { "dmp.msg_id.short_id", PI_PROTOCOL, PI_NOTE,
+        "Id < 4096 - should use ShortId", EXPFILL } },
+    { &ei_7bit_string_unused_bits,
+      { "dmp.7bit_string.unused_bits", PI_PROTOCOL, PI_WARN,
+        "Unused bits in last byte shall be null", EXPFILL } },
+    { &ei_message_compr,
+      { "dmp.body.compression.unknown", PI_UNDECODED, PI_WARN,
+        "Unknown compression algorithm", EXPFILL } },
+    { &ei_message_body_uncompress,
+      { "dmp.body.uncompress.fail", PI_UNDECODED, PI_WARN,
+        "Error: Unable to uncompress content", EXPFILL } },
+    { &ei_checksum_bad,
+      { "dmp.checksum_bad.expert", PI_CHECKSUM, PI_WARN,
+        "Bad checksum", EXPFILL } },
+    { &ei_too_many_sec_cat,
+      { "dmp.too_many_security_categories", PI_PROTOCOL, PI_ERROR,
+        "Too many security categories", EXPFILL } },
+  };
+
+  static uat_field_t attributes_flds[] = {
+    UAT_FLD_VS(dmp_security_class,nation, "Nation", nat_pol_id, 0),
+    UAT_FLD_DEC(dmp_security_class,sec_class, "Classification", "Security Classification"),
+    UAT_FLD_CSTRING(dmp_security_class,name, "Name", "Classification Name"),
+    UAT_END_FIELDS
+  };
+
+  uat_t *attributes_uat = uat_new("DMP Security Classifications",
+                                  sizeof(dmp_security_class_t),
+                                  "dmp_security_classifications",
+                                  TRUE,
+                                  &dmp_security_classes,
+                                  &num_dmp_security_classes,
+                                  UAT_AFFECTS_DISSECTION, /* affects dissection of packets, but not set of named fields */
+                                  "ChDMPSecurityClassifications",
+                                  dmp_class_copy_cb,
+                                  NULL,
+                                  dmp_class_free_cb,
+                                  NULL,
+                                  NULL,
+                                  attributes_flds);
+
+  module_t *dmp_module;
+  expert_module_t* expert_dmp;
+
+  proto_dmp = proto_register_protocol (PNAME, PSNAME, PFNAME);
+
+  dmp_handle = register_dissector(PFNAME, dissect_dmp, proto_dmp);
+
+  proto_register_field_array (proto_dmp, hf, array_length (hf));
+  proto_register_subtree_array (ett, array_length (ett));
+  expert_dmp = expert_register_protocol(proto_dmp);
+  expert_register_field_array(expert_dmp, ei, array_length(ei));
+
+  dmp_id_hash_table = wmem_map_new_autoreset(wmem_epan_scope(), wmem_file_scope(), dmp_id_hash, dmp_id_hash_equal);
+  dmp_long_id_hash_table = wmem_map_new_autoreset(wmem_epan_scope(), wmem_file_scope(), wmem_str_hash, g_str_equal);
+
+  /* Build national values */
+  build_national_strings ();
+
+  /* Register our configuration options */
+  dmp_module = prefs_register_protocol (proto_dmp, NULL);
+
+  prefs_register_obsolete_preference (dmp_module, "udp_port");
+  prefs_register_obsolete_preference (dmp_module, "udp_port_second");
+
+  prefs_register_enum_preference (dmp_module, "national_decode",
+                                  "National decoding",
+                                  "Select the type of decoding for nationally-defined values",
+                                  &dmp_nat_decode, national_decoding,
+                                  FALSE);
+  prefs_register_enum_preference (dmp_module, "local_nation",
+                                  "Nation of local server",
+                                  "Select the nation of sending server.  This is used when presenting"
+                                  " security classification values in messages with security"
+                                  " policy set to National (nation of local server)",
+                                  &dmp_local_nation, dmp_national_values,
+                                  FALSE);
+  prefs_register_uat_preference (dmp_module, "classes_table",
+                                 "National Security Classifications",
+                                 "Translation table for national security classifications.  This is used"
+                                 " when presenting security classification values in messages with"
+                                 " security policy set to National or Extended National",
+                                 attributes_uat);
+  prefs_register_bool_preference (dmp_module, "seq_ack_analysis",
+                                  "SEQ/ACK Analysis",
+                                  "Calculate sequence/acknowledgement analysis",
+                                  &use_seq_ack_analysis);
+  prefs_register_bool_preference (dmp_module, "align_ids",
+                                  "Align identifiers in info list",
+                                  "Align identifiers in info list"
+                                  " (does not align when retransmission or"
+                                  " duplicate acknowledgement indication)",
+                                  &dmp_align);
+  prefs_register_obsolete_preference(dmp_module, "subject_as_id");
+  prefs_register_obsolete_preference(dmp_module, "struct_print");
+  prefs_register_obsolete_preference(dmp_module, "struct_offset");
+  prefs_register_obsolete_preference(dmp_module, "struct_length");
+}
+
+void proto_reg_handoff_dmp (void)
+{
+  dissector_add_uint ("s5066sis.ctl.appid", S5066_CLIENT_S4406_ANNEX_E_TMI_4_DMP, dmp_handle);
+  dissector_add_uint_range_with_preference("udp.port", DEFAULT_DMP_PORT_RANGE, dmp_handle);
+}
+
+/*
+ * Editor modelines
+ *
+ * Local Variables:
+ * c-basic-offset: 2
+ * tab-width: 8
+ * indent-tabs-mode: nil
+ * End:
+ *
+ * ex: set shiftwidth=2 tabstop=8 expandtab:
+ * :indentSize=2:tabSize=8:noTabs=true:
+ */
+