From Kovarththanan Rajaratnam via bug 3548:

(1) Trailing/leading spaces are removed from 'name's/'blurb's
(2) Duplicate 'blurb's are replaced with NULL
(3) Empty ("") 'blurb's are replaced with NULL
(4) BASE_NONE, NULL, 0x0 are used for 'display', 'strings' and 'bitmask' fields
    for FT_NONE, FT_BYTES, FT_IPv4, FT_IPv6, FT_ABSOLUTE_TIME, FT_RELATIVE_TIME,
    FT_PROTOCOL, FT_STRING and FT_STRINGZ field types
(5) Only allow non-zero value for 'display' if 'bitmask' is non-zero


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@28770 f5534014-38df-0310-8fa8-9805f1628bb7

1 files changed, 131 insertions, 133 deletions

diff --git a/epan/dissectors/packet-dmp.c b/epan/dissectors/packet-dmp.c
index 5ed3b5a888..e44f11f033 100644
--- a/epan/dissectors/packet-dmp.c
+++ b/epan/dissectors/packet-dmp.c
@@ -3610,32 +3610,32 @@ void proto_register_dmp (void)
     */
     { &hf_envelope,
       { "Envelope", "dmp.envelope", FT_NONE, BASE_NONE,
-	NULL, 0x0, "Envelope", HFILL}},
+	NULL, 0x0, NULL, HFILL}},
 
     /* Protocol data */
     { &hf_envelope_protocol_id,
       { "Protocol Identifier", "dmp.protocol_id", FT_UINT8,
-	BASE_HEX, NULL, 0xF8, "Protocol Identifier", HFILL}},
+	BASE_HEX, NULL, 0xF8, NULL, HFILL}},
     { &hf_envelope_version,
       { "Protocol Version", "dmp.version", FT_UINT8, BASE_DEC,
-	VALS(version_vals), 0x07, "Protocol Version", HFILL } },
+	VALS(version_vals), 0x07, NULL, HFILL } },
 
     /* Envelope elements (byte 1) */
     { &hf_envelope_hop_count,
       { "Hop Count", "dmp.hop_count", FT_UINT8, BASE_DEC,
-	NULL, 0xE0, "Hop Count", HFILL } },
+	NULL, 0xE0, NULL, HFILL } },
     { &hf_envelope_rec_present,
       { "Recipient Present", "dmp.rec_present", FT_BOOLEAN, 8,
-	TFS (&tfs_present_absent), 0x20, "Recipient Present", HFILL } },
+	TFS (&tfs_present_absent), 0x20, NULL, HFILL } },
     { &hf_envelope_addr_enc,
       { "Address Encoding", "dmp.addr_encoding", FT_BOOLEAN, 8,
-	TFS (&addr_enc), 0x10, "Address Encoding", HFILL } },
+	TFS (&addr_enc), 0x10, NULL, HFILL } },
     { &hf_envelope_checksum,
       { "Checksum", "dmp.checksum_used", FT_BOOLEAN, 8,
 	TFS (&tfs_used_notused), 0x08, "Checksum Used", HFILL } },
     { &hf_envelope_type,
       { "Content Type", "dmp.content_type", FT_UINT8, BASE_DEC,
-	VALS(type_vals), 0x07, "Content Type", HFILL } },
+	VALS(type_vals), 0x07, NULL, HFILL } },
 
     /* Message identifier */
     { &hf_envelope_msg_id,
@@ -3645,19 +3645,19 @@ void proto_register_dmp (void)
     /* Submission time */
     { &hf_envelope_subm_time,
       { "Submission Time", "dmp.subm_time", FT_UINT16, BASE_HEX,
-	NULL, 0x0, "Submission Time", HFILL } },
+	NULL, 0x0, NULL, HFILL } },
     { &hf_envelope_time_diff_present,
       { "Time Diff", "dmp.time_diff_present", FT_BOOLEAN, 16,
 	TFS (&tfs_present_absent), 0x8000, "Time Diff Present", HFILL } },
     { &hf_envelope_subm_time_value,
       { "Submission Time Value", "dmp.subm_time_value", FT_UINT16,
-	BASE_HEX, NULL, 0x7FFF, "Submission Time Value", HFILL } },
+	BASE_HEX, NULL, 0x7FFF, NULL, HFILL } },
     { &hf_envelope_time_diff,
       { "Time Difference", "dmp.time_diff", FT_UINT8, BASE_HEX,
-	NULL, 0xFF, "Time Difference", HFILL } },
+	NULL, 0xFF, NULL, HFILL } },
     { &hf_envelope_time_diff_value,
       { "Time Difference Value", "dmp.time_diff_value", FT_UINT8,
-	BASE_HEX, NULL, 0xFF, "Time Difference Value", HFILL } },
+	BASE_HEX, NULL, 0xFF, NULL, HFILL } },
 
     /* Envelope flags */
     { &hf_envelope_flags,
@@ -3673,16 +3673,16 @@ void proto_register_dmp (void)
 	"Recipient Reassign prohibited", HFILL }},
     { &hf_envelope_dl_expansion_prohib,
       { "DL expansion prohibited", "dmp.dl_expansion_prohib",
-	FT_BOOLEAN, 8, TFS(&tfs_yes_no), 0x20, "DL expansion prohibited",
+	FT_BOOLEAN, 8, TFS(&tfs_yes_no), 0x20, NULL,
 	HFILL } },
 
     /* Recipient Count */
     { &hf_envelope_recipients,
       { "Recipient Count", "dmp.rec_count", FT_UINT8, BASE_DEC,
-	NULL, 0x1F, "Recipient Count", HFILL}},
+	NULL, 0x1F, NULL, HFILL}},
     { &hf_envelope_ext_recipients,
       { "Extended Recipient Count", "dmp.ext_rec_count", FT_UINT16,
-	BASE_DEC, NULL, 0x7FFF, "Extended Recipient Count", HFILL}},
+	BASE_DEC, NULL, 0x7FFF, NULL, HFILL}},
 
     /*
     ** Address
@@ -3692,7 +3692,7 @@ void proto_register_dmp (void)
 	NULL, 0x0, "Recipient", HFILL } },
     { &hf_addr_originator,
       { "Originator", "dmp.originator", FT_NONE, BASE_NONE,
-	NULL, 0x0, "Originator", HFILL } },
+	NULL, 0x0, NULL, HFILL } },
     { &hf_addr_reporting_name,
       { "Reporting Name Number", "dmp.reporting_name", FT_NONE,
 	BASE_NONE, NULL, 0x0, "Reporting Name", HFILL } },
@@ -3702,10 +3702,10 @@ void proto_register_dmp (void)
     */
     { &hf_addr_dir_addr_ext,
       { "Address Extended", "dmp.addr_ext", FT_BOOLEAN, 8,
-	NULL, 0x80, "Address Extended", HFILL } },
+	NULL, 0x80, NULL, HFILL } },
     { &hf_addr_dir_rec_no,
       { "Recipient Number Offset", "dmp.rec_no_offset", FT_UINT8,
-	BASE_DEC, NULL, 0xF0, "Recipient Number Offset", HFILL } },
+	BASE_DEC, NULL, 0xF0, NULL, HFILL } },
     { &hf_addr_dir_rec_no_generated,
       { "Recipient Number", "dmp.rec_no", FT_UINT32,
 	BASE_DEC, NULL, 0x0, "Recipient Number Offset", HFILL } },
