summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Fisher <steve@stephen-fisher.com>2006-12-14 00:16:06 +0000
committerStephen Fisher <steve@stephen-fisher.com>2006-12-14 00:16:06 +0000
commitc97caf2a94720d932d80f61fc93c24f13c3dcbd3 (patch)
tree8790db85295242281f8e474ba29864f3faee58f9
parent8b8b648ad660ac651ff88718e4ea8b70ab28b7bd (diff)
downloadwireshark-c97caf2a94720d932d80f61fc93c24f13c3dcbd3.tar.gz
From Stig Bjorlykke:
I have added a new dissector for DMP (STANAG 4406 Direct Message Profile) as defined in STANAG 4406 Annex E. The DMP protocol has no assigned UDP port number yet, so the default value in this dissector is 0 (I suppose this is som sort of "disabled"?) until we get this registered. The dissector has been tested on OSX Intel/PowerPC and Solaris SPARC. Changes in this patch: * Added DMP dissector * Added a new CRC table and functions in crc16.c * Made NonDeliveryReasonCode and NonDeliveryDiagnosticCode available from X.411 * Made NonReceiptReasonField and DiscardReasonField available from X.420 svn path=/trunk/; revision=20133
Diffstat
-rw-r--r--AUTHORS1
-rw-r--r--asn1/x411/x411-exp.cnf4
-rw-r--r--asn1/x411/x411.cnf2
-rw-r--r--asn1/x420/x420-exp.cnf4
-rw-r--r--asn1/x420/x420.cnf2
-rw-r--r--epan/crc16.c64
-rw-r--r--epan/crc16.h12
-rw-r--r--epan/dissectors/Makefile.common1
-rw-r--r--epan/dissectors/packet-dmp.c3638
-rw-r--r--epan/dissectors/packet-x411.c90
-rw-r--r--epan/dissectors/packet-x411.h4
-rw-r--r--epan/dissectors/packet-x420.c26
-rw-r--r--epan/dissectors/packet-x420.h6
13 files changed, 3787 insertions, 67 deletions
diff --git a/AUTHORS b/AUTHORS
index 8a6c7b5a61..feecc12df8 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -2444,6 +2444,7 @@ Menno Andriesse <s5066 [AT] nc3a.nato.int> {
Stig Bjørlykke <stig [AT] bjorlykke.org> {
P_Mul (ACP142) packet disassembly
CDT (CompressedDataType) support
+ DMP (STANAG 4406 Direct Message Profile) support
}
Kyle J. Harms <kyle.j.harms [AT] boeing.com> {
diff --git a/asn1/x411/x411-exp.cnf b/asn1/x411/x411-exp.cnf
index 347771586f..abf45fd5c5 100644
--- a/asn1/x411/x411-exp.cnf
+++ b/asn1/x411/x411-exp.cnf
@@ -16,6 +16,8 @@ ExtendedContentType BER_CLASS_UNI BER_UNI_TAG_OID
ContentLength BER_CLASS_UNI BER_UNI_TAG_INTEGER
MessageDeliveryIdentifier BER_CLASS_APP 4
MessageDeliveryTime BER_CLASS_UNI BER_UNI_TAG_UTCTime
+NonDeliveryReasonCode BER_CLASS_UNI BER_UNI_TAG_INTEGER
+NonDeliveryDiagnosticCode BER_CLASS_UNI BER_UNI_TAG_INTEGER
SupplementaryInformation BER_CLASS_UNI BER_UNI_TAG_PrintableString
RequestedDeliveryMethod BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
OriginatingMTACertificate BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
@@ -39,6 +41,8 @@ ExtendedContentType TYPE = FT_OID DISPLAY = BASE_NONE STRINGS = NULL
ContentLength TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = NULL BITMASK = 0
MessageDeliveryIdentifier TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0
MessageDeliveryTime TYPE = FT_STRING DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0
+NonDeliveryReasonCode TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = VALS(x411_NonDeliveryReasonCode_vals) BITMASK = 0
+NonDeliveryDiagnosticCode TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = VALS(x411_NonDeliveryDiagnosticCode_vals) BITMASK = 0
SupplementaryInformation TYPE = FT_STRING DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0
RequestedDeliveryMethod TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = NULL BITMASK = 0
OriginatingMTACertificate TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0
diff --git a/asn1/x411/x411.cnf b/asn1/x411/x411.cnf
index fc69205d5d..b5b50338d0 100644
--- a/asn1/x411/x411.cnf
+++ b/asn1/x411/x411.cnf
@@ -29,6 +29,8 @@ SecurityLabel
SupplementaryInformation
TeletexNonBasicParameters
UniversalOrBMPString
+NonDeliveryReasonCode
+NonDeliveryDiagnosticCode
#.TYPE_RENAME
MTABindArgument/authenticated AuthenticatedArgument
diff --git a/asn1/x420/x420-exp.cnf b/asn1/x420/x420-exp.cnf
index 1ef3330743..551c7d9be9 100644
--- a/asn1/x420/x420-exp.cnf
+++ b/asn1/x420/x420-exp.cnf
@@ -14,6 +14,8 @@ ORDescriptor BER_CLASS_UNI BER_UNI_TAG_SET
ExtensionsField BER_CLASS_UNI BER_UNI_TAG_SET
MessageParameters BER_CLASS_UNI BER_UNI_TAG_SET
IPN BER_CLASS_UNI BER_UNI_TAG_SET
+NonReceiptReasonField BER_CLASS_UNI BER_UNI_TAG_ENUMERATED
+DiscardReasonField BER_CLASS_UNI BER_UNI_TAG_ENUMERATED
#.END
#.TYPE_ATTR
@@ -23,5 +25,7 @@ ORDescriptor TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL
ExtensionsField TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = NULL BITMASK = 0
MessageParameters TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0
IPN TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0
+NonReceiptReasonField TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = VALS(x420_NonReceiptReasonField_vals) BITMASK = 0
+DiscardReasonField TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = VALS(x420_DiscardReasonField_vals) BITMASK = 0
#.END
diff --git a/asn1/x420/x420.cnf b/asn1/x420/x420.cnf
index 213eb75d4e..fd83b59f4d 100644
--- a/asn1/x420/x420.cnf
+++ b/asn1/x420/x420.cnf
@@ -16,6 +16,8 @@ ExtensionsField
IPM
IPN
MessageParameters
+NonReceiptReasonField
+DiscardReasonField
#.FIELD_RENAME
diff --git a/epan/crc16.c b/epan/crc16.c
index 553ac03c0c..8f68d6bd3f 100644
--- a/epan/crc16.c
+++ b/epan/crc16.c
@@ -67,7 +67,7 @@
/* */
/*****************************************************************/
-static const guint crc16_ccitt_table[256] =
+static const guint crc16_ccitt_table_reverse[256] =
{
0x0000, 0x1189, 0x2312, 0x329B, 0x4624, 0x57AD, 0x6536, 0x74BF,
0x8C48, 0x9DC1, 0xAF5A, 0xBED3, 0xCA6C, 0xDBE5, 0xE97E, 0xF8F7,
@@ -103,26 +103,62 @@ static const guint crc16_ccitt_table[256] =
0x7BC7, 0x6A4E, 0x58D5, 0x495C, 0x3DE3, 0x2C6A, 0x1EF1, 0x0F78
};
+/* Same as above, only without reverse (Reverse=FALSE) */
+static const guint crc16_ccitt_table[256] =
+{
+ 0x0000, 0x1021, 0x2042, 0x3063, 0x4084, 0x50A5, 0x60C6, 0x70E7,
+ 0x8108, 0x9129, 0xA14A, 0xB16B, 0xC18C, 0xD1AD, 0xE1CE, 0xF1EF,
+ 0x1231, 0x0210, 0x3273, 0x2252, 0x52B5, 0x4294, 0x72F7, 0x62D6,
+ 0x9339, 0x8318, 0xB37B, 0xA35A, 0xD3BD, 0xC39C, 0xF3FF, 0xE3DE,
+ 0x2462, 0x3443, 0x0420, 0x1401, 0x64E6, 0x74C7, 0x44A4, 0x5485,
+ 0xA56A, 0xB54B, 0x8528, 0x9509, 0xE5EE, 0xF5CF, 0xC5AC, 0xD58D,
+ 0x3653, 0x2672, 0x1611, 0x0630, 0x76D7, 0x66F6, 0x5695, 0x46B4,
+ 0xB75B, 0xA77A, 0x9719, 0x8738, 0xF7DF, 0xE7FE, 0xD79D, 0xC7BC,
+ 0x48C4, 0x58E5, 0x6886, 0x78A7, 0x0840, 0x1861, 0x2802, 0x3823,
+ 0xC9CC, 0xD9ED, 0xE98E, 0xF9AF, 0x8948, 0x9969, 0xA90A, 0xB92B,
+ 0x5AF5, 0x4AD4, 0x7AB7, 0x6A96, 0x1A71, 0x0A50, 0x3A33, 0x2A12,
+ 0xDBFD, 0xCBDC, 0xFBBF, 0xEB9E, 0x9B79, 0x8B58, 0xBB3B, 0xAB1A,
+ 0x6CA6, 0x7C87, 0x4CE4, 0x5CC5, 0x2C22, 0x3C03, 0x0C60, 0x1C41,
+ 0xEDAE, 0xFD8F, 0xCDEC, 0xDDCD, 0xAD2A, 0xBD0B, 0x8D68, 0x9D49,
+ 0x7E97, 0x6EB6, 0x5ED5, 0x4EF4, 0x3E13, 0x2E32, 0x1E51, 0x0E70,
+ 0xFF9F, 0xEFBE, 0xDFDD, 0xCFFC, 0xBF1B, 0xAF3A, 0x9F59, 0x8F78,
+ 0x9188, 0x81A9, 0xB1CA, 0xA1EB, 0xD10C, 0xC12D, 0xF14E, 0xE16F,
+ 0x1080, 0x00A1, 0x30C2, 0x20E3, 0x5004, 0x4025, 0x7046, 0x6067,
+ 0x83B9, 0x9398, 0xA3FB, 0xB3DA, 0xC33D, 0xD31C, 0xE37F, 0xF35E,
+ 0x02B1, 0x1290, 0x22F3, 0x32D2, 0x4235, 0x5214, 0x6277, 0x7256,
+ 0xB5EA, 0xA5CB, 0x95A8, 0x8589, 0xF56E, 0xE54F, 0xD52C, 0xC50D,
+ 0x34E2, 0x24C3, 0x14A0, 0x0481, 0x7466, 0x6447, 0x5424, 0x4405,
+ 0xA7DB, 0xB7FA, 0x8799, 0x97B8, 0xE75F, 0xF77E, 0xC71D, 0xD73C,
+ 0x26D3, 0x36F2, 0x0691, 0x16B0, 0x6657, 0x7676, 0x4615, 0x5634,
+ 0xD94C, 0xC96D, 0xF90E, 0xE92F, 0x99C8, 0x89E9, 0xB98A, 0xA9AB,
+ 0x5844, 0x4865, 0x7806, 0x6827, 0x18C0, 0x08E1, 0x3882, 0x28A3,
+ 0xCB7D, 0xDB5C, 0xEB3F, 0xFB1E, 0x8BF9, 0x9BD8, 0xABBB, 0xBB9A,
+ 0x4A75, 0x5A54, 0x6A37, 0x7A16, 0x0AF1, 0x1AD0, 0x2AB3, 0x3A92,
+ 0xFD2E, 0xED0F, 0xDD6C, 0xCD4D, 0xBDAA, 0xAD8B, 0x9DE8, 0x8DC9,
+ 0x7C26, 0x6C07, 0x5C64, 0x4C45, 0x3CA2, 0x2C83, 0x1CE0, 0x0CC1,
+ 0xEF1F, 0xFF3E, 0xCF5D, 0xDF7C, 0xAF9B, 0xBFBA, 0x8FD9, 0x9FF8,
+ 0x6E17, 0x7E36, 0x4E55, 0x5E74, 0x2E93, 0x3EB2, 0x0ED1, 0x1EF0
+};
+
static const guint16 crc16_ccitt_start = 0xFFFF;
static const guint16 crc16_ccitt_xorout = 0xFFFF;
/* two types of crcs are possible: unreflected (bits shift left) and
* reflected (bits shift right).
*/
-#if 0
static guint16 crc16_unreflected(const guint8 *buf, guint len,
- guint16 crc_in, const guint table[])
+ guint16 crc_in, const guint table[])
{
/* we use guints, rather than guint16s, as they are likely to be
- faster. We just ignore the top 16 bits and let them do what they want. */
+ faster. We just ignore the top 16 bits and let them do what they want.
+ */
guint crc16 = (guint)crc_in;;
while( len-- != 0 )
- crc16 = table[(crc16 ^ *buf++) & 0xff] ^ (crc16 << 8);
+ crc16 = table[((crc16 >> 8) ^ *buf++) & 0xff] ^ (crc16 << 8);
return (guint16)crc16;
}
-#endif
static guint16 crc16_reflected(const guint8 *buf, guint len,
guint16 crc_in, const guint table[])
@@ -142,13 +178,18 @@ static guint16 crc16_reflected(const guint8 *buf, guint len,
guint16 crc16_ccitt(const guint8 *buf, guint len)
{
- return crc16_reflected(buf,len,crc16_ccitt_start,crc16_ccitt_table)
+ return crc16_reflected(buf,len,crc16_ccitt_start,crc16_ccitt_table_reverse)
^ crc16_ccitt_xorout;
}
+guint16 crc16_x25_ccitt(const guint8 *buf, guint len)
+{
+ return crc16_unreflected(buf,len,crc16_ccitt_start,crc16_ccitt_table);
+}
+
guint16 crc16_ccitt_seed(const guint8 *buf, guint len, guint16 seed)
{
- return crc16_reflected(buf,len,seed,crc16_ccitt_table)
+ return crc16_reflected(buf,len,seed,crc16_ccitt_table_reverse)
^ crc16_ccitt_xorout;
}
@@ -159,6 +200,13 @@ guint16 crc16_ccitt_tvb(tvbuff_t *tvb, guint len)
return crc16_ccitt(buf, len);
}
+guint16 crc16_x25_ccitt_tvb(tvbuff_t *tvb, guint len)
+{
+ const guint8* buf = tvb_get_ptr(tvb, 0, len);
+
+ return crc16_x25_ccitt(buf, len);
+}
+
guint16 crc16_ccitt_tvb_offset(tvbuff_t *tvb, guint offset, guint len)
{
const guint8* buf = tvb_get_ptr(tvb, offset, len);
diff --git a/epan/crc16.h b/epan/crc16.h
index 19ceb90aa5..90ddedb5e8 100644
--- a/epan/crc16.h
+++ b/epan/crc16.h
@@ -41,6 +41,12 @@
@return The CRC16 CCITT checksum. */
extern guint16 crc16_ccitt(const guint8 *buf, guint len);
+/** Compute CRC16 X.25 CCITT checksum of a buffer of data.
+ @param buf The buffer containing the data.
+ @param len The number of bytes to include in the computation.
+ @return The CRC16 X.25 CCITT checksum. */
+extern guint16 crc16_x25_ccitt(const guint8 *buf, guint len);
+
/** Compute CRC16 CCITT checksum of a buffer of data. If computing the
* checksum over multiple buffers and you want to feed the partial CRC16
* back in, remember to take the 1's complement of the partial CRC16 first.
@@ -56,6 +62,12 @@ extern guint16 crc16_ccitt_seed(const guint8 *buf, guint len, guint16 seed);
@return The CRC16 CCITT checksum. */
extern guint16 crc16_ccitt_tvb(tvbuff_t *tvb, guint len);
+/** Compute CRC16 X.25 CCITT checksum of a tv buffer.
+ @param tvb The tv buffer containing the data.
+ @param len The number of bytes to include in the computation.
+ @return The CRC16 X.25 CCITT checksum. */
+extern guint16 crc16_x25_ccitt_tvb(tvbuff_t *tvb, guint len);
+
/** Compute CRC16 CCITT checksum of a tv buffer.
@param tvb The tv buffer containing the data.
@param offset The offset into the tv buffer.
diff --git a/epan/dissectors/Makefile.common b/epan/dissectors/Makefile.common
index 278946bb87..d0f04a9611 100644
--- a/epan/dissectors/Makefile.common
+++ b/epan/dissectors/Makefile.common
@@ -270,6 +270,7 @@ DISSECTOR_SRC = \
packet-disp.c \
packet-distcc.c \
packet-dlsw.c \
+ packet-dmp.c \
packet-dnp.c \
packet-dns.c \
packet-dop.c \
diff --git a/epan/dissectors/packet-dmp.c b/epan/dissectors/packet-dmp.c
new file mode 100644
index 0000000000..6d8dea2b8e
--- /dev/null
+++ b/epan/dissectors/packet-dmp.c
@@ -0,0 +1,3638 @@
+/* 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 is activated when using unreliable bearer services.
+ *
+ * Copyright 2006, Stig Bjørlykke <stig@bjorlykke.org>, Thales Norway AS
+ *
+ * $Id$
+ *
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
+ * Copyright 1998 Gerald Combs
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+/*
+ * TODO:
+ * - Obtain a dedicated UDP port number for DMP
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <epan/packet.h>
+#include <epan/address.h>
+#include <epan/addr_resolv.h>
+#include <epan/to_str.h>
+#include <epan/prefs.h>
+#include <epan/emem.h>
+#include <epan/crc16.h>
+#include <string.h>
+#include <math.h>
+
+#include "packet-x411.h"
+#include "packet-x420.h"
+
+#define PNAME "Direct Message Profile"
+#define PSNAME "DMP"
+#define PFNAME "dmp"
+
+/* Version supported */
+#define DMP_VERSION 1
+
+/* Message Type (dmp.msg_type) */
+#define STANAG 0x0
+#define IPM 0x1
+#define REPORT 0x2
+#define NOTIF 0x3
+#define ACK 0x4
+
+/* 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
+
+/* 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
+
+/* 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
+
+/* Type of structured id to print */
+#define STRUCT_ID_NONE 0
+#define STRUCT_ID_UINT8 1
+#define STRUCT_ID_UINT16 2
+#define STRUCT_ID_UINT32 3
+#define STRUCT_ID_UINT64 4
+#define STRUCT_ID_STRING 5
+#define STRUCT_ID_ZSTRING 6
+
+/* Maximum lengths */
+#define MAX_SIC_LEN 30
+#define MAX_MSG_TYPE_LEN 30
+#define MAX_SEC_CAT_LEN 33
+#define MAX_ENV_FLAGS_LEN 100
+#define MAX_STRUCT_ID_LEN 128
+
+void proto_reg_handoff_dmp (void);
+
+static int proto_dmp = -1;
+
+static int hf_envelope = -1;
+static int hf_envelope_protocol_id = -1;
+static int hf_envelope_version = -1;
+static int hf_envelope_hop_count = -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_type = -1;
+static int hf_envelope_msg_id = -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_content = -1;
+static int hf_content_report = -1;
+
+static int hf_addr_recipient = -1;
+static int hf_addr_originator = -1;
+static int hf_addr_reporting_name = -1;
+static int hf_addr_dir_addr_ext = -1;
+static int hf_addr_dir_rec_no = -1;
+static int hf_addr_dir_rec_no_ext1 = -1;
+static int hf_addr_dir_rec_no_ext2 = -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_address_ext1 = -1;
+static int hf_addr_dir_address_ext2 = -1;
+
+static int hf_addr_ext_form = -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_no_ext1 = -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_length_ext = -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 = -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_nat = -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_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_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_subject = -1;
+static int hf_message_eit = -1;
+static int hf_message_compr = -1;
+static int hf_message_body = -1;
+static int hf_message_body_plain = -1;
+static int hf_message_bodyid_uint8 = -1;
+static int hf_message_bodyid_uint16 = -1;
+static int hf_message_bodyid_uint32 = -1;
+static int hf_message_bodyid_uint64 = -1;
+static int hf_message_bodyid_string = -1;
+static int hf_message_bodyid_zstring = -1;
+static int hf_message_body_structured = -1;
+static int hf_message_body_uncompr = -1;
+static int hf_message_body_uncompressed = -1;
+
+static int hf_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_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_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_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_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_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_message_body_uncompr = -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;
+
+/* Global values used in several functions */
+static struct dmp_data {
+ gint version;
+ gint addr_enc;
+ gint checksum;
+ gint msg_type;
+ gint st_type;
+ gint body_format;
+ gint notif_type;
+ gchar *struct_id;
+ time_t subm_time;
+ guint16 msg_id;
+ guint16 subj_id;
+ gboolean dr;
+ gboolean ndr;
+ gboolean ack_rec_present;
+} dmp;
+
+/* User definable values */
+static guint global_dmp_port = 0; /* Default disabled */
+static guint global_dmp_port_second = 0; /* Default disabled */
+static guint dmp_port = 0;
+static guint dmp_port_second = 0;
+static gboolean dmp_align = FALSE;
+static gboolean dmp_subject_as_id = FALSE;
+static gint dmp_struct_format = STRUCT_ID_NONE;
+static guint dmp_struct_offset = 0;
+static guint dmp_struct_length = 1;
+
+static const true_false_string addr_enc = {
+ "Use Extended Encoding", "Use Direct Encoding"
+};
+
+static const true_false_string checksum = {
+ "Checksum used", "Checksum not used"
+};
+
+static const true_false_string set_notset = {
+ "Set", "Not set"
+};
+
+static const true_false_string yes_no = {
+ "Yes", "No"
+};
+
+static const true_false_string dtg_sign = {
+ "Future", "Past"
+};
+
+static const true_false_string report_type = {
+ "Non-Delivery Report", "Delivery Report"
+};
+
+static const true_false_string present_values = {
+ "Present", "Absent"
+};
+
+static const value_string version_vals[] = {
+ { 0x0, "1" },
+ { 0x1, "Unknown" },
+ { 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 report_vals[] = {
+ { 0x0, "No Report" },
+ { 0x1, "Delivery Report" },
+ { 0x2, "Non-Delivery Report" },
+ { 0x3, "Reserved" },
+ { 0, NULL } };
+
+static const value_string report_vals_ext[] = {
+ { 0x0, "No Report" },
+ { 0x1, "Delivery Report" },
+ { 0x2, "Non-Delivery Report" },
+ { 0x3, "Recipient Number Extended" },
+ { 0, NULL } };
+
+/* Note the space in front of these values */
+static const value_string report_vals_short[] = {
+ { 0x1, " DR" },
+ { 0x2, " NDR" },
+ { 0, NULL } };
+
+static const value_string notif_vals[] = {
+ { 0x0, "No Notification" },
+ { 0x1, "Receipt Notification" },
+ { 0x2, "Non-Receipt Notification" },
+ { 0x3, "Reserved" },
+ { 0, NULL } };
+
+static const value_string notif_vals_ext[] = {
+ { 0x0, "No Notification" },
+ { 0x1, "Receipt Notification" },
+ { 0x2, "Non-Receipt Notification" },
+ { 0x3, "Direct Address Extended" },
+ { 0, NULL } };
+
+/* Note the space in front of these values */
+static const value_string notif_vals_short[] = {
+ { 0x1, " RN" },
+ { 0x2, " NRN" },
+ { 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 } };
+
+static const value_string addr_type_str [] = {
+ { ORIGINATOR, "" },
+ { P1_ADDRESS, "P1 " },
+ { P2_ADDRESS, "P2/P722 " },
+ { 0, NULL } };
+
+static const value_string addr_form [] = {
+ { 0x0, "P1 address only, Direct Address" },
+ { 0x1, "P22/P722 address only, Direct Address" },
+ { 0x2, "P1 address only, Extended Address" },
+ { 0x3, "P22/P722 address only, Extended Address" },
+ { 0x4, "P1 and P22/P722 addresses, Direct Address" },
+ { 0x5, "P1, Direct Address and P22/P722 addresses, Extended Address" },
+ { 0x6, "P1, Extended ADdress and P22/P722 addresses, Direct Address" },
+ { 0x7, "P1 and P22/P722 addresses, Extended Address" },
+ { 0, NULL } };
+
+static const value_string addr_form_orig [] = {
+ { 0x0, "Direct Address" },
+ { 0x1, "Reserved" },
+ { 0x2, "Extended Address" },
+ { 0x3, "Reserved" },
+ { 0x4, "Reserved" },
+ { 0x5, "Reserved" },
+ { 0x6, "Reserved" },
+ { 0x7, "Reserved" },
+ { 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 } };
+
+static const value_string nat_pol_id[] = {
+ { 0x00, "Unused" },
+ { 0x01, "Belgium (BE)" },
+ { 0x02, "Bulgaria (BG)" },
+ { 0x03, "Canada (CA)" },
+ { 0x04, "Czech Republic (CZ)" },
+ { 0x05, "Denmark (DK)" },
+ { 0x06, "Estonia (ES)" },
+ { 0x07, "France (FR)" },
+ { 0x08, "Germany (DE)" },
+ { 0x09, "Greece (GR)" },
+ { 0x0A, "Hungary (HU)" },
+ { 0x0B, "Iceland (IS)" },
+ { 0x0C, "Italy (IT)" },
+ { 0x0D, "Latvia (LV)" },
+ { 0x0E, "Lithuania (LT)" },
+ { 0x0F, "Luxemburg (LU)" },
+ { 0x10, "Netherlands (NL)" },
+ { 0x11, "Norway (NO)" },
+ { 0x12, "Poland (PL)" },
+ { 0x13, "Portugal (PT)" },
+ { 0x14, "Romania (RO)" },
+ { 0x15, "Slovakia (SK)" },
+ { 0x16, "Slovenia (SI)" },
+ { 0x17, "Spain (ES)" },
+ { 0x18, "Turkey (TR)" },
+ { 0x19, "United Kingdom (GB)" },
+ { 0x1A, "United States (US)" },
+ { 0xFF, "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 enum_val_t struct_id_options[] = {
+ { "none", "None", STRUCT_ID_NONE },
+ { "1byte", "1 Byte value", STRUCT_ID_UINT8 },
+ { "2byte", "2 Byte value", STRUCT_ID_UINT16 },
+ { "4byte", "4 Byte value", STRUCT_ID_UINT32 },
+ { "8byte", "8 Byte value", STRUCT_ID_UINT64 },
+ { "fstring", "Fixed text string", STRUCT_ID_STRING },
+ { "zstring", "Zero terminated text string", STRUCT_ID_ZSTRING },
+ { NULL, NULL, 0 }
+};
+
+static const gchar *msg_type_to_str (void)
+{
+ static gchar *msg_type = NULL;
+
+ if (dmp.msg_type == STANAG) {
+ /* STANAG 4406 Message, also include message type */
+ msg_type = ep_alloc (MAX_MSG_TYPE_LEN);
+ g_snprintf (msg_type, MAX_MSG_TYPE_LEN, "%s (%s)",
+ val_to_str (dmp.msg_type, type_vals, "Unknown"),
+ val_to_str (dmp.st_type, message_type_vals, "Unknown"));
+ return msg_type;
+ } else if (dmp.msg_type == REPORT) {
+ /* Report, also include report types included */
+ msg_type = ep_alloc (MAX_MSG_TYPE_LEN);
+ g_snprintf (msg_type, MAX_MSG_TYPE_LEN, "Report (%s%s%s)",
+ dmp.dr ? "DR" : "", (dmp.dr && dmp.ndr) ? " and " : "",
+ dmp.ndr ? "NDR" : "");
+ return msg_type;
+ } else if (dmp.msg_type == NOTIF) {
+ /* Notification */
+ return val_to_str (dmp.notif_type, notif_type, "Unknown");
+ }
+ /* IPM-88 Message or Acknowledgement (or Unknown) */
+ return val_to_str (dmp.msg_type, type_vals, "Unknown");
+}
+
+static const gchar *non_del_reason_str (guint8 value)
+{
+ if (value < 0x3D) {
+ /* Standard values according to X.411 */
+ return val_to_str (value, x411_NonDeliveryReasonCode_vals, "Unknown");
+ } else {
+ return val_to_str (value, non_del_reason, "Unknown");
+ }
+}
+
+static const gchar *non_del_diagn_str (guint8 value)
+{
+ if (value < 0x7C) {
+ /* Standard values according to X.411 */
+ return val_to_str (value, x411_NonDeliveryDiagnosticCode_vals, "Unknown");
+ } else {
+ return val_to_str (value, non_del_diagn, "Unknown");
+ }
+}
+
+static const gchar *nrn_reason_str (guint8 value)
+{
+ /* Standard values according to X.420 */
+ return val_to_str (value, x420_NonReceiptReasonField_vals, "Reserved");
+}
+
+static const gchar *discard_reason_str (guint8 value)
+{
+ if (value < 0xFE) {
+ /* Standard values according to X.420 */
+ return val_to_str (value, x420_DiscardReasonField_vals, "Reserved");
+ } else {
+ return val_to_str (value, discard_reason, "Unknown");
+ }
+}
+
+/* Ref chapter 6.2.8.10 TimeDifference */
+static time_t dmp_dec_time_diff (guint8 dmp_time_diff)
+{
+ time_t time_diff = 0;
+
+ if (dmp_time_diff <= 0x01) {
+ /* Reserved - low value */
+ time_diff = -1;
+ } 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 = -2;
+ }
+
+ return time_diff;
+}
+
+/*
+ * Ref chapter 6.3.7.2.10 ExpiryTime
+ * and chapter 6.3.9.2.2 DeliveryTime
+ */
+static time_t dmp_dec_exp_del_time (guint8 timev, gboolean expiry_time)
+{
+ time_t time_value = 0;
+
+ if (expiry_time && (timev == 0x00)) {
+ /* No expiry time */
+ time_value = -1;
+ } 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 = -2;
+ }
+
+ return time_value;
+}
+
+static time_t dmp_dec_exp_time (guint8 expiry_time)
+{
+ return dmp_dec_exp_del_time (expiry_time, TRUE);
+}
+
+static time_t 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 time_t dmp_dec_dtg (guint8 dtg)
+{
+ time_t value;
+
+ if (dtg == 0x00) {
+ /* Not present */
+ return -1;
+ } 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 */
+ return -2;
+ }
+
+ 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 time_t dmp_dec_subm_time (guint16 delta1, time_t start_time)
+{
+ time_t 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;
+ gint p;
+
+ if (no_char >= MAX_SIC_LEN) {
+ /* Illegal length */
+ g_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 = (gint) pow (multiplier, no_char - 1 - i);
+ sic[i] = (gchar) (bin / p);
+ bin -= sic[i] * p;
+ 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;
+ }
+ }
+ sic[i] = '\0';
+
+ return failure;
+}
+
+/* Ref chapter 6.3.7.2.12 SIC */
+static gint dissect_dmp_sic (tvbuff_t *tvb, 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 = ep_alloc (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 (message_tree, hf_message_sic, tvb,
+ offset, 2, sic,
+ "SIC: %s [A-Z0-9 only]%s", sic,
+ failure ? " (invalid)": "");
+ 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 (message_tree, hf_message_sic, tvb,
+ offset, 3, sic,
+ "SIC: %s [any character]%s", sic,
+ failure ? " (invalid)": "");
+ offset += 3;
+
+ } else if (key <= 0xBF) {
+ /* Reserved (not used) */
+ g_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, FALSE);
+ 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, FALSE);
+ 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, FALSE);
+ proto_tree_add_item (key_tree, hf_message_sic_key_chars, tvb, offset,
+ 1, FALSE);
+ proto_tree_add_item (key_tree, hf_message_sic_key_num, tvb, offset,
+ 1, FALSE);
+ 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);
+ proto_tree_add_string_format (sic_tree, hf_message_sic, tvb,
+ offset, bytes, sic,
+ "SIC %d: %s%s", i + 1, sic,
+ failure ? " (invalid)": "");
+ 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, FALSE);
+ 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, FALSE);
+ 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, FALSE);
+ proto_tree_add_item (key_tree, hf_message_sic_key_chars, tvb, offset,
+ 1, FALSE);
+ proto_tree_add_item (key_tree, hf_message_sic_key_num, tvb, offset,
+ 1, FALSE);
+ 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, FALSE);
+
+ 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) & 0x1FF;
+ } 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: %llx)%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, FALSE);
+ } else {
+ proto_tree_add_item (bitmap_tree, hf_message_sic_bits, tvb,
+ offset, 1, FALSE);
+ }
+ }
+ 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 */
+ g_snprintf (sic, MAX_SIC_LEN, "Not present");
+ no_sic = TRUE;
+
+ } else {
+ /* Resered (not used) */
+ g_snprintf (sic, MAX_SIC_LEN, "Reserved");
+ no_sic = TRUE;
+ }
+
+ if (no_sic) {
+ /* Not added any SIC, dump text value */
+ sf = proto_tree_add_string_format (message_tree, hf_message_sic, tvb,
+ offset, 1, sic, "SIC: %s", 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, 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);
+ en = proto_tree_add_uint_format (field_tree, hf_addr_dir_address, tvb,
+ offset, 1, value & 0x7F,
+ "%sDirect Address%s: %d",
+ val_to_str (addr_type, addr_type_str, ""),
+ (value & 0x80) ? " (bits 6-0)" : "",
+ 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, FALSE);
+ proto_tree_add_item (addr_tree, hf_addr_dir_address, tvb, offset,
+ 1, FALSE);
+ offset += 1;
+
+ if (value & 0x80) {
+ /* Extended 1 */
+ value = tvb_get_guint8 (tvb, offset);
+ dir_addr |= ((value & 0x3F) << 7);
+ en = proto_tree_add_uint_format (field_tree, hf_addr_dir_address, tvb,
+ offset, 1, value & 0x3F,
+ "%sDirect Address (bits 12-7): %d",
+ val_to_str (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, FALSE);
+ proto_tree_add_item (addr_tree, hf_reserved_0x40, tvb, offset,
+ 1, FALSE);
+ proto_tree_add_item (addr_tree, hf_addr_dir_address_ext1, tvb, offset,
+ 1, FALSE);
+ 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_address, tvb,
+ offset, 1, value & 0x3F,
+ "%sDirect Address (bits 18-13): %d",
+ val_to_str (addr_type,addr_type_str,""),
+ value & 0x3F);
+ addr_tree = proto_item_add_subtree (en, ett_address_direct);
+ proto_tree_add_item (addr_tree, hf_reserved_0xC0, tvb, offset,
+ 1, FALSE);
+ proto_tree_add_item (addr_tree, hf_addr_dir_address_ext2, tvb, offset,
+ 1, FALSE);
+ 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 (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 _U_,
+ 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;
+
+ 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 (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, type, "Address Type: %s",
+ val_to_str (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, FALSE);
+
+ en = proto_tree_add_uint_format (ext_tree, hf_addr_ext_length, tvb,
+ offset, 1, length, "Address Length%s: %d",
+ (value & 0x80) ? " (bits 4-0)" : "",
+ length);
+ addr_tree = proto_item_add_subtree (en, ett_address_ext_length);
+ proto_tree_add_item (addr_tree, hf_addr_ext_length, tvb, offset,
+ 1, FALSE);
+ offset += 1;
+
+ if (value & 0x80) {
+ /* 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, type, "Address Type Ext: %s",
+ val_to_str (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, FALSE);
+
+ en = proto_tree_add_uint_format (ext_tree, hf_addr_ext_length_ext, tvb,
+ offset, 1, value & 0x1F,
+ "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_length_ext, tvb, offset,
+ 1, FALSE);
+ offset += 1;
+ }
+
+ if (type == ASN1_BER) {
+ dissect_x411_ORName (FALSE, tvb, offset, pinfo, 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, FALSE);
+ } else {
+ proto_tree_add_item (ext_tree, hf_addr_ext_unknown, tvb, offset,
+ length, FALSE);
+ }
+ offset += length;
+
+ proto_item_append_text (ef, ", Type: %s, Length: %d",
+ val_to_str (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 (addr_type, addr_type_str, ""),
+ val_to_str (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 _U_,
+ 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;
+
+ tf = proto_tree_add_item (envelope_tree, hf_addr_originator, tvb, offset,
+ -1, FALSE);
+ field_tree = proto_item_add_subtree (tf, ett_address);
+
+ if (dmp.addr_enc == DIRECT_ADDR) {
+ offset = dissect_dmp_direct_addr (tvb, field_tree, tf, offset, -1, -1,
+ ORIGINATOR);
+ } else {
+ value = tvb_get_guint8 (tvb, offset);
+ dmp_addr_form = (value & 0xE0) >> 5;
+
+ en = proto_tree_add_uint_format (field_tree, hf_addr_ext_form, tvb,
+ offset, 1, dmp_addr_form,
+ "Address Form: %s",
+ val_to_str (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, tvb, offset,
+ 1, FALSE);
+ proto_tree_add_item (rec_tree, hf_reserved_0x1F, tvb, offset,
+ 1, FALSE);
+ offset += 1;
+
+ if (dmp_addr_form == P1_DIRECT) {
+ offset = dissect_dmp_direct_addr (tvb, field_tree, tf, offset, -1, -1,
+ ORIGINATOR);
+ } else if (dmp_addr_form == P1_EXTENDED) {
+ offset = dissect_dmp_ext_addr (tvb, pinfo, field_tree, tf, offset, -1,
+ -1, ORIGINATOR);
+ } else {
+ proto_item_append_text (tf, " (invalid address form)");
+ }
+ }
+
+ 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 (rep_req, report_vals_short, ""));
+ }
+ if (not_req) {
+ proto_item_append_text (tf, "%s",
+ val_to_str (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, 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;
+
+ value = tvb_get_guint8 (tvb, offset);
+ rec_no = (value & 0xF0) >> 4;
+ rep_req = (value & 0x0C) >> 2;
+ not_req = (value & 0x03);
+
+ en = proto_tree_add_uint_format (field_tree, hf_addr_dir_rec_no, tvb,
+ offset, 1, (value & 0xF0) >> 4,
+ "Recipient Number%s: %d"
+ " (offset from previous)",
+ (rep_req == 0x03) ? " (bits 3-0)" : "",
+ (value & 0xF0) >> 4);
+ rec_tree = proto_item_add_subtree (en, ett_address_rec_no);
+ proto_tree_add_item (rec_tree, hf_addr_dir_rec_no, tvb, offset,
+ 1, FALSE);
+ proto_tree_add_item (rec_tree, hf_addr_dir_rep_req1, tvb, offset,
+ 1, FALSE);
+ proto_tree_add_item (rec_tree, hf_addr_dir_not_req1, tvb, offset,
+ 1, FALSE);
+ offset += 1;
+
+ value = tvb_get_guint8 (tvb, offset);
+ dir_addr = (value & 0x7F);
+ action = (value & 0x80);
+ en = proto_tree_add_uint_format (field_tree, hf_addr_dir_address, tvb,
+ offset, 1, value & 0x7F,
+ "Direct Address%s: %d",
+ (not_req == 0x03) ? " (bits 6-0)" : "",
+ 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, FALSE);
+ proto_tree_add_item (addr_tree, hf_addr_dir_address, tvb, offset,
+ 1, FALSE);
+ 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_no_ext1,
+ tvb, offset, 1, value & 0x3F,
+ "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, FALSE);
+ proto_tree_add_item (rec_tree, hf_addr_dir_rec_no_ext1, tvb, offset,
+ 1, FALSE);
+ 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_no_ext1,
+ tvb, offset, 1, value & 0x1F,
+ "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, FALSE);
+ proto_tree_add_item (rec_tree, hf_reserved_0x20, tvb, offset,
+ 1, FALSE);
+ proto_tree_add_item (rec_tree, hf_addr_dir_rec_no_ext2, tvb, offset,
+ 1, FALSE);
+ offset += 1;
+ }
+ }
+
+ if (not_req == 0x03) {
+ /* Extended Direct Address 1 */
+ 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_address, tvb,
+ offset, 1, value & 0x3F,
+ "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, FALSE);
+ proto_tree_add_item (addr_tree, hf_addr_dir_address_ext1, tvb, offset,
+ 1, FALSE);
+ 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_address, tvb,
+ offset, 1, value & 0x3F,
+ "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, FALSE);
+ proto_tree_add_item (addr_tree, hf_addr_dir_address_ext2, tvb, offset,
+ 1, FALSE);
+ offset += 1;
+ }
+ }
+
+ rec_no += (1 + *prev_rec_no);
+ *prev_rec_no = rec_no;
+
+ 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 _U_,
+ 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, dmp_addr_form,
+ "Address Form: %s",
+ val_to_str (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, FALSE);
+
+ en = proto_tree_add_boolean_format (field_tree, hf_addr_ext_action, tvb,
+ offset, 1, action, "Action: %s",
+ action ? yes_no.true_string :
+ yes_no.false_string);
+ addr_tree = proto_item_add_subtree (en, ett_address_ext_action);
+ proto_tree_add_item (addr_tree, hf_addr_ext_action, tvb, offset,
+ 1, FALSE);
+
+ rep_req = (value & 0x0C) >> 2;
+ en = proto_tree_add_uint_format (field_tree, hf_addr_ext_rep_req, tvb,
+ offset, 1, (value & 0x0C) >> 2,
+ "Report Request: %s",
+ val_to_str ((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, FALSE);
+
+ not_req = (value & 0x03);
+ en = proto_tree_add_uint_format (field_tree, hf_addr_ext_not_req, tvb,
+ offset, 1, value & 0x03,
+ "Notification Request: %s",
+ val_to_str (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, FALSE);
+ offset += 1;
+
+ value = tvb_get_guint8 (tvb, offset);
+ rec_no = (value & 0x7F);
+ en = proto_tree_add_uint_format (field_tree, hf_addr_ext_rec_no, tvb,
+ offset, 1, value & 0x7F,
+ "Recipient Number%s: %d"
+ " (offset from previous)",
+ (value & 0x80) ? " (bits 6-0)" : "",
+ 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, FALSE);
+ proto_tree_add_item (addr_tree, hf_addr_ext_rec_no, tvb, offset,
+ 1, FALSE);
+ offset += 1;
+
+ if (value & 0x80) {
+ /* 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_no_ext1, 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_no_ext1, tvb, offset,
+ 1, FALSE);
+ offset += 1;
+ }
+
+ rec_no += (1 + *prev_rec_no);
+ *prev_rec_no = rec_no;
+
+ switch (dmp_addr_form) {
+
+ case P1_DIRECT:
+ case P1_P2_DIRECT:
+ case P1_DIRECT_P2_EXTENDED:
+ offset = dissect_dmp_direct_addr (tvb, 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, 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 _U_,
+ 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, FALSE);
+ } 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, 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 _U_,
+ proto_tree *dmp_tree, gint offset)
+{
+ proto_tree *ack_tree = NULL, *recip_tree = NULL;
+ proto_item *en = NULL, *rt = NULL;
+ guint8 reason;
+ 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, FALSE);
+ ack_tree = proto_item_add_subtree (en, ett_ack);
+
+ reason = tvb_get_guint8 (tvb, offset);
+ proto_item_append_text (en, ", Reason: %s",
+ val_to_str (reason, ack_reason, "Reserved"));
+
+ proto_tree_add_item (ack_tree, hf_ack_reason, tvb, offset, 1, FALSE);
+ offset += 1;
+
+ proto_tree_add_item (ack_tree, hf_ack_diagnostic, tvb, offset, 1, FALSE);
+ 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, FALSE);
+ offset += 2;
+
+ if (dmp.ack_rec_present) {
+ /* Recipient List */
+ rec_len = tvb_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,
+ FALSE);
+ 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;
+}
+
+/* Ref chapter 6.2.7 Envelope structure */
+static gint dissect_dmp_envelope (tvbuff_t *tvb, packet_info *pinfo _U_,
+ proto_tree *dmp_tree, gint offset)
+{
+ proto_tree *envelope_tree = NULL;
+ proto_tree *field_tree = NULL;
+ proto_item *en = NULL, *tf = NULL, *vf = NULL;
+ guint8 envelope, prot_id, time_diff;
+ guint16 subm_time, no_rec;
+ time_t secs = 0;
+ gchar *env_flags = NULL;
+ guint prev_rec_no = 0;
+ gint boffset = offset, i;
+
+ en = proto_tree_add_item (dmp_tree, hf_envelope, tvb, offset, 10, FALSE);
+ envelope_tree = proto_item_add_subtree (en, ett_envelope);
+
+ envelope = tvb_get_guint8 (tvb, offset);
+ 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, FALSE);
+ if (prot_id == 0x0D) {
+ proto_item_append_text (vf, " (national version of DMP)");
+ } else if (prot_id == 0x1D) {
+ 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, tvb,
+ offset, 1, FALSE);
+ offset += 1;
+
+ if (dmp.version > DMP_VERSION) {
+ /* Unsupported DMP Version */
+ proto_item_append_text (vf, " (unsupported)");
+ proto_item_append_text (tf, " (unsupported)");
+ 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 & 0xE0) >> 5,
+ "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, tvb,
+ offset, 1, FALSE);
+ } else {
+ /* Recipient Present */
+ dmp.ack_rec_present = (envelope & 0x20);
+ tf = proto_tree_add_boolean_format (envelope_tree,hf_envelope_rec_present,
+ tvb, offset, 1, envelope & 0x20,
+ "Recipient Present: %s",
+ (envelope & 0x20) ?
+ present_values.true_string :
+ present_values.false_string);
+ field_tree = proto_item_add_subtree (tf, ett_envelope_rec_present);
+ proto_tree_add_item (field_tree, hf_envelope_rec_present, tvb,
+ offset, 1, FALSE);
+ }
+
+ /* Address Encoding */
+ tf = proto_tree_add_boolean_format (envelope_tree, hf_envelope_addr_enc,
+ tvb, offset, 1, envelope & 0x10,
+ "Address Encoding: %s",
+ (envelope & 0x10) ?
+ addr_enc.true_string :
+ addr_enc.false_string);
+ field_tree = proto_item_add_subtree (tf, ett_envelope_addr_enc);
+ proto_tree_add_item (field_tree, hf_envelope_addr_enc, tvb,
+ offset, 1, FALSE);
+
+ /* Checksum Present */
+ tf = proto_tree_add_boolean_format (envelope_tree, hf_envelope_checksum,
+ tvb, offset, 1, envelope & 0x08,
+ "Checksum: %s",
+ (envelope & 0x08) ?
+ checksum.true_string :
+ checksum.false_string);
+ field_tree = proto_item_add_subtree (tf, ett_envelope_checksum);
+ proto_tree_add_item (field_tree, hf_envelope_checksum, tvb,
+ offset, 1, FALSE);
+
+ /* Content Type */
+ tf = proto_tree_add_uint_format (envelope_tree, hf_envelope_type,
+ tvb, offset, 1, envelope & 0x07,
+ "Content Type: %s (%d)",
+ val_to_str (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, FALSE);
+
+ proto_item_append_text (en, ", %s", (envelope >> 3) & 0x01 ?
+ checksum.true_string : checksum.false_string);
+ offset += 1;
+
+ if (dmp.msg_type >= ACK) {
+ proto_item_set_len (en, offset - boffset);
+ return offset;
+ }
+
+ /* Message Identifier */
+ dmp.msg_id = tvb_get_ntohs (tvb, offset);
+ proto_tree_add_item (envelope_tree, hf_envelope_msg_id, tvb, offset,
+ 2, FALSE);
+ offset += 2;
+
+ /* Submission Time */
+ subm_time = tvb_get_ntohs (tvb, offset);
+ dmp.subm_time = dmp_dec_subm_time (subm_time & 0x7FFF,
+ pinfo->fd->abs_ts.secs);
+ tf = proto_tree_add_uint_format (envelope_tree, hf_envelope_subm_time, tvb,
+ offset, 2, subm_time & 0x7FFF,
+ "Submission time: %s",
+ (subm_time & 0x7FFF) >= 0x7FF8 ?
+ "Reserved" :
+ abs_time_secs_to_str (dmp.subm_time));
+ 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, FALSE);
+ proto_tree_add_item (field_tree, hf_envelope_subm_time_value, tvb,
+ offset, 2, FALSE);
+ 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, FALSE);
+ secs = dmp_dec_time_diff (time_diff);
+ if (secs == -1 || secs == -2) {
+ proto_item_append_text (tf, "Reserved (0x%2.2x)", time_diff);
+ } else {
+ proto_item_append_text (tf, "%s", time_secs_to_str (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, FALSE);
+ proto_tree_add_item (field_tree, hf_envelope_recip_reassign_prohib, tvb,
+ offset, 1, FALSE);
+ proto_tree_add_item (field_tree, hf_envelope_dl_expansion_prohib, tvb,
+ offset, 1, FALSE);
+
+ if (envelope & 0xE0) {
+ env_flags = ep_alloc (MAX_ENV_FLAGS_LEN);
+ env_flags[0] = 0;
+ g_snprintf (env_flags, MAX_ENV_FLAGS_LEN, "%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, no_rec,
+ "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, FALSE);
+ offset += 1;
+
+ if (no_rec == 0) {
+ /* Extended Recipient Count */
+ no_rec = tvb_get_ntohs (tvb, offset) & 0x7FFF;
+ tf = proto_tree_add_uint_format (envelope_tree,hf_envelope_ext_recipients,
+ tvb, offset, 2, no_rec,
+ "Extended Recipient Count: %d%s", no_rec,
+ (no_rec < 32 ?
+ " (incorrect, reserved value)" : ""));
+
+ field_tree = proto_item_add_subtree (tf, ett_envelope_ext_recipients);
+ proto_tree_add_item (field_tree, hf_reserved_0x8000, tvb,
+ offset, 2, FALSE);
+ proto_tree_add_item (field_tree, hf_envelope_ext_recipients, tvb,
+ offset, 2, FALSE);
+ offset += 2;
+ }
+
+ if (dmp.msg_type != REPORT) {
+ /* Originator - Not present for reports */
+ offset = dissect_dmp_originator (tvb, pinfo, envelope_tree, offset);
+ }
+
+ for (i = 1; i <= no_rec; i++) {
+ /* Recipient(s) */
+ offset = dissect_dmp_address (tvb, pinfo, envelope_tree, offset,
+ &prev_rec_no, FALSE);
+ }
+ proto_item_set_len (en, offset - boffset);
+
+ return offset;
+}
+
+static void dissect_dmp_structured_id (tvbuff_t *tvb, proto_tree *body_tree,
+ gint offset)
+{
+ proto_item *tf = NULL;
+ guint8 id_byte;
+ guint16 id_short;
+ guint32 id_int;
+ guint64 id_guint64;
+ guint8 *id_string = NULL;
+ gint length;
+
+ offset += dmp_struct_offset;
+ switch (dmp_struct_format) {
+
+ case STRUCT_ID_UINT8:
+ id_byte = tvb_get_guint8 (tvb, offset);
+ g_snprintf (dmp.struct_id, MAX_STRUCT_ID_LEN, "%u", id_byte);
+ tf = proto_tree_add_item (body_tree, hf_message_bodyid_uint8, tvb,
+ offset, 1, FALSE);
+ break;
+
+ case STRUCT_ID_UINT16:
+ id_short = tvb_get_ntohs (tvb, offset);
+ g_snprintf (dmp.struct_id, MAX_STRUCT_ID_LEN, "%u", id_short);
+ tf = proto_tree_add_item (body_tree, hf_message_bodyid_uint16, tvb,
+ offset, 2, FALSE);
+ break;
+
+ case STRUCT_ID_UINT32:
+ id_int = tvb_get_ntohl (tvb, offset);
+ g_snprintf (dmp.struct_id, MAX_STRUCT_ID_LEN, "%u", id_int);
+ tf = proto_tree_add_item (body_tree, hf_message_bodyid_uint32, tvb,
+ offset, 4, FALSE);
+ break;
+
+ case STRUCT_ID_UINT64:
+ id_guint64 = tvb_get_ntoh64 (tvb, offset);
+ g_snprintf (dmp.struct_id, MAX_STRUCT_ID_LEN, "%" PRIu64, id_guint64);
+ tf = proto_tree_add_item (body_tree, hf_message_bodyid_uint64, tvb,
+ offset, 8, FALSE);
+ break;
+
+ case STRUCT_ID_STRING:
+ id_string = tvb_get_string (tvb, offset, (gint) dmp_struct_length);
+ g_snprintf (dmp.struct_id, MAX_STRUCT_ID_LEN, "%s", id_string);
+ g_free (id_string);
+ tf = proto_tree_add_item (body_tree, hf_message_bodyid_string, tvb,
+ offset, dmp_struct_length, FALSE);
+ break;
+
+ case STRUCT_ID_ZSTRING:
+ id_string = tvb_get_stringz (tvb, offset, &length);
+ g_snprintf (dmp.struct_id, MAX_STRUCT_ID_LEN, "%s", id_string);
+ g_free (id_string);
+ tf = proto_tree_add_item (body_tree, hf_message_bodyid_zstring, tvb,
+ offset, length, FALSE);
+ break;
+ }
+}
+
+/*
+ * 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 _U_,
+ proto_tree *dmp_tree, gint offset)
+{
+ tvbuff_t *next_tvb = NULL;
+ proto_tree *message_tree = NULL;
+ proto_tree *field_tree = NULL;
+ proto_item *en = NULL, *tf = NULL;
+ guint8 message, eit = 0, compr_alg = ALGORITHM_NONE;
+ guint8 *subject = NULL;
+ gint len, boffset = offset;
+
+ en = proto_tree_add_item (dmp_tree, hf_message, tvb, offset, -1, FALSE);
+ message_tree = proto_item_add_subtree (en, ett_message);
+
+ if (dmp.body_format == FREE_TEXT_SUBJECT) {
+ len = tvb_strsize (tvb, offset);
+ if (dmp_subject_as_id) {
+ subject = tvb_get_string (tvb, offset, len);
+ g_snprintf (dmp.struct_id, MAX_STRUCT_ID_LEN, "%s", subject);
+ free (subject);
+ }
+ proto_tree_add_item (message_tree, hf_message_subject, tvb, offset,
+ len, FALSE);
+ 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, eit, "EIT: %s (%d)",
+ val_to_str (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, FALSE);
+ proto_item_append_text (en, ", Type: %s",
+ val_to_str (eit, eit_vals, "Unknown"));
+
+ /* Compression Algorithm */
+ tf = proto_tree_add_uint_format (message_tree, hf_message_compr,
+ tvb, offset, 1, compr_alg,
+ "Compression Algorithm: %s (%d)",
+ val_to_str (compr_alg, compression_vals,
+ "Unknown"), compr_alg);
+ field_tree = proto_item_add_subtree (tf, ett_message_compr);
+ proto_tree_add_item (field_tree, hf_message_compr, tvb,
+ offset, 1, FALSE);
+ if (compr_alg == ALGORITHM_ZLIB) {
+ proto_item_append_text (en, " (compressed)");
+ }
+
+ if (message & 0x07) {
+ /* Reserved */
+ tf = proto_tree_add_uint_format (message_tree, hf_reserved_0x07,
+ tvb, offset, 1, message & 0x07,
+ "Reserved: %d", message & 0x07);
+ field_tree = proto_item_add_subtree (tf, ett_message_body_reserved);
+ proto_tree_add_item (field_tree, hf_reserved_0x07, tvb,
+ offset, 1, FALSE);
+ }
+ offset += 1;
+ }
+
+ len = tvb_length_remaining (tvb, offset);
+ if (dmp.checksum) {
+ len -= 2;
+ }
+
+ tf = proto_tree_add_uint_format (message_tree, hf_message_body, tvb,
+ offset, len, len,
+ "%sUser data, Length: %d",
+ (compr_alg == ALGORITHM_ZLIB) ?
+ "Compressed " : "", len);
+ field_tree = proto_item_add_subtree (tf, ett_message_body);
+
+ if (dmp.body_format == STRUCTURED) {
+ /* Structured Message ID */
+ dissect_dmp_structured_id (tvb, field_tree, offset);
+ proto_tree_add_item (field_tree, hf_message_body_structured, tvb, offset,
+ len, FALSE);
+ } else if (len > 0 && (dmp.body_format == FREE_TEXT ||
+ dmp.body_format == FREE_TEXT_SUBJECT)) {
+ if (compr_alg == ALGORITHM_ZLIB) {
+ if ((next_tvb = tvb_uncompress (tvb, offset, len)) != NULL) {
+ gint zlen = tvb_length (next_tvb);
+ add_new_data_source (pinfo, next_tvb, "Uncompressed User data");
+ tf = proto_tree_add_uint_format (message_tree,
+ hf_message_body_uncompr,
+ next_tvb, 0, zlen, zlen,
+ "Uncompressed User data, "
+ "Length: %d", zlen);
+ field_tree = proto_item_add_subtree (tf, ett_message_body_uncompr);
+ proto_tree_add_item (field_tree, hf_message_body_uncompressed,
+ next_tvb, 0, -1, FALSE);
+ } else {
+ proto_tree_add_text (message_tree, tvb, offset, -1,
+ "Error: Unable to uncompress content");
+ }
+ } else if (eit != EIT_BILATERAL) {
+ proto_tree_add_item (field_tree, hf_message_body_plain, tvb,
+ offset, len, FALSE);
+ }
+ }
+ offset += len;
+
+ if (dmp.struct_id[0] != 0) {
+ proto_item_append_text (en, ", Id: %s", dmp.struct_id);
+ }
+
+ 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 _U_,
+ 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;
+ time_t secs = 0;
+ gint len, boffset = offset;
+ gint rep_type = 0;
+
+ report = tvb_get_guint8 (tvb, offset);
+ rep_type = (report & 0x80) >> 7;
+ en = proto_tree_add_uint_format (dmp_tree, hf_report, tvb, offset, 4,
+ 0, "%s (#%d)", rep_type ?
+ report_type.true_string :
+ report_type.false_string, 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, rep_type,
+ "Report Type: %s", rep_type ?
+ report_type.true_string :
+ report_type.false_string);
+ field_tree = proto_item_add_subtree (tf, ett_report_type);
+ proto_tree_add_item (field_tree, hf_report_type, tvb, offset,
+ 1, FALSE);
+
+ 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 & 0x40,
+ "Info Present: %s", (report & 0x40) ?
+ present_values.true_string :
+ present_values.false_string);
+ 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, FALSE);
+
+ /* 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 & 0x20,
+ "Address Encoding: %s",
+ (report & 0x20) ?
+ addr_enc.true_string :
+ addr_enc.false_string);
+ 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, FALSE);
+
+ if (report & 0x1F) {
+ /* Reserved */
+ tf = proto_tree_add_uint_format (report_tree, hf_reserved_0x1F,
+ tvb, offset, 1, report & 0x1F,
+ "Reserved: %d", report & 0x1F);
+ field_tree = proto_item_add_subtree (tf, ett_report_reserved);
+ proto_tree_add_item (field_tree, hf_reserved_0x1F, tvb, offset,
+ 1, FALSE);
+ }
+ offset += 1;
+
+ /* Delivery Time */
+ report = tvb_get_guint8 (tvb, offset);
+ secs = dmp_dec_del_time (report);
+ 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, tvb,
+ offset, 1, FALSE);
+ if (secs == -2) {
+ proto_item_append_text (tf, "Reserved (0x%2.2x)", report);
+ proto_item_append_text (ei, ", (Reserved)");
+ } else if (secs == 0) {
+ proto_item_append_text (tf, "0 seconds");
+ proto_item_append_text (ei, " (0 seconds)");
+ } else {
+ proto_item_append_text (tf, "%s (offset from the original message"
+ " submission time)", time_secs_to_str (secs));
+ proto_item_append_text (ei, " (%s)", time_secs_to_str (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 & 0x40,
+ "Address Encoding: %s",
+ (report & 0x40) ?
+ addr_enc.true_string :
+ addr_enc.false_string);
+ 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, FALSE);
+
+ /* Reason */
+ tf = proto_tree_add_uint_format (report_tree, hf_report_reason,
+ tvb, offset, 1, report,
+ "Reason%s: %s (%d)",
+ ((report & 0x3F) < 0x3D) ? " (X.411)":"",
+ 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, FALSE);
+ 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 & 0x80,
+ "Info Present: %s", (report & 0x80) ?
+ present_values.true_string :
+ present_values.false_string);
+ 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, FALSE);
+
+ /* Diagnostic */
+ tf = proto_tree_add_uint_format (report_tree, hf_report_diagn,
+ tvb, offset, 1, report,
+ "Diagnostic%s: %s (%d)",
+ ((report & 0x7F) < 0x7C) ? " (X.411)":"",
+ 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, FALSE);
+ }
+ 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, FALSE);
+ }
+ 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, *tf = NULL;
+ guint8 notif, rec_time, on_type = 0xFF;
+ gint len, boffset = offset;
+ time_t secs = 0;
+
+ en = proto_tree_add_uint_format (dmp_tree, hf_notif, tvb, offset, 4,
+ 0, "%s", val_to_str (dmp.notif_type,
+ notif_type, ""));
+ 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);
+ proto_tree_add_item (field_tree, hf_notif_rec_time_val, tvb,
+ offset, 1, FALSE);
+ secs = dmp_dec_exp_time (rec_time);
+ if (rec_time == 0) {
+ proto_item_append_text (tf, "Not present");
+ } else if (secs == -1 || secs == -2) {
+ proto_item_append_text (tf, "Reserved (0x%2.2x)", rec_time);
+ } else {
+ proto_item_append_text (tf, "%s (offset from the original message"
+ " submission time)", time_secs_to_str (secs));
+ }
+ offset += 1;
+
+ if (dmp.notif_type == ON) {
+ /* ON Type */
+ on_type = tvb_get_guint8 (tvb, offset);
+ proto_tree_add_item (notif_tree, hf_notif_on_type, tvb, offset,
+ 1, FALSE);
+ 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, FALSE);
+ }
+ offset += len;
+
+ if ((dmp.notif_type == ON) && (on_type < 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, FALSE);
+ }
+ 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) ? " (X.420)" : "",
+ 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) ? " (X.420)" : "",
+ discard_reason_str (notif), notif);
+ offset += 1;
+ }
+
+ 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
+ * 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 _U_,
+ proto_tree *dmp_tree, gint offset)
+{
+ proto_tree *message_tree = NULL;
+ proto_tree *field_tree = NULL;
+ proto_item *en = NULL, *tf = NULL;
+ guint8 message, dmp_sec_pol, dmp_sec_class, dmp_prec, exp_time, dtg;
+ time_t secs = 0;
+ gchar *sec_cat = NULL;
+ guint prev_rec_no = 0;
+ gint rep_len, rep_no = 1;
+ gint boffset = offset;
+
+ if (dmp.msg_type == REPORT) {
+ en = proto_tree_add_item (dmp_tree, hf_content_report, tvb, offset,
+ 7, FALSE);
+ } else {
+ en = proto_tree_add_item (dmp_tree, hf_content, tvb, offset, 7, FALSE);
+ }
+ 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, dmp.st_type,
+ "Message Type: %s (%d)",
+ val_to_str (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, FALSE);
+
+ if ((message & 0x20) >> 5) {
+ /* Reserved */
+ tf = proto_tree_add_uint_format (message_tree, hf_reserved_0x20,
+ tvb, offset, 1, (message & 0x20)>>5,
+ "Reserved: %d", (message & 0x20)>>5);
+ field_tree = proto_item_add_subtree (tf, ett_message_reserved);
+ proto_tree_add_item (field_tree, hf_reserved_0x20, tvb, offset,
+ 1, FALSE);
+ }
+
+ /* Precedence */
+ dmp_prec = (message & 0x1C) >> 2;
+ tf = proto_tree_add_uint_format (message_tree, hf_message_precedence,
+ tvb, offset, 1, dmp_prec,
+ "Precedence: %s (%d)",
+ val_to_str (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, FALSE);
+
+ } else {
+ if ((message & 0xE0) >> 5) {
+ /* Reserved */
+ tf = proto_tree_add_uint_format (message_tree, hf_reserved_0xE0,
+ tvb, offset, 1, (message & 0xE0)>>5,
+ "Reserved: %d", (message & 0xE0)>>5);
+ field_tree = proto_item_add_subtree (tf, ett_message_reserved);
+ proto_tree_add_item (field_tree, hf_reserved_0xE0, tvb, offset,
+ 1, FALSE);
+ }
+
+ /* Importance */
+ dmp_prec = (message & 0x1C) >> 2;
+ tf = proto_tree_add_uint_format (message_tree, hf_message_importance,
+ tvb, offset, 1, dmp_prec,
+ "Importance: %s (%d)",
+ val_to_str (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, FALSE);
+ }
+
+ /* Body Format */
+ tf = proto_tree_add_uint_format (message_tree, hf_message_body_format,
+ tvb, offset, 1, message & 0x03,
+ "Body Format: %s (%d)",
+ val_to_str (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, FALSE);
+ 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 == NATO || dmp_sec_pol == NATIONAL) {
+ /* NATO or National security policy */
+ tf = proto_tree_add_uint_format (message_tree, hf_message_sec_class_nat,
+ tvb, offset, 1, dmp_sec_class,
+ "Security Classification: %s (%d)",
+ val_to_str (dmp_sec_class,
+ sec_class, "Unknown"),
+ dmp_sec_class);
+ field_tree = proto_item_add_subtree (tf, ett_message_sec_class);
+ proto_tree_add_item (field_tree, hf_message_sec_class_nat, tvb, offset,
+ 1, FALSE);
+
+ proto_item_append_text (en, ", Security Label: %s",
+ val_to_str (dmp_sec_class, sec_class, "Unknown"));
+ } else {
+ tf = proto_tree_add_uint_format (message_tree, hf_message_sec_class_val,
+ tvb, offset, 1, dmp_sec_class,
+ "Security Classification: %d",
+ dmp_sec_class);
+ field_tree = proto_item_add_subtree (tf, ett_message_sec_class);
+ proto_tree_add_item (field_tree, hf_message_sec_class_val, tvb, offset,
+ 1, FALSE);
+ }
+
+ /* Security Policy */
+ tf = proto_tree_add_uint_format (message_tree, hf_message_sec_pol,
+ tvb, offset, 1, dmp_sec_pol,
+ "Security Policy: %s (%d)",
+ val_to_str (dmp_sec_pol, sec_pol, ""),
+ 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, FALSE);
+
+ 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, FALSE);
+ field_tree = proto_item_add_subtree (tf, ett_message_heading_flags);
+ proto_tree_add_item (field_tree, hf_message_auth_users, tvb, offset,
+ 1, FALSE);
+ proto_tree_add_item (field_tree, hf_message_subject_disc, tvb, offset,
+ 1, FALSE);
+ 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, dmp.notif_type,
+ "Notification Type: %s",
+ val_to_str (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, FALSE);
+ } else if (message & 0x02) {
+ /* Reserved */
+ tf = proto_tree_add_uint_format (message_tree, hf_reserved_0x02,
+ tvb, offset, 1, message & 0x02,
+ "Reserved: %d", message & 0x02);
+ field_tree = proto_item_add_subtree (tf, ett_message_reserved);
+ proto_tree_add_item (field_tree, hf_reserved_0x02, tvb, offset,
+ 1, FALSE);
+ }
+ offset += 1;
+
+ if (dmp_sec_pol == EXTENDED_NATIONAL) {
+ /* National Policy Identifier */
+ proto_tree_add_item (message_tree, hf_message_national_policy_id,
+ tvb, offset, 1, FALSE);
+ 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 (message_tree, hf_message_mission_policy_id,
+ tvb, offset, 1, message,
+ "Mission Policy Identifier: Reserved");
+ } else {
+ proto_tree_add_item (message_tree, hf_message_mission_policy_id,
+ tvb, offset, 1, FALSE);
+ }
+ offset += 1;
+ }
+
+ /* Security Categories */
+ message = tvb_get_guint8 (tvb, offset);
+ if (dmp_sec_pol == NATO || dmp_sec_pol == NATIONAL) {
+ tf = proto_tree_add_item (message_tree, hf_message_sec_cat_nat, tvb,
+ offset, 1, FALSE);
+ field_tree = proto_item_add_subtree (tf, ett_message_sec_cat);
+
+ proto_tree_add_item (field_tree, hf_message_sec_cat_cl, tvb, offset,
+ 1, FALSE);
+ proto_tree_add_item (field_tree, hf_message_sec_cat_cs, tvb, offset,
+ 1, FALSE);
+ proto_tree_add_item (field_tree, hf_message_sec_cat_ex, tvb, offset,
+ 1, FALSE);
+ proto_tree_add_item (field_tree, hf_message_sec_cat_ne, tvb, offset,
+ 1, FALSE);
+ proto_tree_add_item (field_tree, hf_reserved_0x08, tvb, offset,
+ 1, FALSE);
+ proto_tree_add_item (field_tree, hf_reserved_0x04, tvb, offset,
+ 1, FALSE);
+ proto_tree_add_item (field_tree, hf_reserved_0x02, tvb, offset,
+ 1, FALSE);
+ proto_tree_add_item (field_tree, hf_reserved_0x01, tvb, offset,
+ 1, FALSE);
+
+ if (message & 0xF0) {
+ sec_cat = ep_alloc (MAX_SEC_CAT_LEN);
+ sec_cat[0] = 0;
+ g_snprintf (sec_cat, 32 + 1, "%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]);
+ proto_item_append_text (en, "%s", sec_cat);
+ }
+ } else {
+ tf = proto_tree_add_item (message_tree, hf_message_sec_cat_val, tvb,
+ offset, 1, FALSE);
+ 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, FALSE);
+ proto_tree_add_item (field_tree, hf_message_sec_cat_bit6, tvb, offset,
+ 1, FALSE);
+ proto_tree_add_item (field_tree, hf_message_sec_cat_bit5, tvb, offset,
+ 1, FALSE);
+ proto_tree_add_item (field_tree, hf_message_sec_cat_bit4, tvb, offset,
+ 1, FALSE);
+ proto_tree_add_item (field_tree, hf_message_sec_cat_bit3, tvb, offset,
+ 1, FALSE);
+ proto_tree_add_item (field_tree, hf_message_sec_cat_bit2, tvb, offset,
+ 1, FALSE);
+ proto_tree_add_item (field_tree, hf_message_sec_cat_bit1, tvb, offset,
+ 1, FALSE);
+ proto_tree_add_item (field_tree, hf_message_sec_cat_bit0, tvb, offset,
+ 1, FALSE);
+ }
+ offset += 1;
+
+ if (dmp.msg_type == STANAG || dmp.msg_type == IPM) {
+ 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);
+ proto_tree_add_item (field_tree, hf_message_exp_time_val, tvb,
+ offset, 1, FALSE);
+ secs = dmp_dec_exp_time (exp_time);
+ if (exp_time == 0) {
+ proto_item_append_text (tf, "Not present");
+ } else if (secs == -1 || secs == -2) {
+ proto_item_append_text (tf, "Reserved (0x%2.2x)", exp_time);
+ } else {
+ proto_item_append_text (tf, "%s (%s)", time_secs_to_str (secs),
+ abs_time_secs_to_str (dmp.subm_time + 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, FALSE);
+ proto_tree_add_item (field_tree, hf_message_dtg_val, tvb, offset,
+ 1, FALSE);
+ secs = dmp_dec_dtg (dtg & 0x7F);
+ if (dtg == 0) {
+ proto_item_append_text (tf, "Not present");
+ } else if (secs == -1 || secs == -2) {
+ 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)",
+ (dtg & 0x80) ? dtg_sign.true_string :
+ dtg_sign.false_string,
+ abs_time_secs_to_str (dmp.subm_time));
+ } else {
+ proto_item_append_text (tf, "%s in the %s (%s)", time_secs_to_str(secs),
+ (dtg & 0x80) ? dtg_sign.true_string :
+ dtg_sign.false_string, (dtg & 0x80) ?
+ abs_time_secs_to_str (dmp.subm_time + secs) :
+ abs_time_secs_to_str (dmp.subm_time - secs));
+ }
+ offset += 1;
+ }
+
+ if (dmp.msg_type == STANAG) {
+ /* SIC */
+ offset = dissect_dmp_sic (tvb, message_tree, offset);
+ } else if (dmp.msg_type == REPORT || dmp.msg_type == NOTIF) {
+ /* Subject Message Identifier */
+ dmp.subj_id = tvb_get_ntohs (tvb, offset);
+ proto_tree_add_item (message_tree, hf_message_subj_id, tvb, offset,
+ 2, FALSE);
+ offset += 2;
+ }
+
+ 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_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 void dissect_dmp (tvbuff_t *tvb, packet_info *pinfo _U_ ,
+ proto_tree *tree)
+{
+ proto_tree *dmp_tree = NULL;
+ proto_item *ti = NULL, *en = NULL;
+ guint16 checksum1 = 0, checksum2 = 1;
+ gint length, offset = 0;
+
+ if (check_col (pinfo->cinfo, COL_PROTOCOL))
+ col_set_str (pinfo->cinfo, COL_PROTOCOL, "DMP");
+
+ if (check_col (pinfo->cinfo, COL_INFO))
+ col_clear (pinfo->cinfo, COL_INFO);
+
+ /* Initialize global data structure */
+ memset (&dmp, 0, sizeof (dmp));
+ dmp.struct_id = ep_alloc (MAX_STRUCT_ID_LEN);
+ dmp.struct_id[0] = 0;
+
+ ti = proto_tree_add_item (tree, proto_dmp, tvb, offset, -1, FALSE);
+ dmp_tree = proto_item_add_subtree (ti, ett_dmp);
+
+ offset = dissect_dmp_envelope (tvb, pinfo, dmp_tree, offset);
+
+ if (dmp.version > DMP_VERSION) {
+ /* Unsupported DMP Version, no point to continue */
+ if (check_col (pinfo->cinfo, COL_INFO)) {
+ col_add_fstr (pinfo->cinfo, COL_INFO, "Unsupported Version: %d",
+ dmp.version);
+ }
+ return;
+ }
+
+ 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_length (tvb);
+ checksum1 = crc16_x25_ccitt_tvb (tvb, length - 2);
+ checksum2 = tvb_get_ntohs (tvb, offset);
+
+ en = proto_tree_add_item (dmp_tree, hf_checksum, tvb, offset,
+ 2, FALSE);
+ if (checksum1 == checksum2) {
+ proto_item_append_text (en, " (correct)");
+ } else {
+ proto_item_append_text (en, " (incorrect, should be 0x%04x)",
+ checksum1);
+ }
+ }
+
+ if (check_col (pinfo->cinfo, COL_INFO)) {
+ if (dmp_align) {
+ col_add_fstr (pinfo->cinfo, COL_INFO, "%-30.30s", msg_type_to_str ());
+ } else {
+ col_add_fstr (pinfo->cinfo, COL_INFO, "%s", msg_type_to_str ());
+ }
+ if ((dmp.msg_type == STANAG) || (dmp.msg_type == IPM) ||
+ (dmp.msg_type == REPORT) || (dmp.msg_type == NOTIF))
+ {
+ if (dmp_align) {
+ 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);
+ }
+ } else if (dmp.msg_type == ACK) {
+ if (dmp_align) {
+ /* Append spaces to align subj_id */
+ col_append_fstr (pinfo->cinfo, COL_INFO, " ");
+ }
+ }
+ if ((dmp.msg_type == REPORT) || (dmp.msg_type == NOTIF) ||
+ (dmp.msg_type == ACK))
+ {
+ if (dmp_align) {
+ 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);
+ }
+ } else if (dmp.struct_id[0] != 0) {
+ if (dmp_align) {
+ col_append_fstr (pinfo->cinfo, COL_INFO, " Body Id: %s",
+ dmp.struct_id);
+ } else {
+ col_append_fstr (pinfo->cinfo, COL_INFO, ", Body Id: %s",
+ dmp.struct_id);
+ }
+ }
+ if (dmp.checksum && (checksum1 != checksum2)) {
+ col_append_fstr (pinfo->cinfo, COL_INFO, ", Checksum incorrect");
+ }
+ }
+
+ proto_item_append_text (ti, ", Version: %d, %s", dmp.version,
+ msg_type_to_str());
+}
+
+void proto_register_dmp (void)
+{
+ static hf_register_info hf[] = {
+ /*
+ ** Envelope
+ */
+ { &hf_envelope,
+ { "Envelope", "dmp.envelope", FT_NONE, BASE_DEC,
+ NULL, 0x0, "Envelope", HFILL}},
+
+ /* Protocol data */
+ { &hf_envelope_protocol_id,
+ { "Protocol Identifier", "dmp.envelope.protocol.id", FT_UINT8,
+ BASE_HEX, NULL, 0xF8, "Protocol Identifier", HFILL}},
+ { &hf_envelope_version,
+ { "Protocol Version", "dmp.envelope.version", FT_UINT8, BASE_DEC,
+ VALS(version_vals), 0x07, "Protocol Version", HFILL } },
+
+ /* Envelope elements (byte 1) */
+ { &hf_envelope_hop_count,
+ { "Hop Count", "dmp.envelope.hop_count", FT_UINT8, BASE_DEC,
+ NULL, 0xE0, "Hop Count", HFILL } },
+ { &hf_envelope_rec_present,
+ { "Recipient Present", "dmp.envelope.rec_present", FT_BOOLEAN, 8,
+ TFS (&present_values), 0x20, "Recipient Present", HFILL } },
+ { &hf_envelope_addr_enc,
+ { "Address Encoding", "dmp.envelope.addr_encoding", FT_BOOLEAN, 8,
+ TFS (&addr_enc), 0x10, "Address Encoding", HFILL } },
+ { &hf_envelope_checksum,
+ { "Checksum", "dmp.envelope.checksum", FT_BOOLEAN, 8,
+ TFS (&checksum), 0x08, "Checksum", HFILL } },
+ { &hf_envelope_type,
+ { "Content Type", "dmp.envelope.type", FT_UINT8, BASE_DEC,
+ VALS(type_vals), 0x07, "Content Type", HFILL } },
+
+ /* Message identifier */
+ { &hf_envelope_msg_id,
+ { "Message Identifier", "dmp.envelope.msg_id", FT_UINT16, BASE_DEC,
+ NULL, 0x0, "Message identifier", HFILL}},
+
+ /* Submission time */
+ { &hf_envelope_subm_time,
+ { "Submission Time", "dmp.envelope.subm_time", FT_UINT16, BASE_HEX,
+ NULL, 0x0, "Submission Time", HFILL } },
+ { &hf_envelope_time_diff_present,
+ { "Time Diff", "dmp.envelope.time_diff_present", FT_BOOLEAN, 16,
+ TFS (&present_values), 0x8000, "Time Diff Present", HFILL } },
+ { &hf_envelope_subm_time_value,
+ { "Submission Time Value", "dmp.envelope.subm_time.current", FT_UINT16,
+ BASE_HEX, NULL, 0x7FFF, "Submission Time Value", HFILL } },
+ { &hf_envelope_time_diff,
+ { "Time Difference", "dmp.envelope.time_diff", FT_UINT8, BASE_HEX,
+ NULL, 0xFF, "Time Difference", HFILL } },
+ { &hf_envelope_time_diff_value,
+ { "Time Difference Value", "dmp.envelope.time_diff.current", FT_UINT8,
+ BASE_HEX, NULL, 0xFF, "Time Difference Value", 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.envelope.cont_id_discarded",
+ FT_BOOLEAN, 8, TFS(&yes_no), 0x80,
+ "Content identifier discarded", HFILL } },
+ { &hf_envelope_recip_reassign_prohib,
+ { "Recipient reassign prohibited","dmp.envelope.recip_reassign_prohib",
+ FT_BOOLEAN, 8, TFS(&yes_no), 0x40,
+ "Recipient Reassign prohibited", HFILL }},
+ { &hf_envelope_dl_expansion_prohib,
+ { "DL expansion prohibited", "dmp.envelope.dl_expansion_prohib",
+ FT_BOOLEAN, 8, TFS(&yes_no), 0x20, "DL expansion prohibited",
+ HFILL } },
+
+ /* Recipient Count */
+ { &hf_envelope_recipients,
+ { "Recipient Count", "dmp.envelope.rec_count", FT_UINT8, BASE_DEC,
+ NULL, 0x1F, "Recipient Count", HFILL}},
+ { &hf_envelope_ext_recipients,
+ { "Extended Recipient Count", "dmp.envelope.ext_rec_count", FT_UINT16,
+ BASE_DEC, NULL, 0x7FFF, "Extended Recipient Count", HFILL}},
+
+ /*
+ ** Address
+ */
+ { &hf_addr_recipient,
+ { "Recipient Number", "dmp.envelope.recipient", FT_NONE, BASE_NONE,
+ NULL, 0x0, "Recipient", HFILL } },
+ { &hf_addr_originator,
+ { "Originator", "dmp.envelope.originator", FT_NONE, BASE_NONE,
+ NULL, 0x0, "Originator", HFILL } },
+ { &hf_addr_reporting_name,
+ { "Reporting Name Number", "dmp.envelope.reporting_name", FT_NONE,
+ BASE_NONE, NULL, 0x0, "Reporting Name", HFILL } },
+
+ /*
+ ** Address Direct
+ */
+ { &hf_addr_dir_addr_ext,
+ { "Address Extended", "dmp.address.addr_ext", FT_BOOLEAN, 8,
+ NULL, 0x80, "Address Extended", HFILL } },
+ { &hf_addr_dir_rec_no,
+ { "Recipient Number (bits 3-0)", "dmp.address.rec_no1", FT_UINT8,
+ BASE_DEC, NULL, 0xF0, "Recipient Number (bits 3-0) Offset", HFILL } },
+ { &hf_addr_dir_rec_no_ext1,
+ { "Recipient Number (bits 9-4)", "dmp.address.rec_no2", FT_UINT8,
+ BASE_DEC, NULL, 0x3F, "Recipient Number (bits 9-4) Offset", HFILL } },
+ { &hf_addr_dir_rec_no_ext2,
+ { "Recipient Number (bits 14-10)", "dmp.address.rec_no3", FT_UINT8,
+ BASE_DEC, NULL, 0x1F, "Recipient Number (bits 14-10) Offset",HFILL } },
+ { &hf_addr_dir_rep_req1,
+ { "Report Request 1", "dmp.address.rep_rec1", FT_UINT8, BASE_HEX,
+ VALS (report_vals_ext), 0x0C, "Report Request 1", HFILL } },
+ { &hf_addr_dir_rep_req2,
+ { "Report Request 2", "dmp.address.rep_rec2", FT_UINT8, BASE_HEX,
+ VALS (report_vals_ext), 0xC0, "Report Request 2", HFILL } },
+ { &hf_addr_dir_rep_req3,
+ { "Report Request 3", "dmp.address.rep_rec3", FT_UINT8, BASE_HEX,
+ VALS (report_vals), 0xC0, "Report Request 3", HFILL } },
+ { &hf_addr_dir_not_req1,
+ { "Notification Request 1", "dmp.address.not_req1", FT_UINT8, BASE_HEX,
+ VALS (notif_vals_ext), 0x03, "Notification Request 1", HFILL } },
+ { &hf_addr_dir_not_req2,
+ { "Notification Request 2", "dmp.address.not_req2", FT_UINT8, BASE_HEX,
+ VALS (notif_vals_ext), 0xC0, "Notification Request 2", HFILL } },
+ { &hf_addr_dir_not_req3,
+ { "Notification Request 3", "dmp.address.not_req3", FT_UINT8, BASE_HEX,
+ VALS (notif_vals), 0xC0, "Notification Request 3", HFILL } },
+ { &hf_addr_dir_action,
+ { "Action", "dmp.address.action", FT_BOOLEAN, 8,
+ TFS (&yes_no), 0x80, "Action", HFILL } },
+ { &hf_addr_dir_address,
+ { "Direct Address (bits 6-0)", "dmp.address.direct1", FT_UINT8,
+ BASE_DEC, NULL, 0x7F, "Direct Address (bits 6-0)", HFILL } },
+ { &hf_addr_dir_address_ext1,
+ { "Direct Address (bits 12-7)", "dmp.address.direct2", FT_UINT8,
+ BASE_DEC, NULL, 0x3F, "Direct Address (bits 12-7)", HFILL } },
+ { &hf_addr_dir_address_ext2,
+ { "Direct Address (bits 18-13)", "dmp.address.direct3", FT_UINT8,
+ BASE_DEC, NULL, 0x3F, "Direct Address (bits 18-13)", HFILL } },
+
+ /*
+ ** Address Extended
+ */
+ { &hf_addr_ext_form,
+ { "Address Form", "dmp.address.addr_form", FT_UINT8, BASE_DEC,
+ VALS (&addr_form), 0xE0, "Address Form", HFILL } },
+ { &hf_addr_ext_action,
+ { "Action", "dmp.address.action", FT_BOOLEAN, 8,
+ TFS (&yes_no), 0x10, "Action", HFILL } },
+ { &hf_addr_ext_rep_req,
+ { "Report Request", "dmp.address.rep_rec3", FT_UINT8, BASE_HEX,
+ VALS (report_vals), 0x0C, "Report Request 3", HFILL } },
+ { &hf_addr_ext_not_req,
+ { "Notification Request", "dmp.address.not_req3", FT_UINT8, BASE_HEX,
+ VALS (notif_vals), 0x03, "Notification Request 3", HFILL } },
+ { &hf_addr_ext_rec_ext,
+ { "Recipient Number Extended", "dmp.address.rec_no_ext", FT_BOOLEAN, 8,
+ NULL, 0x80, "Recipient Number Extended", HFILL } },
+ { &hf_addr_ext_rec_no,
+ { "Recipient Number (bits 6-0)", "dmp.address.rec_no1", FT_UINT8,
+ BASE_DEC, NULL, 0x7F, "Recipient Number (bits 6-0) Offset", HFILL } },
+ { &hf_addr_ext_rec_no_ext1,
+ { "Recipient Number (bits 14-7)", "dmp.address.rec_no2", FT_UINT8,
+ BASE_DEC, NULL, 0xFF, "Recipient Number (bits 14-7) Offset", HFILL } },
+ { &hf_addr_ext_address,
+ { "Extended Address", "dmp.address.addr_form", FT_NONE, BASE_NONE,
+ NULL, 0x0, "Extended Address", HFILL } },
+ { &hf_addr_ext_type,
+ { "Address Type", "dmp.address.addr_type", FT_UINT8, BASE_DEC,
+ VALS (&ext_addr_type), 0xE0, "Address Type", HFILL } },
+ { &hf_addr_ext_type_ext,
+ { "Address Type Extended", "dmp.address.addr_type_ext", FT_UINT8,
+ BASE_DEC, VALS (&ext_addr_type_ext), 0xE0, "Address Type Extended",
+ HFILL } },
+ { &hf_addr_ext_length,
+ { "Address Length (bits 4-0)", "dmp.address.addr_length", FT_UINT8,
+ BASE_DEC, NULL, 0x1F, "Address Length (bits 4-0)", HFILL } },
+ { &hf_addr_ext_length_ext,
+ { "Address Length (bits 9-5)", "dmp.address.addr_length_ext", FT_UINT8,
+ BASE_DEC, NULL, 0x1F, "Address Length (bits 9-5)", HFILL } },
+ { &hf_addr_ext_asn1_ber,
+ { "ASN.1 BER-encoded OR-name", "dmp.message.or_name", FT_NONE,
+ BASE_NONE, NULL, 0x0, "ASN.1 BER-encoded OR-name", HFILL } },
+ { &hf_addr_ext_asn1_per,
+ { "ASN.1 PER-encoded OR-name", "dmp.message.asn1_per", FT_BYTES,
+ BASE_DEC, NULL, 0x0, "ASN.1 PER-encoded OR-name", HFILL } },
+ { &hf_addr_ext_unknown,
+ { "Unknown encoded address", "dmp.message.unknown", FT_BYTES,
+ BASE_DEC, NULL, 0x0, "Unknown encoded address", HFILL } },
+
+ /*
+ ** Message content
+ */
+ { &hf_content,
+ { "Message Content", "dmp.message", FT_NONE, BASE_DEC,
+ NULL, 0x0, "Message Content", HFILL } },
+ { &hf_content_report,
+ { "Report Content", "dmp.message", FT_NONE, BASE_DEC,
+ NULL, 0x0, "Report Content", HFILL } },
+
+ { &hf_message_st_type,
+ { "Message type", "dmp.message.type", FT_UINT8, BASE_DEC,
+ VALS (message_type_vals), 0xC0, "Message type", HFILL } },
+ { &hf_message_precedence,
+ { "Precedence", "dmp.message.precedence", FT_UINT8, BASE_DEC,
+ VALS (precedence), 0x1C, "Precedence", HFILL } },
+ { &hf_message_importance,
+ { "Importance", "dmp.message.importance", FT_UINT8, BASE_DEC,
+ VALS (importance), 0x1C, "Importance", HFILL } },
+ { &hf_message_body_format,
+ { "Body format", "dmp.message.body_format", FT_UINT8, BASE_DEC,
+ VALS (body_format_vals), 0x03, "Body format", HFILL } },
+
+ /* Security Values */
+ { &hf_message_sec_class_nat,
+ { "Security Classification", "dmp.message.sec_class", FT_UINT8,
+ BASE_DEC, VALS (sec_class), 0xE0, "Security Classification", HFILL}},
+ { &hf_message_sec_class_val,
+ { "Security Classification", "dmp.message.sec_class", FT_UINT8,
+ BASE_DEC, NULL, 0xE0, "Security Classification", HFILL}},
+ { &hf_message_sec_pol,
+ { "Security Policy", "dmp.message.sec_pol", FT_UINT8, BASE_DEC,
+ VALS (sec_pol), 0x1C, "Security Policy", HFILL } },
+ { &hf_message_heading_flags,
+ { "Heading Flags", "dmp.message.heading_flags", FT_NONE, BASE_NONE,
+ NULL, 0x0, "Heading Flags", HFILL } },
+ { &hf_message_auth_users,
+ { "Authorizing users discarded", "dmp.message.auth_discarded",
+ FT_BOOLEAN, 8, TFS (&yes_no), 0x02,
+ "Authorizing users discarded", HFILL }},
+ { &hf_message_subject_disc,
+ { "Subject discarded", "dmp.message.subject_discarded", FT_BOOLEAN, 8,
+ TFS (&yes_no), 0x01, "Subject discarded", HFILL } },
+
+ /* National Policy Identifier */
+ { &hf_message_national_policy_id,
+ { "National Policy Identifier", "dmp.message.nat_pol_id", FT_UINT8,
+ BASE_DEC, VALS(nat_pol_id), 0x0, "National Policy Identifier",
+ HFILL } },
+
+ /* Mission Policy Identifier */
+ { &hf_message_mission_policy_id,
+ { "Mission Policy Identifier", "dmp.message.mission_pol_id", FT_UINT8,
+ BASE_DEC, NULL, 0x0, "Mission Policy Identifier",
+ HFILL } },
+
+ /* Security Categories */
+ { &hf_message_sec_cat_nat,
+ { "Security Categories", "dmp.message.sec_cat", FT_NONE, BASE_NONE,
+ NULL, 0x0, "Security Categories", HFILL } },
+ { &hf_message_sec_cat_val,
+ { "Security Categories", "dmp.message.sec_cat", FT_UINT8, BASE_HEX,
+ NULL, 0x0, "Security Categories", HFILL } },
+ { &hf_message_sec_cat_cl,
+ { "Clear", "dmp.message.sec_cat.cl", FT_BOOLEAN, 8,
+ TFS (&set_notset), 0x80, "Clear", HFILL } },
+ { &hf_message_sec_cat_cs,
+ { "Crypto Security", "dmp.message.sec_cat.cs", FT_BOOLEAN, 8,
+ TFS (&set_notset), 0x40, "Crypto Security", HFILL } },
+ { &hf_message_sec_cat_ex,
+ { "Exclusive", "dmp.message.sec_cat.ex", FT_BOOLEAN, 8,
+ TFS (&set_notset), 0x20, "Exclusive", HFILL } },
+ { &hf_message_sec_cat_ne,
+ { "National Eyes Only", "dmp.message.sec_cat.ne", FT_BOOLEAN, 8,
+ TFS (&set_notset), 0x10, "National Eyes Only", HFILL } },
+ { &hf_message_sec_cat_bit0,
+ { "Bit 0", "dmp.message.sec_cat.bit0", FT_BOOLEAN, 8,
+ TFS (&set_notset), 0x01, "Bit 0", HFILL } },
+ { &hf_message_sec_cat_bit1,
+ { "Bit 1", "dmp.message.sec_cat.bit1", FT_BOOLEAN, 8,
+ TFS (&set_notset), 0x02, "Bit 1", HFILL } },
+ { &hf_message_sec_cat_bit2,
+ { "Bit 2", "dmp.message.sec_cat.bit2", FT_BOOLEAN, 8,
+ TFS (&set_notset), 0x04, "Bit 2", HFILL } },
+ { &hf_message_sec_cat_bit3,
+ { "Bit 3", "dmp.message.sec_cat.bit3", FT_BOOLEAN, 8,
+ TFS (&set_notset), 0x08, "Bit 3", HFILL } },
+ { &hf_message_sec_cat_bit4,
+ { "Bit 4", "dmp.message.sec_cat.bit4", FT_BOOLEAN, 8,
+ TFS (&set_notset), 0x10, "Bit 4", HFILL } },
+ { &hf_message_sec_cat_bit5,
+ { "Bit 5", "dmp.message.sec_cat.bit5", FT_BOOLEAN, 8,
+ TFS (&set_notset), 0x20, "Bit 5", HFILL } },
+ { &hf_message_sec_cat_bit6,
+ { "Bit 6", "dmp.message.sec_cat.bit6", FT_BOOLEAN, 8,
+ TFS (&set_notset), 0x40, "Bit 6", HFILL } },
+ { &hf_message_sec_cat_bit7,
+ { "Bit 7", "dmp.message.sec_cat.bit7", FT_BOOLEAN, 8,
+ TFS (&set_notset), 0x80, "Bit 7", HFILL } },
+
+ /* Expiry Time */
+ { &hf_message_exp_time,
+ { "Expiry Time", "dmp.message.expiry_time", FT_UINT8, BASE_HEX,
+ NULL, 0x0, "Expiry Time", HFILL } },
+ { &hf_message_exp_time_val,
+ { "Expiry Time Value", "dmp.message.expiry_time_val", FT_UINT8, BASE_HEX,
+ NULL, 0xFF, "Expiry Time Value", HFILL } },
+
+ /* DTG */
+ { &hf_message_dtg,
+ { "DTG", "dmp.message.dtg", FT_UINT8, BASE_HEX,
+ NULL, 0xFF, "DTG", HFILL } },
+ { &hf_message_dtg_sign,
+ { "DTG in the", "dmp.message.dtg.sign", FT_BOOLEAN, 8, TFS (&dtg_sign),
+ 0x80, "Sign", HFILL } },
+ { &hf_message_dtg_val,
+ { "DTG Value", "dmp.message.dtg.val", FT_UINT8, BASE_HEX, NULL,
+ 0x7F, "DTG Value", HFILL } },
+
+ /* SIC */
+ { &hf_message_sic,
+ { "SIC", "dmp.message.sic", FT_STRING, BASE_DEC,
+ NULL, 0x0, "SIC", HFILL } },
+ { &hf_message_sic_key,
+ { "SICs", "dmp.message.sic_key", FT_NONE, BASE_NONE,
+ NULL, 0x0, "SIC Content", HFILL } },
+ { &hf_message_sic_key_values,
+ { "Content Byte", "dmp.message.sic_key", FT_UINT8, BASE_HEX,
+ NULL, 0x0, "SIC Content Byte", HFILL } },
+ { &hf_message_sic_key_type,
+ { "Type", "dmp.message.sic_key_type", FT_UINT8, BASE_HEX,
+ VALS (sic_key_type), 0xF0, "SIC Content Type", HFILL } },
+ { &hf_message_sic_key_chars,
+ { "Valid Characters", "dmp.message.sic_key_chars", FT_BOOLEAN, 8,
+ TFS (&sic_key_chars), 0x08, "SIC Valid Characters", HFILL } },
+ { &hf_message_sic_key_num,
+ { "Number of SICs", "dmp.message.sic_key_num", FT_UINT8, BASE_HEX,
+ VALS (sic_key_num), 0x07, "Number of SICs", HFILL } },
+ { &hf_message_sic_bitmap,
+ { "Length Bitmap (0 = 3 bytes, 1 = 4-8 bytes)", "dmp.message.sic_bitmap",
+ FT_UINT8, BASE_HEX, NULL, 0xFF, "SIC Length Bitmap", HFILL } },
+ { &hf_message_sic_bits,
+ { "Bit 7-4", "dmp.message.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.message.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.message.subj_id", FT_UINT16,
+ BASE_DEC, NULL, 0x0, "Subject Message Identifier", HFILL } },
+
+ /*
+ ** Message body
+ */
+ { &hf_message,
+ { "Message Body", "dmp.message.body", FT_NONE, BASE_DEC, NULL,
+ 0x0, "Message Body", HFILL}},
+
+ /* Body Id */
+ { &hf_message_eit,
+ { "EIT", "dmp.message.body.eit", FT_UINT8, BASE_DEC,
+ VALS(eit_vals), 0xE0, "Encoded Information Type", HFILL } },
+ { &hf_message_compr,
+ { "Compression", "dmp.message.body.compression", FT_UINT8, BASE_DEC,
+ VALS(compression_vals), 0x18, "Compression", HFILL } },
+
+ /* Subject */
+ { &hf_message_subject,
+ { "Subject", "dmp.message.subject", FT_STRINGZ, BASE_DEC,
+ NULL, 0x0, "Subject", HFILL } },
+
+ /* Message Body */
+ { &hf_message_body,
+ { "User data", "dmp.message.body", FT_UINT8, BASE_DEC,
+ NULL, 0x0, "User data", HFILL } },
+ { &hf_message_body_plain,
+ { "Message Body", "dmp.message.body", FT_STRING, BASE_DEC,
+ NULL, 0x0, "Message Body", HFILL } },
+ { &hf_message_bodyid_uint8,
+ { "Structured Id", "dmp.message.body.id", FT_UINT8, BASE_DEC,
+ NULL, 0x0, "Structured Body Id (1 byte)", HFILL } },
+ { &hf_message_bodyid_uint16,
+ { "Structured Id", "dmp.message.body.id", FT_UINT16, BASE_DEC,
+ NULL, 0x0, "Structured Body Id (2 bytes)", HFILL } },
+ { &hf_message_bodyid_uint32,
+ { "Structured Id", "dmp.message.body.id", FT_UINT32, BASE_DEC,
+ NULL, 0x0, "Structured Body Id (4 bytes)", HFILL } },
+ { &hf_message_bodyid_uint64,
+ { "Structured Id", "dmp.message.body.id", FT_UINT64, BASE_DEC,
+ NULL, 0x0, "Structured Body Id (8 bytes)", HFILL } },
+ { &hf_message_bodyid_string,
+ { "Structured Id", "dmp.message.body.id", FT_STRING, BASE_DEC,
+ NULL, 0x0, "Structured Body Id (fixed text string)", HFILL } },
+ { &hf_message_bodyid_zstring,
+ { "Structured Id", "dmp.message.body.id", FT_STRINGZ, BASE_DEC,
+ NULL, 0x0, "Structured Body Id (zero terminated text string)",
+ HFILL } },
+ { &hf_message_body_structured,
+ { "Structured Body", "dmp.message.body.structured", FT_BYTES, BASE_DEC,
+ NULL, 0x0, "Structured Body", HFILL } },
+ { &hf_message_body_uncompr,
+ { "Uncompressed User data", "dmp.message.body.uncompressed", FT_UINT8,
+ BASE_DEC, NULL, 0x0, "Uncompressed User data", HFILL } },
+ { &hf_message_body_uncompressed,
+ { "Uncompressed Message Body", "dmp.message.body.uncompressed",
+ FT_STRING, BASE_DEC, NULL, 0x0, "Uncompressed Message Body",
+ HFILL } },
+
+ /*
+ ** Report
+ */
+ { &hf_report,
+ { "Report", "dmp.report", FT_UINT8, BASE_DEC, NULL,
+ 0x0, "Reports", HFILL}},
+
+ { &hf_report_type,
+ { "Report Type", "dmp.report.type", FT_BOOLEAN, 8,
+ TFS (&report_type), 0x80, "Report Type", HFILL } },
+ { &hf_report_info_present_dr,
+ { "Info Present", "dmp.report.info_present", FT_BOOLEAN, 8,
+ TFS (&present_values), 0x40, "Info Present", HFILL } },
+ { &hf_report_addr_enc_dr,
+ { "Address Encoding", "dmp.report.addr_encoding", FT_BOOLEAN, 8,
+ TFS (&addr_enc), 0x20, "Address Encoding", HFILL } },
+ { &hf_report_del_time,
+ { "Delivery Time", "dmp.report.time", FT_UINT8, BASE_DEC,
+ NULL, 0x0, "Delivery Time", HFILL } },
+ { &hf_report_addr_enc_ndr,
+ { "Address Encoding", "dmp.report.addr_encoding", FT_BOOLEAN, 8,
+ TFS (&addr_enc), 0x40, "Address Encoding", HFILL } },
+ { &hf_report_reason,
+ { "Reason (X.411)", "dmp.report.reason", FT_UINT8, BASE_DEC,
+ VALS (x411_NonDeliveryReasonCode_vals), 0x3F,
+ "Reason", HFILL } },
+ { &hf_report_info_present_ndr,
+ { "Info Present", "dmp.report.info_present", FT_BOOLEAN, 8,
+ TFS (&present_values), 0x80, "Info Present", HFILL } },
+ { &hf_report_diagn,
+ { "Diagnostic (X.411)", "dmp.report.diagnostic", FT_UINT8, BASE_DEC,
+ VALS (x411_NonDeliveryDiagnosticCode_vals), 0x7F,
+ "Diagnostic", HFILL } },
+ { &hf_report_suppl_info_len,
+ { "Supplementary Information", "dmp.message.suppl_info_len", FT_UINT8,
+ BASE_DEC, NULL, 0x0, "Supplementary Information Length", HFILL } },
+ { &hf_report_suppl_info,
+ { "Supplementary Information", "dmp.message.suppl_info", FT_STRINGZ,
+ BASE_DEC, NULL, 0x0, "Supplementary Information", HFILL } },
+
+ /*
+ ** Notification
+ */
+ { &hf_notif,
+ { "Notification", "dmp.notification", FT_UINT8, BASE_DEC,
+ NULL, 0x0, "Notification", HFILL} },
+
+ { &hf_notif_type,
+ { "Notification Type", "dmp.notification.type", FT_UINT8, BASE_DEC,
+ VALS (notif_type), 0x03, "Notification Type", HFILL } },
+ { &hf_notif_rec_time,
+ { "Receipt Time", "dmp.notification.receipt_time", FT_UINT8, BASE_HEX,
+ NULL, 0x0, "Receipt time", HFILL } },
+ { &hf_notif_rec_time_val,
+ { "Receipt Time Value", "dmp.notification.receipt_time_val", FT_UINT8,
+ BASE_HEX, NULL, 0xFF, "Receipt Time Value", HFILL } },
+ { &hf_notif_suppl_info_len,
+ { "Supplementary Information", "dmp.notification.suppl_info_len",
+ FT_UINT8, BASE_DEC, NULL, 0x0, "Supplementary Information Length",
+ HFILL } },
+ { &hf_notif_suppl_info,
+ { "Supplementary Information", "dmp.notification.suppl_info",
+ FT_STRINGZ, BASE_DEC, NULL, 0x0, "Supplementary Information",
+ HFILL } },
+ { &hf_notif_non_rec_reason,
+ { "Non-Receipt Reason", "dmp.notification.non_rec_reason",
+ FT_UINT8, BASE_DEC, VALS (x420_NonReceiptReasonField_vals), 0x0,
+ "Non-Receipt Reason", HFILL } },
+ { &hf_notif_discard_reason,
+ { "Discard Reason", "dmp.notification.discard_reason", FT_UINT8,
+ BASE_DEC, VALS (x420_DiscardReasonField_vals), 0x0,
+ "Discard Reason", HFILL } },
+ { &hf_notif_on_type,
+ { "ON Type", "dmp.notification.on_type", FT_UINT8, BASE_DEC,
+ VALS (on_type), 0x0, "ON Type", HFILL } },
+ { &hf_notif_acp127,
+ { "ACP127 Recipient", "dmp.notification.acp127recip_len", FT_UINT8,
+ BASE_DEC, NULL, 0x0, "ACP 127 Recipient Length", HFILL } },
+ { &hf_notif_acp127recip,
+ { "ACP127 Recipient", "dmp.notification.acp127recip", FT_STRINGZ,
+ BASE_DEC, NULL, 0x0, "ACP 127 Recipient", HFILL } },
+
+ /*
+ ** Acknowledgement
+ */
+ { &hf_ack,
+ { "Acknowledgement", "dmp.ack", FT_NONE, BASE_NONE,
+ NULL, 0x0, "Acknowledgement", 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, "Recipient List", HFILL } },
+
+ /*
+ ** Checksum
+ */
+ { &hf_checksum,
+ { "Checksum", "dmp.checksum", FT_UINT16, BASE_HEX,
+ NULL, 0x0, "Checksum", HFILL } },
+
+ /*
+ ** Reserved values
+ */
+ { &hf_reserved_0x01,
+ { "Reserved", "dmp.reserved", FT_UINT8, BASE_DEC,
+ NULL, 0x01, "Reserved", HFILL } },
+ { &hf_reserved_0x02,
+ { "Reserved", "dmp.reserved", FT_UINT8, BASE_DEC,
+ NULL, 0x02, "Reserved", HFILL } },
+ { &hf_reserved_0x04,
+ { "Reserved", "dmp.reserved", FT_UINT8, BASE_DEC,
+ NULL, 0x04, "Reserved", HFILL } },
+ { &hf_reserved_0x07,
+ { "Reserved", "dmp.reserved", FT_UINT8, BASE_DEC,
+ NULL, 0x07, "Reserved", HFILL } },
+ { &hf_reserved_0x08,
+ { "Reserved", "dmp.reserved", FT_UINT8, BASE_DEC,
+ NULL, 0x08, "Reserved", HFILL } },
+ { &hf_reserved_0x0F,
+ { "Reserved", "dmp.reserved", FT_UINT8, BASE_DEC,
+ NULL, 0x0F, "Reserved", HFILL } },
+ { &hf_reserved_0x1F,
+ { "Reserved", "dmp.reserved", FT_UINT8, BASE_DEC,
+ NULL, 0x1F, "Reserved", HFILL } },
+ { &hf_reserved_0x20,
+ { "Reserved", "dmp.reserved", FT_UINT8, BASE_DEC,
+ NULL, 0x20, "Reserved", HFILL } },
+ { &hf_reserved_0x40,
+ { "Reserved", "dmp.reserved", FT_UINT8, BASE_DEC,
+ NULL, 0x40, "Reserved", HFILL } },
+ { &hf_reserved_0xC0,
+ { "Reserved", "dmp.reserved", FT_UINT8, BASE_DEC,
+ NULL, 0xC0, "Reserved", HFILL } },
+ { &hf_reserved_0xE0,
+ { "Reserved", "dmp.reserved", FT_UINT8, BASE_DEC,
+ NULL, 0xE0, "Reserved", HFILL } },
+ { &hf_reserved_0x8000,
+ { "Reserved", "dmp.reserved", FT_UINT16, BASE_DEC,
+ NULL, 0x8000, "Reserved", 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_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_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_message_body_uncompr,
+ &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
+ };
+
+ module_t *dmp_module;
+
+ proto_dmp = proto_register_protocol (PNAME, PSNAME, PFNAME);
+
+ proto_register_field_array (proto_dmp, hf, array_length (hf));
+ proto_register_subtree_array (ett, array_length (ett));
+
+ /* Register our configuration options */
+ dmp_module = prefs_register_protocol (proto_dmp, proto_reg_handoff_dmp);
+
+ prefs_register_uint_preference (dmp_module, "udp_port",
+ "Primary DMP port number",
+ "Primary port number used for DMP traffic",
+ 10, &global_dmp_port);
+ prefs_register_uint_preference (dmp_module, "udp_port_second",
+ "Secondary DMP port number",
+ "Second port number used for DMP traffic "
+ "(0 to disable)",
+ 10, &global_dmp_port_second);
+ prefs_register_bool_preference (dmp_module, "align_ids",
+ "Align identifiers in info list",
+ "Align identifiers in info list",
+ &dmp_align);
+ prefs_register_bool_preference (dmp_module, "subject_as_id",
+ "Print subject as body id",
+ "Print subject as body id in free text "
+ "messages with subject",
+ &dmp_subject_as_id);
+ prefs_register_enum_preference (dmp_module, "struct_print",
+ "Structured message id format",
+ "Format of the structured message id",
+ &dmp_struct_format, struct_id_options,
+ FALSE);
+ prefs_register_uint_preference (dmp_module, "struct_offset",
+ "Offset to structured message id",
+ "Used to set where the structured message "
+ "id starts in the User Data",
+ 10, &dmp_struct_offset);
+
+ prefs_register_uint_preference (dmp_module, "struct_length",
+ "Fixed text string length",
+ "Used to set length of fixed text string "
+ "in the structured message id format "
+ "(maximum 128 characters)",
+ 10, &dmp_struct_length);
+}
+
+void proto_reg_handoff_dmp (void)
+{
+ static int dmp_prefs_initialized = FALSE;
+ static dissector_handle_t dmp_handle;
+
+ if (!dmp_prefs_initialized) {
+ dmp_handle = create_dissector_handle (dissect_dmp, proto_dmp);
+ dmp_prefs_initialized = TRUE;
+ } else {
+ dissector_delete ("udp.port", dmp_port, dmp_handle);
+ dissector_delete ("udp.port", dmp_port_second, dmp_handle);
+ }
+
+ /* Save port number for later deletion */
+ dmp_port = global_dmp_port;
+ dmp_port_second = global_dmp_port_second;
+
+ dissector_add ("udp.port", global_dmp_port, dmp_handle);
+ dissector_add ("udp.port", global_dmp_port_second, dmp_handle);
+}
diff --git a/epan/dissectors/packet-x411.c b/epan/dissectors/packet-x411.c
index 83196bb4a8..aa8e72be99 100644
--- a/epan/dissectors/packet-x411.c
+++ b/epan/dissectors/packet-x411.c
@@ -1,6 +1,6 @@
/* Do not modify this file. */
/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
-/* .\packet-x411.c */
+/* ./packet-x411.c */
/* ../../tools/asn2wrs.py -b -e -p x411 -c x411.cnf -s packet-x411-template x411.asn */
/* Input file: packet-x411-template.c */
@@ -809,7 +809,7 @@ static int dissect_empty_result(packet_info *pinfo, proto_tree *tree, tvbuff_t *
static int
dissect_x411_MTAName(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-#line 391 "x411.cnf"
+#line 393 "x411.cnf"
tvbuff_t *mtaname = NULL;
offset = dissect_ber_restricted_string(implicit_tag, BER_UNI_TAG_IA5String,
@@ -929,7 +929,7 @@ static int dissect_token_type_identifier_impl(packet_info *pinfo, proto_tree *tr
static int
dissect_x411_TokenTypeData(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-#line 661 "x411.cnf"
+#line 663 "x411.cnf"
if(object_identifier_id)
call_ber_oid_callback(object_identifier_id, tvb, offset, pinfo, tree);
@@ -1075,7 +1075,7 @@ static const ber_choice_t Credentials_choice[] = {
static int
dissect_x411_Credentials(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-#line 669 "x411.cnf"
+#line 671 "x411.cnf"
guint32 credentials;
offset = dissect_ber_choice(pinfo, tree, tvb, offset,
@@ -1164,7 +1164,7 @@ static int dissect_privacy_mark(packet_info *pinfo, proto_tree *tree, tvbuff_t *
static int
dissect_x411_OBJECT_IDENTIFIER(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-#line 325 "x411.cnf"
+#line 327 "x411.cnf"
offset = dissect_ber_object_identifier_str(implicit_tag, pinfo, tree, tvb, offset, hf_index, &object_identifier_id);
@@ -1185,7 +1185,7 @@ static int dissect_category_type_impl(packet_info *pinfo, proto_tree *tree, tvbu
static int
dissect_x411_CategoryValue(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-#line 246 "x411.cnf"
+#line 248 "x411.cnf"
offset = dissect_unknown_ber(pinfo, tvb, offset, tree);
@@ -1379,7 +1379,7 @@ static const value_string x411_MTABindError_vals[] = {
static int
dissect_x411_MTABindError(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-#line 652 "x411.cnf"
+#line 654 "x411.cnf"
int error = -1;
offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index,
&error);
@@ -1396,7 +1396,7 @@ dissect_x411_MTABindError(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset,
static int
dissect_x411_NumericString(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-#line 480 "x411.cnf"
+#line 482 "x411.cnf"
tvbuff_t *nstring = NULL;
offset = dissect_ber_restricted_string(implicit_tag, BER_UNI_TAG_NumericString,
@@ -1434,7 +1434,7 @@ static int dissect_sub_address_impl(packet_info *pinfo, proto_tree *tree, tvbuff
static int
dissect_x411_PrintableString(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-#line 502 "x411.cnf"
+#line 504 "x411.cnf"
tvbuff_t *pstring = NULL;
char *fmt = NULL;
@@ -1517,7 +1517,7 @@ static const ber_choice_t CountryName_choice[] = {
static int
dissect_x411_CountryName(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-#line 257 "x411.cnf"
+#line 259 "x411.cnf"
gint8 class;
gboolean pc, ind_field;
gint32 tag;
@@ -1562,7 +1562,7 @@ static const ber_choice_t AdministrationDomainName_choice[] = {
static int
dissect_x411_AdministrationDomainName(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-#line 279 "x411.cnf"
+#line 281 "x411.cnf"
gint8 class;
gboolean pc, ind_field;
gint32 tag;
@@ -1608,7 +1608,7 @@ static const ber_choice_t PrivateDomainIdentifier_choice[] = {
static int
dissect_x411_PrivateDomainIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-#line 442 "x411.cnf"
+#line 444 "x411.cnf"
if(doing_address)
g_strlcat(oraddress, "/P=", MAX_ORA_STR_LEN);
@@ -1639,7 +1639,7 @@ static const ber_sequence_t GlobalDomainIdentifier_sequence[] = {
static int
dissect_x411_GlobalDomainIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-#line 549 "x411.cnf"
+#line 551 "x411.cnf"
oraddress = ep_alloc(MAX_ORA_STR_LEN); oraddress[0] = '\0';
address_item = tree;
@@ -1670,7 +1670,7 @@ static int dissect_attempted_domain(packet_info *pinfo, proto_tree *tree, tvbuff
static int
dissect_x411_LocalIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-#line 563 "x411.cnf"
+#line 565 "x411.cnf"
tvbuff_t *id = NULL;
offset = dissect_ber_restricted_string(implicit_tag, BER_UNI_TAG_IA5String,
@@ -1698,7 +1698,7 @@ static const ber_sequence_t MTSIdentifier_sequence[] = {
static int
dissect_x411_MTSIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-#line 571 "x411.cnf"
+#line 573 "x411.cnf"
doing_address = TRUE;
@@ -1729,7 +1729,7 @@ static int dissect_message_identifier(packet_info *pinfo, proto_tree *tree, tvbu
static int
dissect_x411_X121Address(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-#line 411 "x411.cnf"
+#line 413 "x411.cnf"
tvbuff_t *string = NULL;
offset = dissect_ber_restricted_string(implicit_tag, BER_UNI_TAG_NumericString,
@@ -1764,7 +1764,7 @@ static int dissect_network_address_impl(packet_info *pinfo, proto_tree *tree, tv
static int
dissect_x411_TerminalIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-#line 425 "x411.cnf"
+#line 427 "x411.cnf"
tvbuff_t *string = NULL;
offset = dissect_ber_restricted_string(implicit_tag, BER_UNI_TAG_PrintableString,
@@ -1800,7 +1800,7 @@ static const ber_choice_t PrivateDomainName_choice[] = {
static int
dissect_x411_PrivateDomainName(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-#line 435 "x411.cnf"
+#line 437 "x411.cnf"
if(doing_address)
g_strlcat(oraddress, "/P=", MAX_ORA_STR_LEN);
@@ -1822,7 +1822,7 @@ static int dissect_private_domain_name_impl(packet_info *pinfo, proto_tree *tree
static int
dissect_x411_OrganizationName(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-#line 452 "x411.cnf"
+#line 454 "x411.cnf"
tvbuff_t *string = NULL;
offset = dissect_ber_restricted_string(implicit_tag, BER_UNI_TAG_PrintableString,
@@ -1923,7 +1923,7 @@ static const ber_sequence_t BuiltInStandardAttributes_sequence[] = {
static int
dissect_x411_BuiltInStandardAttributes(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-#line 588 "x411.cnf"
+#line 590 "x411.cnf"
address_item = tree;
@@ -2005,7 +2005,7 @@ static int dissect_message_sequence_number_impl(packet_info *pinfo, proto_tree *
static int
dissect_x411_T_extension_attribute_value(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-#line 250 "x411.cnf"
+#line 252 "x411.cnf"
offset=call_x411_oid_callback("x411.extension-attribute", tvb, offset, pinfo, tree);
@@ -2062,7 +2062,7 @@ static const ber_sequence_t ORName_sequence[] = {
int
dissect_x411_ORName(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-#line 536 "x411.cnf"
+#line 538 "x411.cnf"
oraddress = ep_alloc(MAX_ORA_STR_LEN); oraddress[0] = '\0';
address_item = NULL;
@@ -2195,7 +2195,7 @@ static int dissect_g3_facsimile_impl(packet_info *pinfo, proto_tree *tree, tvbuf
static int
dissect_x411_TeletexString(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-#line 490 "x411.cnf"
+#line 492 "x411.cnf"
tvbuff_t *tstring = NULL;
offset = dissect_ber_restricted_string(implicit_tag, BER_UNI_TAG_TeletexString,
@@ -2349,7 +2349,7 @@ static const value_string x411_BuiltInContentType_vals[] = {
static int
dissect_x411_BuiltInContentType(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-#line 349 "x411.cnf"
+#line 351 "x411.cnf"
guint32 ict = -1;
offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index,
@@ -2384,7 +2384,7 @@ static int dissect_built_in_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t
int
dissect_x411_ExtendedContentType(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-#line 333 "x411.cnf"
+#line 335 "x411.cnf"
const char *name = NULL;
offset = dissect_ber_object_identifier_str(implicit_tag, pinfo, tree, tvb, offset, hf_index, &content_type_id);
@@ -2441,7 +2441,7 @@ static int dissect_ContentTypes_item(packet_info *pinfo, proto_tree *tree, tvbuf
static int
dissect_x411_ContentIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-#line 299 "x411.cnf"
+#line 301 "x411.cnf"
gint8 class;
gboolean pc, ind_field;
gint32 tag;
@@ -2527,7 +2527,7 @@ static int dissect_per_message_indicators(packet_info *pinfo, proto_tree *tree,
static int
dissect_x411_Time(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-#line 631 "x411.cnf"
+#line 633 "x411.cnf"
tvbuff_t *arrival = NULL;
offset = dissect_ber_restricted_string(implicit_tag, BER_UNI_TAG_UTCTime,
@@ -2666,7 +2666,7 @@ static const value_string x411_RoutingAction_vals[] = {
static int
dissect_x411_RoutingAction(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-#line 642 "x411.cnf"
+#line 644 "x411.cnf"
int action = 0;
offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index,
@@ -2742,7 +2742,7 @@ static const ber_sequence_t DomainSuppliedInformation_set[] = {
static int
dissect_x411_DomainSuppliedInformation(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-#line 610 "x411.cnf"
+#line 612 "x411.cnf"
doing_address = FALSE;
@@ -2770,7 +2770,7 @@ static const ber_sequence_t TraceInformationElement_sequence[] = {
static int
dissect_x411_TraceInformationElement(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-#line 594 "x411.cnf"
+#line 596 "x411.cnf"
doing_address = TRUE;
@@ -2853,7 +2853,7 @@ static int dissect_criticality_impl(packet_info *pinfo, proto_tree *tree, tvbuff
static int
dissect_x411_ExtensionValue(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-#line 234 "x411.cnf"
+#line 236 "x411.cnf"
const char *name;
if(extension_id != -1)
@@ -3057,7 +3057,7 @@ static int dissect_message_envelope(packet_info *pinfo, proto_tree *tree, tvbuff
static int
dissect_x411_Content(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-#line 367 "x411.cnf"
+#line 369 "x411.cnf"
tvbuff_t *next_tvb;
/* we can do this now constructed octet strings are supported */
@@ -3292,7 +3292,7 @@ static int dissect_subject_intermediate_trace_information(packet_info *pinfo, pr
static int
dissect_x411_AdditionalInformation(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-#line 228 "x411.cnf"
+#line 230 "x411.cnf"
/*XXX not implemented yet */
@@ -3376,7 +3376,7 @@ static int dissect_delivery_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t
}
-static const value_string x411_NonDeliveryReasonCode_vals[] = {
+const value_string x411_NonDeliveryReasonCode_vals[] = {
{ 0, "transfer-failure" },
{ 1, "unable-to-transfer" },
{ 2, "conversion-not-performed" },
@@ -3390,7 +3390,7 @@ static const value_string x411_NonDeliveryReasonCode_vals[] = {
};
-static int
+int
dissect_x411_NonDeliveryReasonCode(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index,
NULL);
@@ -3405,7 +3405,7 @@ static int dissect_non_delivery_reason_code_impl(packet_info *pinfo, proto_tree
}
-static const value_string x411_NonDeliveryDiagnosticCode_vals[] = {
+const value_string x411_NonDeliveryDiagnosticCode_vals[] = {
{ 0, "unrecognised-OR-name" },
{ 1, "ambiguous-OR-name" },
{ 2, "mts-congestion" },
@@ -3489,7 +3489,7 @@ static const value_string x411_NonDeliveryDiagnosticCode_vals[] = {
};
-static int
+int
dissect_x411_NonDeliveryDiagnosticCode(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index,
NULL);
@@ -3747,7 +3747,7 @@ static const ber_sequence_t MTASuppliedInformation_set[] = {
static int
dissect_x411_MTASuppliedInformation(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-#line 619 "x411.cnf"
+#line 621 "x411.cnf"
doing_address = FALSE;
@@ -3776,7 +3776,7 @@ static const ber_sequence_t InternalTraceInformationElement_sequence[] = {
static int
dissect_x411_InternalTraceInformationElement(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-#line 602 "x411.cnf"
+#line 604 "x411.cnf"
doing_address = TRUE;
@@ -4883,7 +4883,7 @@ static int dissect_built_in_argument_impl(packet_info *pinfo, proto_tree *tree,
static int
dissect_x411_T_refused_extension(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-#line 254 "x411.cnf"
+#line 256 "x411.cnf"
/*XXX not implemented yet */
@@ -5336,7 +5336,7 @@ static int dissect_standard_parameters_impl(packet_info *pinfo, proto_tree *tree
static int
dissect_x411_T_type_extensions_item(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-#line 231 "x411.cnf"
+#line 233 "x411.cnf"
/*XXX not implemented yet */
@@ -5702,7 +5702,7 @@ static const ber_sequence_t ORAddress_sequence[] = {
int
dissect_x411_ORAddress(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-#line 523 "x411.cnf"
+#line 525 "x411.cnf"
oraddress = ep_alloc(MAX_ORA_STR_LEN); oraddress[0] = '\0';
doing_address = TRUE;
@@ -6268,7 +6268,7 @@ dissect_x411_CertificateSelectors(gboolean implicit_tag _U_, tvbuff_t *tvb, int
static int
dissect_x411_CommonName(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-#line 465 "x411.cnf"
+#line 467 "x411.cnf"
tvbuff_t *string = NULL;
offset = dissect_ber_restricted_string(implicit_tag, BER_UNI_TAG_PrintableString,
@@ -6954,7 +6954,7 @@ static const ber_sequence_t MTANameAndOptionalGDI_sequence[] = {
static int
dissect_x411_MTANameAndOptionalGDI(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-#line 579 "x411.cnf"
+#line 581 "x411.cnf"
doing_address = TRUE;
@@ -7002,7 +7002,7 @@ static int dissect_name(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int
static int
dissect_x411_T_value(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-#line 679 "x411.cnf"
+#line 681 "x411.cnf"
offset=call_x411_oid_callback("x411.tokendata", tvb, offset, pinfo, tree);
diff --git a/epan/dissectors/packet-x411.h b/epan/dissectors/packet-x411.h
index 3d8862514e..438c1f5ab0 100644
--- a/epan/dissectors/packet-x411.h
+++ b/epan/dissectors/packet-x411.h
@@ -38,6 +38,8 @@ int dissect_x411_mts_apdu (tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent
/*--- Included file: packet-x411-exp.h ---*/
#line 1 "packet-x411-exp.h"
+extern const value_string x411_NonDeliveryReasonCode_vals[];
+extern const value_string x411_NonDeliveryDiagnosticCode_vals[];
int dissect_x411_SecurityContext(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index);
int dissect_x411_EncodedInformationTypesConstraints(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index);
int dissect_x411_MessageSubmissionEnvelope(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index);
@@ -46,6 +48,8 @@ int dissect_x411_ExtendedContentType(gboolean implicit_tag, tvbuff_t *tvb, int o
int dissect_x411_ContentLength(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index);
int dissect_x411_MessageDeliveryIdentifier(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index);
int dissect_x411_MessageDeliveryTime(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index);
+int dissect_x411_NonDeliveryReasonCode(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index);
+int dissect_x411_NonDeliveryDiagnosticCode(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index);
int dissect_x411_SupplementaryInformation(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index);
int dissect_x411_RequestedDeliveryMethod(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index);
int dissect_x411_OriginatingMTACertificate(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index);
diff --git a/epan/dissectors/packet-x420.c b/epan/dissectors/packet-x420.c
index 1a7b6d01b7..b12359aa81 100644
--- a/epan/dissectors/packet-x420.c
+++ b/epan/dissectors/packet-x420.c
@@ -1,6 +1,6 @@
/* Do not modify this file. */
/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
-/* .\packet-x420.c */
+/* ./packet-x420.c */
/* ../../tools/asn2wrs.py -b -e -p x420 -c x420.cnf -s packet-x420-template x420.asn */
/* Input file: packet-x420-template.c */
@@ -646,7 +646,7 @@ static int dissect_telex_compatible_impl(packet_info *pinfo, proto_tree *tree, t
static int
dissect_x420_T_type(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-#line 113 "x420.cnf"
+#line 115 "x420.cnf"
const char *name = NULL;
offset = dissect_ber_object_identifier_str(implicit_tag, pinfo, tree, tvb, offset, hf_index, &object_identifier_id);
@@ -667,7 +667,7 @@ static int dissect_type(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int
static int
dissect_x420_T_value(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-#line 121 "x420.cnf"
+#line 123 "x420.cnf"
offset=call_ber_oid_callback(object_identifier_id, tvb, offset, pinfo, tree);
@@ -904,7 +904,7 @@ static int dissect_related_IPMs_impl(packet_info *pinfo, proto_tree *tree, tvbuf
static int
dissect_x420_SubjectField(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-#line 143 "x420.cnf"
+#line 145 "x420.cnf"
tvbuff_t *subject=NULL;
offset = dissect_ber_restricted_string(implicit_tag, BER_UNI_TAG_TeletexString,
@@ -1236,7 +1236,7 @@ static int dissect_g3_facsimile_impl(packet_info *pinfo, proto_tree *tree, tvbuf
static int
dissect_x420_Interchange_Data_Element(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-#line 162 "x420.cnf"
+#line 164 "x420.cnf"
/* XXX Not implemented yet */
@@ -1552,7 +1552,7 @@ static int dissect_bilaterally_defined_impl(packet_info *pinfo, proto_tree *tree
static int
dissect_x420_NationallyDefinedBodyPart(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-#line 165 "x420.cnf"
+#line 167 "x420.cnf"
/* XXX Not implemented yet */
@@ -1653,7 +1653,7 @@ static const ber_sequence_t IPM_sequence[] = {
int
dissect_x420_IPM(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-#line 125 "x420.cnf"
+#line 127 "x420.cnf"
if((hf_index == hf_x420_ipm) && check_col(pinfo->cinfo, COL_INFO))
col_append_fstr(pinfo->cinfo, COL_INFO, " Message");
@@ -1733,14 +1733,14 @@ static int dissect_notification_extensions_impl(packet_info *pinfo, proto_tree *
}
-static const value_string x420_NonReceiptReasonField_vals[] = {
+const value_string x420_NonReceiptReasonField_vals[] = {
{ 0, "ipm-discarded" },
{ 1, "ipm-auto-forwarded" },
{ 0, NULL }
};
-static int
+int
dissect_x420_NonReceiptReasonField(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index,
NULL);
@@ -1752,7 +1752,7 @@ static int dissect_non_receipt_reason_impl(packet_info *pinfo, proto_tree *tree,
}
-static const value_string x420_DiscardReasonField_vals[] = {
+const value_string x420_DiscardReasonField_vals[] = {
{ 0, "ipm-expired" },
{ 1, "ipm-obsoleted" },
{ 2, "user-subscription-terminated" },
@@ -1761,7 +1761,7 @@ static const value_string x420_DiscardReasonField_vals[] = {
};
-static int
+int
dissect_x420_DiscardReasonField(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index,
NULL);
@@ -1979,7 +1979,7 @@ static const ber_sequence_t IPN_set[] = {
int
dissect_x420_IPN(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-#line 133 "x420.cnf"
+#line 135 "x420.cnf"
if((hf_index == hf_x420_ipn) && check_col(pinfo->cinfo, COL_INFO))
col_append_fstr(pinfo->cinfo, COL_INFO, " Notification");
@@ -2665,7 +2665,7 @@ dissect_x420_Precedence(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, pa
static int
dissect_x420_CharacterSetRegistration(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-#line 154 "x420.cnf"
+#line 156 "x420.cnf"
guint32 crs;
proto_item *pi;
offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index,
diff --git a/epan/dissectors/packet-x420.h b/epan/dissectors/packet-x420.h
index 9b5b903f74..57e5e1d5ad 100644
--- a/epan/dissectors/packet-x420.h
+++ b/epan/dissectors/packet-x420.h
@@ -1,6 +1,6 @@
/* Do not modify this file. */
/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
-/* .\packet-x420.h */
+/* ./packet-x420.h */
/* ../../tools/asn2wrs.py -b -e -p x420 -c x420.cnf -s packet-x420-template x420.asn */
/* Input file: packet-x420-template.h */
@@ -38,12 +38,16 @@
/*--- Included file: packet-x420-exp.h ---*/
#line 1 "packet-x420-exp.h"
extern const value_string x420_InformationObject_vals[];
+extern const value_string x420_NonReceiptReasonField_vals[];
+extern const value_string x420_DiscardReasonField_vals[];
int dissect_x420_InformationObject(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index);
int dissect_x420_IPM(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index);
int dissect_x420_ORDescriptor(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index);
int dissect_x420_ExtensionsField(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index);
int dissect_x420_MessageParameters(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index);
int dissect_x420_IPN(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index);
+int dissect_x420_NonReceiptReasonField(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index);
+int dissect_x420_DiscardReasonField(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index);
/*--- End of included file: packet-x420-exp.h ---*/
#line 30 "packet-x420-template.h"
generated by cgit v1.2.1 (git 2.18.0) at 2024-06-02 09:10:34 +0000