@@ -3720,65 +3720,65 @@ void proto_register_dmp (void)
 	BASE_DEC, NULL, 0x1F, "Recipient Number (bits 14-10) Offset",HFILL } },
     { &hf_addr_dir_rep_req1,
       { "Report Request", "dmp.rep_rec", FT_UINT8, BASE_HEX,
-	VALS (report_vals_ext), 0x0C, "Report Request", HFILL } },
+	VALS (report_vals_ext), 0x0C, NULL, HFILL } },
     { &hf_addr_dir_rep_req2,
       { "Report Request", "dmp.rep_rec", FT_UINT8, BASE_HEX,
-	VALS (report_vals_ext), 0xC0, "Report Request", HFILL } },
+	VALS (report_vals_ext), 0xC0, NULL, HFILL } },
     { &hf_addr_dir_rep_req3,
       { "Report Request", "dmp.rep_rec", FT_UINT8, BASE_HEX,
-	VALS (report_vals), 0xC0, "Report Request", HFILL } },
+	VALS (report_vals), 0xC0, NULL, HFILL } },
     { &hf_addr_dir_not_req1,
       { "Notification Request", "dmp.not_req", FT_UINT8, BASE_HEX,
-	VALS (notif_vals_ext), 0x03, "Notification Request", HFILL } },
+	VALS (notif_vals_ext), 0x03, NULL, HFILL } },
     { &hf_addr_dir_not_req2,
       { "Notification Request", "dmp.not_req", FT_UINT8, BASE_HEX,
-	VALS (notif_vals_ext), 0xC0, "Notification Request", HFILL } },
+	VALS (notif_vals_ext), 0xC0, NULL, HFILL } },
     { &hf_addr_dir_not_req3,
       { "Notification Request", "dmp.not_req", FT_UINT8, BASE_HEX,
-	VALS (notif_vals), 0xC0, "Notification Request", HFILL } },
+	VALS (notif_vals), 0xC0, NULL, HFILL } },
     { &hf_addr_dir_action,
       { "Action", "dmp.action", FT_BOOLEAN, 8,
-	TFS (&tfs_yes_no), 0x80, "Action", HFILL } },
+	TFS (&tfs_yes_no), 0x80, NULL, HFILL } },
     { &hf_addr_dir_address,
       { "Direct Address", "dmp.direct_addr", FT_UINT8,
-	BASE_DEC, NULL, 0x7F, "Direct Address", HFILL } },
+	BASE_DEC, NULL, 0x7F, NULL, HFILL } },
     { &hf_addr_dir_address_generated,
       { "Direct Address", "dmp.direct_addr", FT_UINT32,
-	BASE_DEC, NULL, 0x0, "Direct Address", HFILL } },
+	BASE_DEC, NULL, 0x0, NULL, HFILL } },
     { &hf_addr_dir_address1,
       { "Direct Address (bits 6-0)", "dmp.direct_addr1", FT_UINT8,
-	BASE_DEC, NULL, 0x7F, "Direct Address (bits 6-0)", HFILL } },
+	BASE_DEC, NULL, 0x7F, NULL, HFILL } },
     { &hf_addr_dir_address2,
       { "Direct Address (bits 12-7)", "dmp.direct_addr2", FT_UINT8,
-	BASE_DEC, NULL, 0x3F, "Direct Address (bits 12-7)", HFILL } },
+	BASE_DEC, NULL, 0x3F, NULL, HFILL } },
     { &hf_addr_dir_address3,
       { "Direct Address (bits 18-13)", "dmp.direct_addr3", FT_UINT8,
-	BASE_DEC, NULL, 0x3F, "Direct Address (bits 18-13)", HFILL } },
+	BASE_DEC, NULL, 0x3F, NULL, HFILL } },
 
     /*
     ** Address Extended
     */
     { &hf_addr_ext_form,
       { "Address Form", "dmp.addr_form", FT_UINT8, BASE_DEC,
-	VALS (&addr_form), 0xE0, "Address Form", HFILL } },
+	VALS (&addr_form), 0xE0, NULL, HFILL } },
     { &hf_addr_ext_action,
       { "Action", "dmp.action", FT_BOOLEAN, 8,
-	TFS (&tfs_yes_no), 0x10, "Action", HFILL } },
+	TFS (&tfs_yes_no), 0x10, NULL, HFILL } },
     { &hf_addr_ext_rep_req,
       { "Report Request", "dmp.rep_rec", FT_UINT8, BASE_HEX,
-	VALS (report_vals), 0x0C, "Report Request", HFILL } },
+	VALS (report_vals), 0x0C, NULL, HFILL } },
     { &hf_addr_ext_not_req,
       { "Notification Request", "dmp.not_req", FT_UINT8, BASE_HEX,
-	VALS (notif_vals), 0x03, "Notification Request", HFILL } },
+	VALS (notif_vals), 0x03, NULL, HFILL } },
     { &hf_addr_ext_rec_ext,
       { "Recipient Number Extended", "dmp.rec_no_ext", FT_BOOLEAN, 8,
-	NULL, 0x80, "Recipient Number Extended", HFILL } },
+	NULL, 0x80, NULL, HFILL } },
     { &hf_addr_ext_rec_no,
       { "Recipient Number Offset", "dmp.rec_no_offset", FT_UINT8,
-	BASE_DEC, NULL, 0x7F, "Recipient Number Offset", HFILL } },
+	BASE_DEC, NULL, 0x7F, NULL, HFILL } },
     { &hf_addr_ext_rec_no_generated,
       { "Recipient Number", "dmp.rec_no", FT_UINT32,
-	BASE_DEC, NULL, 0x0, "Recipient Number", HFILL } },
+	BASE_DEC, NULL, 0x0, NULL, HFILL } },
     { &hf_addr_ext_rec_no1,
       { "Recipient Number (bits 6-0)", "dmp.rec_no_offset1", FT_UINT8,
 	BASE_DEC, NULL, 0x7F, "Recipient Number (bits 6-0) Offset", HFILL } },
@@ -3787,162 +3787,162 @@ void proto_register_dmp (void)
 	BASE_DEC, NULL, 0xFF, "Recipient Number (bits 14-7) Offset", HFILL } },
     { &hf_addr_ext_address,
       { "Extended Address", "dmp.addr_form", FT_NONE, BASE_NONE,
-	NULL, 0x0, "Extended Address", HFILL } },
+	NULL, 0x0, NULL, HFILL } },
     { &hf_addr_ext_type,
       { "Address Type", "dmp.addr_type", FT_UINT8, BASE_DEC,
-	VALS (&ext_addr_type), 0xE0, "Address Type", HFILL } },
+	VALS (&ext_addr_type), 0xE0, NULL, HFILL } },
     { &hf_addr_ext_type_ext,
       { "Address Type Extended", "dmp.addr_type_ext", FT_UINT8,
-	BASE_DEC, VALS (&ext_addr_type_ext), 0xE0, "Address Type Extended",
+	BASE_DEC, VALS (&ext_addr_type_ext), 0xE0, NULL,
 	HFILL } },
     { &hf_addr_ext_length,
       { "Address Length", "dmp.addr_length", FT_UINT8,
-	BASE_DEC, NULL, 0x1F, "Address Length", HFILL } },
+	BASE_DEC, NULL, 0x1F, NULL, HFILL } },
     { &hf_addr_ext_length_generated,
       { "Address Length", "dmp.addr_length", FT_UINT32,
-	BASE_DEC, NULL, 0x0, "Address Length", HFILL } },
+	BASE_DEC, NULL, 0x0, NULL, HFILL } },
     { &hf_addr_ext_length1,
       { "Address Length (bits 4-0)", "dmp.addr_length1", FT_UINT8,
-	BASE_DEC, NULL, 0x1F, "Address Length (bits 4-0)", HFILL } },
+	BASE_DEC, NULL, 0x1F, NULL, HFILL } },
     { &hf_addr_ext_length2,
       { "Address Length (bits 9-5)", "dmp.addr_length2", FT_UINT8,
-	BASE_DEC, NULL, 0x1F, "Address Length (bits 9-5)", HFILL } },
+	BASE_DEC, NULL, 0x1F, NULL, HFILL } },
     { &hf_addr_ext_asn1_ber,
       { "ASN.1 BER-encoded OR-name", "dmp.or_name", FT_NONE,
-	BASE_NONE, NULL, 0x0, "ASN.1 BER-encoded OR-name", HFILL } },
+	BASE_NONE, NULL, 0x0, NULL, HFILL } },
     { &hf_addr_ext_asn1_per,
       { "ASN.1 PER-encoded OR-name", "dmp.asn1_per", FT_BYTES,
-	BASE_DEC, NULL, 0x0, "ASN.1 PER-encoded OR-name", HFILL } },
+	BASE_NONE, NULL, 0x0, NULL, HFILL } },
     { &hf_addr_ext_unknown,
       { "Unknown encoded address", "dmp.addr_unknown", FT_BYTES,
-	BASE_DEC, NULL, 0x0, "Unknown encoded address", HFILL } },
+	BASE_NONE, NULL, 0x0, NULL, HFILL } },
 
     /*
     ** Message content
     */
     { &hf_message_content,
       { "Message Content", "dmp.message", FT_NONE, BASE_NONE,
-	NULL, 0x0, "Message Content", HFILL } },
+	NULL, 0x0, NULL, HFILL } },
     { &hf_report_content,
       { "Report Content", "dmp.report", FT_NONE, BASE_NONE,
-	NULL, 0x0, "Report Content", HFILL } },
+	NULL, 0x0, NULL, HFILL } },
     { &hf_notif_content,
       { "Notification Content", "dmp.notification", FT_NONE, BASE_NONE,
-	NULL, 0x0, "Notification Content", HFILL } },
+	NULL, 0x0, NULL, HFILL } },
 
     { &hf_message_st_type,
       { "Message type", "dmp.msg_type", FT_UINT8, BASE_DEC,
-	VALS (message_type_vals), 0xC0, "Message type", HFILL } },
+	VALS (message_type_vals), 0xC0, NULL, HFILL } },
     { &hf_message_precedence,
       { "Precedence", "dmp.precedence", FT_UINT8, BASE_DEC,
-	VALS (precedence), 0x1C, "Precedence", HFILL } },
+	VALS (precedence), 0x1C, NULL, HFILL } },
     { &hf_message_importance,
       { "Importance", "dmp.importance", FT_UINT8, BASE_DEC,
-	VALS (importance), 0x1C, "Importance", HFILL } },
+	VALS (importance), 0x1C, NULL, HFILL } },
     { &hf_message_body_format,
       { "Body format", "dmp.body_format", FT_UINT8, BASE_DEC,
-	VALS (body_format_vals), 0x03, "Body format", HFILL } },
+	VALS (body_format_vals), 0x03, NULL, HFILL } },
 
     /* Security Values */
     { &hf_message_sec_class_nat,
       { "Security Classification", "dmp.sec_class", FT_UINT8,
-	BASE_DEC, VALS (sec_class), 0xE0, "Security Classification", HFILL}},
+	BASE_DEC, VALS (sec_class), 0xE0, NULL, HFILL}},
     { &hf_message_sec_class_val,
       { "Security Classification", "dmp.sec_class", FT_UINT8,
-	BASE_DEC, NULL, 0xE0, "Security Classification", HFILL}},
+	BASE_DEC, NULL, 0xE0, NULL, HFILL}},
     { &hf_message_sec_pol,
       { "Security Policy", "dmp.sec_pol", FT_UINT8, BASE_DEC,
-	VALS (sec_pol), 0x1C, "Security Policy", HFILL } },
+	VALS (sec_pol), 0x1C, NULL, HFILL } },
     { &hf_message_heading_flags,
       { "Heading Flags", "dmp.heading_flags", FT_NONE, BASE_NONE,
-	NULL, 0x0, "Heading Flags", HFILL } },
+	NULL, 0x0, NULL, HFILL } },
     { &hf_message_auth_users,
       { "Authorizing users discarded", "dmp.auth_discarded",
 	FT_BOOLEAN, 8, TFS (&tfs_yes_no), 0x02,
-	"Authorizing users discarded", HFILL }},
+	NULL, HFILL }},
     { &hf_message_subject_disc,
       { "Subject discarded", "dmp.subject_discarded", FT_BOOLEAN, 8,
-	TFS (&tfs_yes_no), 0x01, "Subject discarded", HFILL } },
+	TFS (&tfs_yes_no), 0x01, NULL, HFILL } },
 
     /* National Policy Identifier */
     { &hf_message_national_policy_id,
       { "National Policy Identifier", "dmp.nat_pol_id", FT_UINT8,
-	BASE_DEC, VALS(nat_pol_id), 0x0, "National Policy Identifier",
+	BASE_DEC, VALS(nat_pol_id), 0x0, NULL,
 	HFILL } },
 
     /* Mission Policy Identifier */
     { &hf_message_mission_policy_id,
       { "Mission Policy Identifier", "dmp.mission_pol_id", FT_UINT8,
-	BASE_DEC, NULL, 0x0, "Mission Policy Identifier",
+	BASE_DEC, NULL, 0x0, NULL,
 	HFILL } },
 
     /* Security Categories */
     { &hf_message_sec_cat_nat,
       { "Security Categories", "dmp.sec_cat", FT_UINT8, BASE_HEX,
-	NULL, 0x0, "Security Categories", HFILL } },
+	NULL, 0x0, NULL, HFILL } },
     { &hf_message_sec_cat_val,
       { "Security Categories", "dmp.sec_cat", FT_UINT8, BASE_HEX,
-	NULL, 0x0, "Security Categories", HFILL } },
+	NULL, 0x0, NULL, HFILL } },
     { &hf_message_sec_cat_cl,
       { "Clear", "dmp.sec_cat.cl", FT_BOOLEAN, 8,
-	TFS (&tfs_set_notset), 0x80, "Clear", HFILL } },
+	TFS (&tfs_set_notset), 0x80, NULL, HFILL } },
     { &hf_message_sec_cat_cs,
       { "Crypto Security", "dmp.sec_cat.cs", FT_BOOLEAN, 8,
-	TFS (&tfs_set_notset), 0x40, "Crypto Security", HFILL } },
+	TFS (&tfs_set_notset), 0x40, NULL, HFILL } },
     { &hf_message_sec_cat_ex,
       { "Exclusive", "dmp.sec_cat.ex", FT_BOOLEAN, 8,
-	TFS (&tfs_set_notset), 0x20, "Exclusive", HFILL } },
+	TFS (&tfs_set_notset), 0x20, NULL, HFILL } },
     { &hf_message_sec_cat_ne,
       { "National Eyes Only", "dmp.sec_cat.ne", FT_BOOLEAN, 8,
-	TFS (&tfs_set_notset), 0x10, "National Eyes Only", HFILL } },
+	TFS (&tfs_set_notset), 0x10, NULL, HFILL } },
     { &hf_message_sec_cat_bit0,
       { "Bit 0", "dmp.sec_cat.bit0", FT_BOOLEAN, 8,
-	TFS (&tfs_set_notset), 0x01, "Bit 0", HFILL } },
+	TFS (&tfs_set_notset), 0x01, NULL, HFILL } },
     { &hf_message_sec_cat_bit1,
       { "Bit 1", "dmp.sec_cat.bit1", FT_BOOLEAN, 8,
-	TFS (&tfs_set_notset), 0x02, "Bit 1", HFILL } },
+	TFS (&tfs_set_notset), 0x02, NULL, HFILL } },
     { &hf_message_sec_cat_bit2,
       { "Bit 2", "dmp.sec_cat.bit2", FT_BOOLEAN, 8,
-	TFS (&tfs_set_notset), 0x04, "Bit 2", HFILL } },
+	TFS (&tfs_set_notset), 0x04, NULL, HFILL } },
     { &hf_message_sec_cat_bit3,
       { "Bit 3", "dmp.sec_cat.bit3", FT_BOOLEAN, 8,
-	TFS (&tfs_set_notset), 0x08, "Bit 3", HFILL } },
+	TFS (&tfs_set_notset), 0x08, NULL, HFILL } },
     { &hf_message_sec_cat_bit4,
       { "Bit 4", "dmp.sec_cat.bit4", FT_BOOLEAN, 8,
-	TFS (&tfs_set_notset), 0x10, "Bit 4", HFILL } },
+	TFS (&tfs_set_notset), 0x10, NULL, HFILL } },
     { &hf_message_sec_cat_bit5,
       { "Bit 5", "dmp.sec_cat.bit5", FT_BOOLEAN, 8,
-	TFS (&tfs_set_notset), 0x20, "Bit 5", HFILL } },
+	TFS (&tfs_set_notset), 0x20, NULL, HFILL } },
     { &hf_message_sec_cat_bit6,
       { "Bit 6", "dmp.sec_cat.bit6", FT_BOOLEAN, 8,
-	TFS (&tfs_set_notset), 0x40, "Bit 6", HFILL } },
+	TFS (&tfs_set_notset), 0x40, NULL, HFILL } },
     { &hf_message_sec_cat_bit7,
       { "Bit 7", "dmp.sec_cat.bit7", FT_BOOLEAN, 8,
-	TFS (&tfs_set_notset), 0x80, "Bit 7", HFILL } },
+	TFS (&tfs_set_notset), 0x80, NULL, HFILL } },
 
     /* Expiry Time */
     { &hf_message_exp_time,
       { "Expiry Time", "dmp.expiry_time", FT_UINT8, BASE_HEX,
-	NULL, 0x0, "Expiry Time", HFILL } },
+	NULL, 0x0, NULL, HFILL } },
     { &hf_message_exp_time_val,
       { "Expiry Time Value", "dmp.expiry_time_val", FT_UINT8, BASE_HEX,
-	NULL, 0xFF, "Expiry Time Value", HFILL } },
+	NULL, 0xFF, NULL, HFILL } },
 
     /* DTG */
     { &hf_message_dtg,
       { "DTG", "dmp.dtg", FT_UINT8, BASE_HEX,
-	NULL, 0xFF, "DTG", HFILL } },
+	NULL, 0xFF, NULL, HFILL } },
     { &hf_message_dtg_sign,
       { "DTG in the", "dmp.dtg.sign", FT_BOOLEAN, 8, TFS (&dtg_sign),
 	0x80, "Sign", HFILL } },
     { &hf_message_dtg_val,
       { "DTG Value", "dmp.dtg.val", FT_UINT8, BASE_HEX, NULL,
-	0x7F, "DTG Value", HFILL } },
+	0x7F, NULL, HFILL } },
 
     /* SIC */
     { &hf_message_sic,
-      { "SIC", "dmp.sic", FT_STRING, BASE_DEC,
-	NULL, 0x0, "SIC", HFILL } },
+      { "SIC", "dmp.sic", FT_STRING, BASE_NONE,
+	NULL, 0x0, NULL, HFILL } },
     { &hf_message_sic_key,
       { "SICs", "dmp.sic_key", FT_NONE, BASE_NONE,
 	NULL, 0x0, "SIC Content", HFILL } },
@@ -3957,7 +3957,7 @@ void proto_register_dmp (void)
 	TFS (&sic_key_chars), 0x08, "SIC Valid Characters", HFILL } },
     { &hf_message_sic_key_num,
       { "Number of SICs", "dmp.sic_key.num", FT_UINT8, BASE_HEX,
-	VALS (sic_key_num), 0x07, "Number of SICs", HFILL } },
+	VALS (sic_key_num), 0x07, NULL, HFILL } },
     { &hf_message_sic_bitmap,
       { "Length Bitmap (0 = 3 bytes, 1 = 4-8 bytes)", "dmp.sic_bitmap",
 	FT_UINT8, BASE_HEX, NULL, 0xFF, "SIC Length Bitmap", HFILL } },
@@ -3973,14 +3973,14 @@ void proto_register_dmp (void)
     /* Subject Message Id */
     { &hf_message_subj_id,
       { "Subject Message Identifier", "dmp.subj_id", FT_UINT16,
-	BASE_DEC, NULL, 0x0, "Subject Message Identifier", HFILL } },
+	BASE_DEC, NULL, 0x0, NULL, HFILL } },
 
     /*
     ** Message body
     */
     { &hf_message_body,
       { "Message Body", "dmp.body", FT_NONE, BASE_NONE, NULL,
-	0x0, "Message Body", HFILL}},
+	0x0, NULL, HFILL}},
 
     /* Body Id */
     { &hf_message_eit,
@@ -3988,20 +3988,20 @@ void proto_register_dmp (void)
 	VALS(eit_vals), 0xE0, "Encoded Information Type", HFILL } },
     { &hf_message_compr,
       { "Compression", "dmp.body.compression", FT_UINT8, BASE_DEC,
-	VALS(compression_vals), 0x18, "Compression", HFILL } },
+	VALS(compression_vals), 0x18, NULL, HFILL } },
 
     /* Subject */
     { &hf_message_subject,
-      { "Subject", "dmp.subject", FT_STRINGZ, BASE_DEC,
-	NULL, 0x0, "Subject", HFILL } },
+      { "Subject", "dmp.subject", FT_STRINGZ, BASE_NONE,
+	NULL, 0x0, NULL, HFILL } },
 
     /* Message Body */
     { &hf_message_body_data,
       { "User data", "dmp.body.data", FT_NONE, BASE_NONE,
-	NULL, 0x0, "User data", HFILL } },
+	NULL, 0x0, NULL, HFILL } },
     { &hf_message_body_plain,
-      { "Message Body", "dmp.body.plain", FT_STRING, BASE_DEC,
-	NULL, 0x0, "Message Body", HFILL } },
+      { "Message Body", "dmp.body.plain", FT_STRING, BASE_NONE,
+	NULL, 0x0, NULL, HFILL } },
     { &hf_message_bodyid_uint8,
       { "Structured Id", "dmp.body.id", FT_UINT8, BASE_DEC,
 	NULL, 0x0, "Structured Body Id (1 byte)", HFILL } },
@@ -4015,21 +4015,21 @@ void proto_register_dmp (void)
       { "Structured Id", "dmp.body.id", FT_UINT64, BASE_DEC,
 	NULL, 0x0, "Structured Body Id (8 bytes)", HFILL } },
     { &hf_message_bodyid_string,
-      { "Structured Id", "dmp.body.id", FT_STRING, BASE_DEC,
+      { "Structured Id", "dmp.body.id", FT_STRING, BASE_NONE,
 	NULL, 0x0, "Structured Body Id (fixed text string)", HFILL } },
     { &hf_message_bodyid_zstring,
-      { "Structured Id", "dmp.body.id", FT_STRINGZ, BASE_DEC,
+      { "Structured Id", "dmp.body.id", FT_STRINGZ, BASE_NONE,
 	NULL, 0x0, "Structured Body Id (zero terminated text string)",
 	HFILL } },
     { &hf_message_body_structured,
-      { "Structured Body", "dmp.body.structured", FT_BYTES, BASE_DEC,
-	NULL, 0x0, "Structured Body", HFILL } },
+      { "Structured Body", "dmp.body.structured", FT_BYTES, BASE_NONE,
+	NULL, 0x0, NULL, HFILL } },
     { &hf_message_body_uncompr,
       { "Uncompressed User data", "dmp.body.uncompressed", FT_NONE,
-	BASE_NONE, NULL, 0x0, "Uncompressed User data", HFILL } },
+	BASE_NONE, NULL, 0x0, NULL, HFILL } },
     { &hf_message_body_uncompressed,
       { "Uncompressed Message Body", "dmp.body.uncompressed",
-	FT_STRING, BASE_DEC, NULL, 0x0, "Uncompressed Message Body",
+	FT_STRING, BASE_NONE, NULL, 0x0, NULL,
 	HFILL } },
 
     /*
@@ -4037,33 +4037,33 @@ void proto_register_dmp (void)
     */
     { &hf_delivery_report,
       { "Delivery Report", "dmp.dr", FT_NONE, BASE_NONE, NULL,
-	0x0, "Delivery Report", HFILL}},
+	0x0, NULL, HFILL}},
     { &hf_non_delivery_report,
       { "Non-Delivery Report", "dmp.ndr", FT_NONE, BASE_NONE, NULL,
-	0x0, "Non-Delivery Report", HFILL}},
+	0x0, NULL, HFILL}},
 
     { &hf_report_type,
       { "Report Type", "dmp.report_type", FT_BOOLEAN, 8,
-	TFS (&report_type), 0x80, "Report Type", HFILL } },
+	TFS (&report_type), 0x80, NULL, HFILL } },
     { &hf_report_info_present_dr,
       { "Info Present", "dmp.info_present", FT_BOOLEAN, 8,
-	TFS (&tfs_present_absent), 0x40, "Info Present", HFILL } },
+	TFS (&tfs_present_absent), 0x40, NULL, HFILL } },
     { &hf_report_addr_enc_dr,
       { "Address Encoding", "dmp.addr_encoding", FT_BOOLEAN, 8,
-	TFS (&addr_enc), 0x20, "Address Encoding", HFILL } },
+	TFS (&addr_enc), 0x20, NULL, HFILL } },
     { &hf_report_del_time,
       { "Delivery Time", "dmp.delivery_time", FT_UINT8, BASE_DEC,
-	NULL, 0x0, "Delivery Time", HFILL } },
+	NULL, 0x0, NULL, HFILL } },
     { &hf_report_addr_enc_ndr,
       { "Address Encoding", "dmp.addr_encoding", FT_BOOLEAN, 8,
-	TFS (&addr_enc), 0x40, "Address Encoding", HFILL } },
+	TFS (&addr_enc), 0x40, NULL, 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.info_present", FT_BOOLEAN, 8,
-	TFS (&tfs_present_absent), 0x80, "Info Present", HFILL } },
+	TFS (&tfs_present_absent), 0x80, NULL, HFILL } },
     { &hf_report_diagn,
       { "Diagnostic (X.411)", "dmp.report_diagnostic", FT_UINT8, BASE_DEC,
 	VALS (x411_NonDeliveryDiagnosticCode_vals), 0x7F,
@@ -4073,62 +4073,62 @@ void proto_register_dmp (void)
 	BASE_DEC, NULL, 0x0, "Supplementary Information Length", HFILL } },
     { &hf_report_suppl_info,
       { "Supplementary Information", "dmp.suppl_info", FT_STRINGZ,
-	BASE_DEC, NULL, 0x0, "Supplementary Information", HFILL } },
+	BASE_NONE, NULL, 0x0, NULL, HFILL } },
 
     /*
     ** Notification
     */
     { &hf_receipt_notif,
       { "Receipt Notification (RN)", "dmp.rn", FT_NONE, BASE_NONE,
-	NULL, 0x0, "Receipt Notification (RN)", HFILL} },
+	NULL, 0x0, NULL, HFILL} },
     { &hf_non_receipt_notif,
       { "Non-Receipt Notification (NRN)", "dmp.nrn", FT_NONE, BASE_NONE,
-	NULL, 0x0, "Non-Receipt Notification (NRN)", HFILL} },
+	NULL, 0x0, NULL, HFILL} },
     { &hf_other_notif,
       { "Other Notification (ON)", "dmp.on", FT_NONE, BASE_NONE,
-	NULL, 0x0, "Other Notification (ON)", HFILL} },
+	NULL, 0x0, NULL, HFILL} },
 
     { &hf_notif_type,
       { "Notification Type", "dmp.notif_type", FT_UINT8, BASE_DEC,
-	VALS (notif_type), 0x03, "Notification Type", HFILL } },
+	VALS (notif_type), 0x03, NULL, HFILL } },
     { &hf_notif_rec_time,
       { "Receipt Time", "dmp.receipt_time", FT_UINT8, BASE_HEX,
 	NULL, 0x0, "Receipt time", HFILL } },
     { &hf_notif_rec_time_val,
       { "Receipt Time Value", "dmp.receipt_time_val", FT_UINT8,
-	BASE_HEX, NULL, 0xFF, "Receipt Time Value", HFILL } },
+	BASE_HEX, NULL, 0xFF, NULL, HFILL } },
     { &hf_notif_suppl_info_len,
       { "Supplementary Information", "dmp.suppl_info_len",
 	FT_UINT8, BASE_DEC, NULL, 0x0, "Supplementary Information Length",
 	HFILL } },
     { &hf_notif_suppl_info,
       { "Supplementary Information", "dmp.suppl_info",
-	FT_STRINGZ, BASE_DEC, NULL, 0x0, "Supplementary Information",
+	FT_STRINGZ, BASE_NONE, NULL, 0x0, NULL,
 	HFILL } },
     { &hf_notif_non_rec_reason,
       { "Non-Receipt Reason", "dmp.notif_non_rec_reason",
 	FT_UINT8, BASE_DEC, VALS (x420_NonReceiptReasonField_vals), 0x0,
-	"Non-Receipt Reason", HFILL } },
+	NULL, HFILL } },
     { &hf_notif_discard_reason,
       { "Discard Reason", "dmp.notif_discard_reason", FT_UINT8,
 	BASE_DEC, VALS (x420_DiscardReasonField_vals), 0x0,
-	"Discard Reason", HFILL } },
+	NULL, HFILL } },
     { &hf_notif_on_type,
       { "ON Type", "dmp.notif_on_type", FT_UINT8, BASE_DEC,
-	VALS (on_type), 0x0, "ON Type", HFILL } },
+	VALS (on_type), 0x0, NULL, HFILL } },
     { &hf_notif_acp127,
       { "ACP127 Recipient", "dmp.acp127recip_len", FT_UINT8,
 	BASE_DEC, NULL, 0x0, "ACP 127 Recipient Length", HFILL } },
     { &hf_notif_acp127recip,
       { "ACP127 Recipient", "dmp.acp127recip", FT_STRINGZ,
-	BASE_DEC, NULL, 0x0, "ACP 127 Recipient", HFILL } },
+	BASE_NONE, NULL, 0x0, "ACP 127 Recipient", HFILL } },
 
     /*
     ** Acknowledgement
     */
     { &hf_ack,
       { "Acknowledgement", "dmp.ack", FT_NONE, BASE_NONE,
-	NULL, 0x0, "Acknowledgement", HFILL } },
+	NULL, 0x0, NULL, HFILL } },
     { &hf_ack_reason,
       { "Ack Reason", "dmp.ack_reason", FT_UINT8, BASE_DEC,
 	VALS (&ack_reason), 0x0, "Reason", HFILL } },
@@ -4137,22 +4137,20 @@ void proto_register_dmp (void)
 	NULL, 0x0, "Diagnostic", HFILL } },
     { &hf_ack_recips,
       { "Recipient List", "dmp.ack_rec_list", FT_NONE, BASE_NONE,
-	NULL, 0x0, "Recipient List", HFILL } },
+	NULL, 0x0, NULL, HFILL } },
 
     /*
     ** Checksum
     */
     { &hf_checksum,
       { "Checksum", "dmp.checksum", FT_UINT16, BASE_HEX,
-	NULL, 0x0, "Checksum", HFILL } },
+	NULL, 0x0, NULL, HFILL } },
     { &hf_checksum_good,
       { "Good", "dmp.checksum_good", FT_BOOLEAN, BASE_NONE,
-	NULL, 0x0, "True: checksum matches packet content; "
-	"False: doesn't match content or not checked", HFILL } },
+	NULL, 0x0, "True: checksum matches packet content; False: doesn't match content or not checked", HFILL } },
     { &hf_checksum_bad,
       { "Bad", "dmp.checksum_bad", FT_BOOLEAN, BASE_NONE,
-	NULL, 0x0, "True: checksum doesn't match packet content; "
-	"False: matches content or not checked", HFILL } },
+	NULL, 0x0, "True: checksum doesn't match packet content; False: matches content or not checked", HFILL } },
 
     /*
     ** Ack matching / Resend
@@ -4221,37 +4219,37 @@ void proto_register_dmp (void)
     */
     { &hf_reserved_0x01,
       { "Reserved", "dmp.reserved", FT_UINT8, BASE_DEC,
-	NULL, 0x01, "Reserved", HFILL } },
+	NULL, 0x01, NULL, HFILL } },
     { &hf_reserved_0x02,
       { "Reserved", "dmp.reserved", FT_UINT8, BASE_DEC,
-	NULL, 0x02, "Reserved", HFILL } },
+	NULL, 0x02, NULL, HFILL } },
     { &hf_reserved_0x04,
       { "Reserved", "dmp.reserved", FT_UINT8, BASE_DEC,
-	NULL, 0x04, "Reserved", HFILL } },
+	NULL, 0x04, NULL, HFILL } },
     { &hf_reserved_0x07,
       { "Reserved", "dmp.reserved", FT_UINT8, BASE_DEC,
-	NULL, 0x07, "Reserved", HFILL } },
+	NULL, 0x07, NULL, HFILL } },
     { &hf_reserved_0x08,
       { "Reserved", "dmp.reserved", FT_UINT8, BASE_DEC,
-	NULL, 0x08, "Reserved", HFILL } },
+	NULL, 0x08, NULL, HFILL } },
     { &hf_reserved_0x1F,
       { "Reserved", "dmp.reserved", FT_UINT8, BASE_DEC,
-	NULL, 0x1F, "Reserved", HFILL } },
+	NULL, 0x1F, NULL, HFILL } },
     { &hf_reserved_0x20,
       { "Reserved", "dmp.reserved", FT_UINT8, BASE_DEC,
-	NULL, 0x20, "Reserved", HFILL } },
+	NULL, 0x20, NULL, HFILL } },
     { &hf_reserved_0x40,
       { "Reserved", "dmp.reserved", FT_UINT8, BASE_DEC,
-	NULL, 0x40, "Reserved", HFILL } },
+	NULL, 0x40, NULL, HFILL } },
     { &hf_reserved_0xC0,
       { "Reserved", "dmp.reserved", FT_UINT8, BASE_DEC,
-	NULL, 0xC0, "Reserved", HFILL } },
+	NULL, 0xC0, NULL, HFILL } },
     { &hf_reserved_0xE0,
       { "Reserved", "dmp.reserved", FT_UINT8, BASE_DEC,
-	NULL, 0xE0, "Reserved", HFILL } },
+	NULL, 0xE0, NULL, HFILL } },
     { &hf_reserved_0x8000,
       { "Reserved", "dmp.reserved", FT_UINT16, BASE_DEC,
-	NULL, 0x8000, "Reserved", HFILL } },
+	NULL, 0x8000, NULL, HFILL } },
   };
 
   static gint *ett[] = {