FCDNS: Convert to old proto tree API

Related with #17774.

1 files changed, 584 insertions, 539 deletions

diff --git a/epan/dissectors/packet-fcdns.c b/epan/dissectors/packet-fcdns.c
index 88bffb9bed..63e87c4f24 100644
--- a/epan/dissectors/packet-fcdns.c
+++ b/epan/dissectors/packet-fcdns.c
@@ -8,9 +8,6 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later
  */
-
-#define NEW_PROTO_TREE_API
-
 #include "config.h"
 
 #include <epan/packet.h>
@@ -227,304 +224,78 @@ static const value_string fc_dns_rjt_det_code_val [] = {
 #define FCDNS_GSSUBTYPE_DNS  0x02
 #define FCDNS_GSSUBTYPE_IP   0x03
 
-#if 0
-static const value_string fc_dns_subtype_val[] = {
-    {FCDNS_GSSUBTYPE_DNS, "dNS"},
-    {FCDNS_GSSUBTYPE_IP,  "IP"},
-    {0, NULL},
-};
-#endif
-
-static header_field_info *hfi_fcdns = NULL;
-
-#define FCDNS_HFI_INIT HFI_INIT(proto_fcdns)
-
-#if 0
-static header_field_info hfi_fcdns_gssubtype FCDNS_HFI_INIT =
-          {"GS_Subtype", "fcdns.gssubtype", FT_UINT8, BASE_HEX,
-           VALS(fc_dns_subtype_val), 0x0, NULL, HFILL};
-#endif
-
-static header_field_info hfi_fcdns_opcode FCDNS_HFI_INIT =
-         {"Opcode", "fcdns.opcode", FT_UINT16, BASE_HEX, VALS (fc_dns_opcode_val),
-          0x0, NULL, HFILL};
-
-static header_field_info hfi_fcdns_reason FCDNS_HFI_INIT =
-          {"Reason Code", "fcdns.rply.reason", FT_UINT8, BASE_HEX,
-           VALS (fc_ct_rjt_code_vals), 0x0, NULL, HFILL};
-
-static header_field_info hfi_fcdns_vendor FCDNS_HFI_INIT =
-          {"Vendor Unique Reject Code", "fcdns.rply.vendor", FT_UINT8,
-           BASE_HEX, NULL, 0x0, NULL, HFILL};
-
-static header_field_info hfi_fcdns_req_portid FCDNS_HFI_INIT =
-          {"Port Identifier", "fcdns.req.portid", FT_BYTES, SEP_DOT, NULL, 0x0,
-           NULL, HFILL};
-
-static header_field_info hfi_fcdns_rply_pname FCDNS_HFI_INIT =
-          {"Port Name", "fcdns.rply.pname", FT_FCWWN, BASE_NONE, NULL, 0x0, NULL,
-           HFILL};
-
-static header_field_info hfi_fcdns_rply_nname FCDNS_HFI_INIT =
-          {"Node Name", "fcdns.rply.nname", FT_FCWWN, BASE_NONE, NULL, 0x0, NULL,
-           HFILL};
-
-static header_field_info hfi_fcdns_rply_gft FCDNS_HFI_INIT =
-          {"FC-4 Types Supported", "fcdns.rply.gft", FT_NONE, BASE_NONE,
-           NULL, 0x0, NULL, HFILL};
-
-static header_field_info hfi_fcdns_rply_snamelen FCDNS_HFI_INIT =
-          {"Symbolic Node Name Length", "fcdns.rply.snamelen", FT_UINT8, BASE_DEC,
-           NULL, 0x0, NULL, HFILL};
-
-static header_field_info hfi_fcdns_rply_sname FCDNS_HFI_INIT =
-          {"Symbolic Node Name", "fcdns.rply.sname", FT_STRING, BASE_NONE, NULL,
-           0x0, NULL, HFILL};
-
-static header_field_info hfi_fcdns_rply_ptype FCDNS_HFI_INIT =
-          {"Port Type", "fcdns.rply.porttype", FT_UINT8, BASE_HEX,
-           VALS (fc_dns_port_type_val), 0x0, NULL, HFILL};
-
-static header_field_info hfi_fcdns_rply_fpname FCDNS_HFI_INIT =
-          {"Fabric Port Name", "fcdns.rply.fpname", FT_FCWWN, BASE_NONE, NULL,
-           0x0, NULL, HFILL};
-
-static header_field_info hfi_fcdns_fc4type FCDNS_HFI_INIT =
-          {"FC-4 Types", "fcdns.req.fc4types", FT_NONE, BASE_NONE,
-           NULL, 0x0, NULL, HFILL};
-
-static header_field_info hfi_fcdns_rply_fc4type FCDNS_HFI_INIT =
-          {"FC-4 Descriptor Type", "fcdns.rply.fc4type", FT_UINT8, BASE_HEX,
-           VALS (fc_fc4_val), 0x0, NULL, HFILL};
-
-static header_field_info hfi_fcdns_rply_fc4desc FCDNS_HFI_INIT =
-          {"FC-4 Descriptor", "fcdns.rply.fc4desc", FT_BYTES, BASE_NONE, NULL,
-           0x0, NULL, HFILL};
-
-static header_field_info hfi_fcdns_req_pname FCDNS_HFI_INIT =
-          {"Port Name", "fcdns.req.portname", FT_FCWWN, BASE_NONE, NULL, 0x0,
-           NULL, HFILL};
-
-static header_field_info hfi_fcdns_rply_portid FCDNS_HFI_INIT =
-          {"Port Identifier", "fcdns.rply.portid", FT_BYTES, SEP_DOT, NULL,
-           0x0, NULL, HFILL};
-
-static header_field_info hfi_fcdns_req_nname FCDNS_HFI_INIT =
-          {"Node Name", "fcdns.req.nname", FT_FCWWN, BASE_NONE, NULL, 0x0,
-           NULL, HFILL};
-
-static header_field_info hfi_fcdns_req_domainscope FCDNS_HFI_INIT =
-          {"Domain ID Scope", "fcdns.req.domainid", FT_UINT8, BASE_HEX, NULL,
-           0x0, NULL, HFILL};
-
-static header_field_info hfi_fcdns_req_areascope FCDNS_HFI_INIT =
-          {"Area ID Scope", "fcdns.req.areaid", FT_UINT8, BASE_HEX, NULL,
-           0x0, NULL, HFILL};
-
-static header_field_info hfi_fcdns_req_ptype FCDNS_HFI_INIT =
-          {"Port Type", "fcdns.req.porttype", FT_UINT8, BASE_HEX,
-           VALS (fc_dns_port_type_val), 0x0, NULL, HFILL};
-
-static header_field_info hfi_fcdns_req_cos FCDNS_HFI_INIT =
-          {"Requested Class of Service", "fcdns.req.class", FT_UINT32, BASE_HEX,
-           NULL, 0x0, NULL, HFILL};
-
-static header_field_info hfi_fcdns_req_fc4types FCDNS_HFI_INIT =
-          {"FC-4 Types Supported", "fcdns.req.fc4types", FT_NONE, BASE_NONE,
-           NULL, 0x0, NULL, HFILL};
-
-static header_field_info hfi_fcdns_req_snamelen FCDNS_HFI_INIT =
-          {"Symbolic Name Length", "fcdns.req.snamelen", FT_UINT8, BASE_DEC,
-           NULL, 0x0, NULL, HFILL};
-
-static header_field_info hfi_fcdns_req_sname FCDNS_HFI_INIT =
-          {"Symbolic Port Name", "fcdns.req.sname", FT_STRING, BASE_NONE, NULL,
-           0x0, NULL, HFILL};
-
-static header_field_info hfi_fcdns_rply_spnamelen FCDNS_HFI_INIT =
-          {"Symbolic Port Name Length", "fcdns.rply.spnamelen", FT_UINT8,
-           BASE_DEC, NULL, 0x0, NULL, HFILL};
-
-static header_field_info hfi_fcdns_rply_spname FCDNS_HFI_INIT =
-         {"Symbolic Port Name", "fcdns.rply.spname", FT_STRING, BASE_NONE, NULL,
-          0x0, NULL, HFILL};
-
-static header_field_info hfi_fcdns_req_spnamelen FCDNS_HFI_INIT =
-          {"Symbolic Port Name Length", "fcdns.req.spnamelen", FT_UINT8,
-           BASE_DEC, NULL, 0x0, NULL, HFILL};
-
-static header_field_info hfi_fcdns_req_spname FCDNS_HFI_INIT =
-          {"Symbolic Port Name", "fcdns.req.spname", FT_STRING, BASE_NONE, NULL,
-           0x0, NULL, HFILL};
-
-static header_field_info hfi_fcdns_rply_ipa FCDNS_HFI_INIT =
-          {"Initial Process Associator", "fcdns.rply.ipa", FT_BYTES, BASE_NONE,
-           NULL, 0x0, NULL, HFILL};
-
-static header_field_info hfi_fcdns_rply_ipnode FCDNS_HFI_INIT =
-          {"Node IP Address", "fcdns.rply.ipnode", FT_IPv6, BASE_NONE, NULL,
-           0x0, NULL, HFILL};
-
-static header_field_info hfi_fcdns_rply_ipport FCDNS_HFI_INIT =
-          {"Port IP Address", "fcdns.rply.ipport", FT_IPv6, BASE_NONE, NULL,
-           0x0, NULL, HFILL};
-
-static header_field_info hfi_fcdns_rply_fc4desclen FCDNS_HFI_INIT =
-          {"FC-4 Descriptor Length", "fcdns.rply.fc4desclen", FT_UINT8,
-           BASE_DEC, NULL, 0x0, NULL, HFILL};
-
-static header_field_info hfi_fcdns_rply_hrdaddr FCDNS_HFI_INIT =
-          {"Hard Address", "fcdns.rply.hrdaddr", FT_BYTES, SEP_DOT, NULL,
-           0x0, NULL, HFILL};
-
-static header_field_info hfi_fcdns_req_fdesclen FCDNS_HFI_INIT =
-          {"FC-4 Descriptor Length", "fcdns.req.fc4desclen", FT_UINT8, BASE_DEC,
-           NULL, 0x0, NULL, HFILL};
-
-static header_field_info hfi_fcdns_req_fdesc FCDNS_HFI_INIT =
-          {"FC-4 Descriptor", "fcdns.req.fc4desc", FT_STRING, BASE_NONE, NULL,
-           0x0, NULL, HFILL};
-
-static header_field_info hfi_fcdns_req_ip FCDNS_HFI_INIT =
-          {"IP Address", "fcdns.req.ip", FT_IPv6, BASE_NONE, NULL, 0x0,
-           NULL, HFILL};
-
-static header_field_info hfi_fcdns_rjtdetail FCDNS_HFI_INIT =
-          {"Reason Code Explanation", "fcdns.rply.reasondet", FT_UINT8,
-           BASE_HEX, VALS (fc_dns_rjt_det_code_val), 0x0, NULL, HFILL};
-
-static header_field_info hfi_fcdns_zone_mbrtype FCDNS_HFI_INIT =
-          {"Zone Member Type", "fcdns.zone.mbrtype", FT_UINT8, BASE_HEX,
-           VALS (fc_swils_zonembr_type_val), 0x0, NULL, HFILL};
-
-static header_field_info hfi_fcdns_zone_mbrid FCDNS_HFI_INIT =
-          {"Member Identifier", "fcdns.zone.mbrid", FT_STRING, BASE_NONE, NULL,
-           0x0, NULL, HFILL};
-
-static header_field_info hfi_fcdns_zone_mbrid_wwn FCDNS_HFI_INIT =
-          {"Member Identifier", "fcdns.zone.mbrid.wwn", FT_FCWWN, BASE_NONE, NULL,
-           0x0, NULL, HFILL};
-
-static header_field_info hfi_fcdns_zone_mbrid_uint FCDNS_HFI_INIT =
-          {"Member Identifier", "fcdns.zone.mbrid.uint", FT_UINT32, BASE_HEX, NULL,
-           0x0, NULL, HFILL};
-
-static header_field_info hfi_fcdns_zone_mbrid_fc FCDNS_HFI_INIT =
-          {"Member Identifier", "fcdns.zone.mbrid.fc", FT_BYTES, SEP_DOT, NULL,
-           0x0, NULL, HFILL};
-
-static header_field_info hfi_fcdns_id_length FCDNS_HFI_INIT =
-          {"Identifier Length", "fcdns.id_length", FT_UINT8, BASE_DEC, NULL, 0x0, NULL,
-           HFILL};
-
-static header_field_info hfi_fcdns_zone_flags FCDNS_HFI_INIT =
-          {"Flags", "fcdns.zone_flags", FT_UINT8, BASE_HEX, NULL, 0x0, NULL,
-           HFILL};
-
-static header_field_info hfi_fcdns_zonelen FCDNS_HFI_INIT =
-          {"Name Length", "fcdns.zone_len", FT_UINT8, BASE_DEC, NULL, 0x0, NULL,
-           HFILL};
-
-static header_field_info hfi_fcdns_zonenm FCDNS_HFI_INIT =
-          {"Zone Name", "fcdns.zonename", FT_STRING, BASE_NONE, NULL, 0x0, NULL,
-           HFILL};
-
-static header_field_info hfi_fcdns_portip FCDNS_HFI_INIT =
-          {"Port IP Address", "fcdns.portip", FT_IPv4, BASE_NONE, NULL, 0x0,
-           NULL, HFILL};
-
-static header_field_info hfi_fcdns_num_entries FCDNS_HFI_INIT =
-          {"Number of Entries", "fcdns.num_entries", FT_UINT32, BASE_HEX,
-           NULL, 0x0, NULL, HFILL};
-
-static header_field_info hfi_fcdns_sw2_objfmt FCDNS_HFI_INIT =
-          {"Name Entry Object Format", "fcdns.entry.objfmt", FT_UINT8, BASE_HEX,
-           NULL, 0x0, NULL, HFILL};
-
-static header_field_info hfi_fcdns_num_fc4desc FCDNS_HFI_INIT =
-          {"Number of FC4 Descriptors Registered", "fcdns.entry.numfc4desc",
-           FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL};
-
-static header_field_info hfi_fcdns_rply_ownerid FCDNS_HFI_INIT =
-          {"Owner Id", "fcdns.rply.ownerid", FT_BYTES, SEP_DOT, NULL, 0x0, NULL,
-           HFILL};
-
-static header_field_info hfi_fcdns_maxres_size FCDNS_HFI_INIT =
-          {"Maximum/Residual Size", "fcdns.maxres_size", FT_UINT16, BASE_DEC,
-           NULL, 0x0, NULL, HFILL};
-
-static header_field_info hfi_fcdns_reply_cos FCDNS_HFI_INIT =
-          {"Class of Service Supported", "fcdns.reply.cos", FT_UINT32, BASE_HEX,
-           NULL, 0x0, NULL, HFILL};
-
-static header_field_info hfi_fcdns_cos_f FCDNS_HFI_INIT =
-          {"F", "fcdns.cos.f", FT_BOOLEAN, 32,
-           TFS(&tfs_set_notset), 0x01, NULL, HFILL};
-
-static header_field_info hfi_fcdns_cos_1 FCDNS_HFI_INIT =
-          {"1", "fcdns.cos.1", FT_BOOLEAN, 32,
-           TFS(&tfs_set_notset), 0x02, NULL, HFILL};
-
-static header_field_info hfi_fcdns_cos_2 FCDNS_HFI_INIT =
-          {"2", "fcdns.cos.2", FT_BOOLEAN, 32,
-           TFS(&tfs_set_notset), 0x04, NULL, HFILL};
-
-static header_field_info hfi_fcdns_cos_3 FCDNS_HFI_INIT =
-          {"3", "fcdns.cos.3", FT_BOOLEAN, 32,
-           TFS(&tfs_set_notset), 0x08, NULL, HFILL};
-
-static header_field_info hfi_fcdns_cos_4 FCDNS_HFI_INIT =
-          {"4", "fcdns.cos.4", FT_BOOLEAN, 32,
-           TFS(&tfs_set_notset), 0x10, NULL, HFILL};
-
-static header_field_info hfi_fcdns_cos_6 FCDNS_HFI_INIT =
-          {"6", "fcdns.cos.6", FT_BOOLEAN, 32,
-           TFS(&tfs_set_notset), 0x40, NULL, HFILL};
-
-static header_field_info hfi_fcdns_fc4type_llcsnap FCDNS_HFI_INIT =
-          {"LLC/SNAP", "fcdns.fc4types.llc_snap", FT_BOOLEAN, 32,
-           TFS(&tfs_set_notset), 0x0010, NULL, HFILL};
-
-static header_field_info hfi_fcdns_fc4type_ip FCDNS_HFI_INIT =
-          {"IP", "fcdns.fc4types.ip", FT_BOOLEAN, 32,
-           TFS(&tfs_set_notset), 0x0020, NULL, HFILL};
-
-static header_field_info hfi_fcdns_fc4type_fcp FCDNS_HFI_INIT =
-          {"FCP", "fcdns.fc4types.fcp", FT_BOOLEAN, 32,
-           TFS(&tfs_set_notset), 0x0100, NULL, HFILL};
-
-static header_field_info hfi_fcdns_fc4type_swils FCDNS_HFI_INIT =
-          {"SW_ILS", "fcdns.fc4types.swils", FT_BOOLEAN, 32,
-           TFS(&tfs_set_notset), 0x0010, NULL, HFILL};
-
-static header_field_info hfi_fcdns_fc4type_snmp FCDNS_HFI_INIT =
-          {"SNMP", "fcdns.fc4types.snmp", FT_BOOLEAN, 32,
-           TFS(&tfs_set_notset), 0x0004, NULL, HFILL};
-
-static header_field_info hfi_fcdns_fc4type_gs3 FCDNS_HFI_INIT =
-          {"GS3", "fcdns.fc4types.gs3", FT_BOOLEAN, 32,
-           TFS(&tfs_set_notset), 0x0001, NULL, HFILL};
-
-static header_field_info hfi_fcdns_fc4type_vi FCDNS_HFI_INIT =
-          {"VI", "fcdns.fc4types.vi", FT_BOOLEAN, 32,
-           TFS(&tfs_set_notset), 0x0001, NULL, HFILL};
-
-static header_field_info hfi_fcdns_fc4features FCDNS_HFI_INIT =
-          {"FC-4 Feature Bits", "fcdns.fc4features", FT_UINT8,
-           BASE_HEX, NULL, 0x0, NULL, HFILL};
-
-static header_field_info hfi_fcdns_fc4features_i FCDNS_HFI_INIT =
-          {"I", "fcdns.fc4features.i", FT_BOOLEAN, 8,
-           TFS(&tfs_set_notset), 0x02, NULL, HFILL};
-
-static header_field_info hfi_fcdns_fc4features_t FCDNS_HFI_INIT =
-          {"T", "fcdns.fc4features.t", FT_BOOLEAN, 8,
-           TFS(&tfs_set_notset), 0x01, NULL, HFILL};
-
-static header_field_info hfi_fcdns_req_fc4type FCDNS_HFI_INIT =
-          {"FC-4 Type", "fcdns.req.fc4type", FT_UINT8, BASE_HEX,
-           VALS (fc_fc4_val), 0x0, NULL, HFILL};
-
+static int proto_fcdns = -1;
+
+static int hf_fcdns_cos_1 = -1;
+static int hf_fcdns_cos_2 = -1;
+static int hf_fcdns_cos_3 = -1;
+static int hf_fcdns_cos_4 = -1;
+static int hf_fcdns_cos_6 = -1;
+static int hf_fcdns_cos_f = -1;
+static int hf_fcdns_fc4features = -1;
+static int hf_fcdns_fc4features_i = -1;
+static int hf_fcdns_fc4features_t = -1;
+static int hf_fcdns_fc4type = -1;
+static int hf_fcdns_fc4type_fcp = -1;
+static int hf_fcdns_fc4type_gs3 = -1;
+static int hf_fcdns_fc4type_ip = -1;
+static int hf_fcdns_fc4type_llcsnap = -1;
+static int hf_fcdns_fc4type_snmp = -1;
+static int hf_fcdns_fc4type_swils = -1;
+static int hf_fcdns_fc4type_vi = -1;
+static int hf_fcdns_id_length = -1;
+static int hf_fcdns_maxres_size = -1;
+static int hf_fcdns_num_entries = -1;
+static int hf_fcdns_num_fc4desc = -1;
+static int hf_fcdns_opcode = -1;
+static int hf_fcdns_portip = -1;
+static int hf_fcdns_reason = -1;
+static int hf_fcdns_reply_cos = -1;
+static int hf_fcdns_req_areascope = -1;
+static int hf_fcdns_req_cos = -1;
+static int hf_fcdns_req_domainscope = -1;
+static int hf_fcdns_req_fc4type = -1;
+static int hf_fcdns_req_fc4types = -1;
+static int hf_fcdns_req_fdesc = -1;
+static int hf_fcdns_req_fdesclen = -1;
+static int hf_fcdns_req_ip = -1;
+static int hf_fcdns_req_nname = -1;
+static int hf_fcdns_req_pname = -1;
+static int hf_fcdns_req_portid = -1;
+static int hf_fcdns_req_ptype = -1;
+static int hf_fcdns_req_sname = -1;
+static int hf_fcdns_req_snamelen = -1;
+static int hf_fcdns_req_spname = -1;
+static int hf_fcdns_req_spnamelen = -1;
+static int hf_fcdns_rjtdetail = -1;
+static int hf_fcdns_rply_fc4desc = -1;
+static int hf_fcdns_rply_fc4desclen = -1;
+static int hf_fcdns_rply_fc4type = -1;
+static int hf_fcdns_rply_fpname = -1;
+static int hf_fcdns_rply_gft = -1;
+static int hf_fcdns_rply_hrdaddr = -1;
+static int hf_fcdns_rply_ipa = -1;
+static int hf_fcdns_rply_ipnode = -1;
+static int hf_fcdns_rply_ipport = -1;
+static int hf_fcdns_rply_nname = -1;
+static int hf_fcdns_rply_ownerid = -1;
+static int hf_fcdns_rply_pname = -1;
+static int hf_fcdns_rply_portid = -1;
+static int hf_fcdns_rply_ptype = -1;
+static int hf_fcdns_rply_sname = -1;
+static int hf_fcdns_rply_snamelen = -1;
+static int hf_fcdns_rply_spname = -1;
+static int hf_fcdns_rply_spnamelen = -1;
+static int hf_fcdns_sw2_objfmt = -1;
+static int hf_fcdns_vendor = -1;
+static int hf_fcdns_zone_flags = -1;
+static int hf_fcdns_zone_mbrid = -1;
+static int hf_fcdns_zone_mbrid_fc = -1;
+static int hf_fcdns_zone_mbrid_uint = -1;
+static int hf_fcdns_zone_mbrid_wwn = -1;
+static int hf_fcdns_zone_mbrtype = -1;
+static int hf_fcdns_zonelen = -1;
+static int hf_fcdns_zonenm = -1;
 
 /* Initialize the subtree pointers */
 static gint ett_fcdns = -1;
@@ -569,19 +340,19 @@ fcdns_hash (gconstpointer v)
 }
 
 static void
-dissect_cos_flags (proto_tree *parent_tree, tvbuff_t *tvb, int offset, const header_field_info *hfinfo)
+dissect_cos_flags (proto_tree *parent_tree, tvbuff_t *tvb, int offset, int hfindex)
 {
     static int * const flags[] = {
-        &hfi_fcdns_cos_f.id,
-        &hfi_fcdns_cos_1.id,
-        &hfi_fcdns_cos_2.id,
-        &hfi_fcdns_cos_3.id,
-        &hfi_fcdns_cos_4.id,
-        &hfi_fcdns_cos_6.id,
+        &hf_fcdns_cos_f,
+        &hf_fcdns_cos_1,
+        &hf_fcdns_cos_2,
+        &hf_fcdns_cos_3,
+        &hf_fcdns_cos_4,
+        &hf_fcdns_cos_6,
         NULL
     };
 
-    proto_tree_add_bitmask_with_flags(parent_tree, tvb, offset, hfinfo,
+    proto_tree_add_bitmask_with_flags(parent_tree, tvb, offset, hfindex,
                                 ett_cos_flags, flags, ENC_BIG_ENDIAN, BMT_NO_FALSE|BMT_NO_TFS);
 }
 
@@ -595,21 +366,21 @@ dissect_fc4features_and_type (proto_tree *parent_tree, tvbuff_t *tvb, int offset
 {
     guint8 type;
     static int * const flags[] = {
-        &hfi_fcdns_fc4features_i.id,
-        &hfi_fcdns_fc4features_t.id,
+        &hf_fcdns_fc4features_i,
+        &hf_fcdns_fc4features_t,
         NULL
     };
 
     type = tvb_get_guint8(tvb, offset+1);
 
     if(type==FC_TYPE_SCSI){
-        proto_tree_add_bitmask_with_flags(parent_tree, tvb, offset, &hfi_fcdns_fc4features,
+        proto_tree_add_bitmask_with_flags(parent_tree, tvb, offset, hf_fcdns_fc4features,
                                 ett_fc4features, flags, ENC_NA, BMT_NO_FALSE|BMT_NO_TFS);
     } else {
-        proto_tree_add_item(parent_tree, &hfi_fcdns_fc4features, tvb, offset, 1, ENC_NA);
+        proto_tree_add_item(parent_tree, hf_fcdns_fc4features, tvb, offset, 1, ENC_NA);
     }
 
-    proto_tree_add_item (parent_tree, &hfi_fcdns_req_fc4type, tvb, offset+1, 1, ENC_BIG_ENDIAN);
+    proto_tree_add_item (parent_tree, hf_fcdns_req_fc4type, tvb, offset+1, 1, ENC_BIG_ENDIAN);
 }
 
 /* The feature routines just decode FCP's FC-4 features field
@@ -618,12 +389,12 @@ static void
 dissect_fc4features (proto_tree *parent_tree, tvbuff_t *tvb, int offset)
 {
     static int * const flags[] = {
-        &hfi_fcdns_fc4features_i.id,
-        &hfi_fcdns_fc4features_t.id,
+        &hf_fcdns_fc4features_i,
+        &hf_fcdns_fc4features_t,
         NULL
     };
 
-    proto_tree_add_bitmask(parent_tree, tvb, offset, &hfi_fcdns_fc4features,
+    proto_tree_add_bitmask(parent_tree, tvb, offset, hf_fcdns_fc4features,
                            ett_fc4features, flags, ENC_NA);
 }
 
@@ -631,31 +402,31 @@ dissect_fc4features (proto_tree *parent_tree, tvbuff_t *tvb, int offset)
 
 /* Decodes LLC/SNAP, IP, FCP, VI, GS, SW_ILS types only */
 static void
-dissect_fc4type (proto_tree *parent_tree, tvbuff_t *tvb, int offset, header_field_info *hfinfo)
+dissect_fc4type (proto_tree *parent_tree, tvbuff_t *tvb, int offset, int hfindex)
 {
     proto_item *item;
     proto_tree *tree;
     guint32 flags;
 
-    item=proto_tree_add_item(parent_tree, hfinfo, tvb, offset,
+    item=proto_tree_add_item(parent_tree, hfindex, tvb, offset,
                                 32, ENC_NA);
     tree=proto_item_add_subtree(item, ett_fc4flags);
 
     flags = tvb_get_ntohl (tvb, offset);
 
-    proto_tree_add_boolean(tree, &hfi_fcdns_fc4type_fcp, tvb, offset, 4, flags);
+    proto_tree_add_boolean(tree, hf_fcdns_fc4type_fcp, tvb, offset, 4, flags);
     if (flags&0x0100){
         proto_item_append_text(item, "  FCP");
     }
     flags&=(~( 0x0100 ));
 
-    proto_tree_add_boolean(tree, &hfi_fcdns_fc4type_ip, tvb, offset, 4, flags);
+    proto_tree_add_boolean(tree, hf_fcdns_fc4type_ip, tvb, offset, 4, flags);
     if (flags&0x0020){
         proto_item_append_text(item, "  IP");
     }
     flags&=(~( 0x0020 ));
 
-    proto_tree_add_boolean(tree, &hfi_fcdns_fc4type_llcsnap, tvb, offset, 4, flags);
+    proto_tree_add_boolean(tree, hf_fcdns_fc4type_llcsnap, tvb, offset, 4, flags);
     if (flags&0x0010){
         proto_item_append_text(item, "  LLC/SNAP");
     }
@@ -664,19 +435,19 @@ dissect_fc4type (proto_tree *parent_tree, tvbuff_t *tvb, int offset, header_fiel
 
     flags = tvb_get_ntohl (tvb, offset+4);
 
-    proto_tree_add_boolean(tree, &hfi_fcdns_fc4type_swils, tvb, offset+4, 4, flags);
+    proto_tree_add_boolean(tree, hf_fcdns_fc4type_swils, tvb, offset+4, 4, flags);
     if (flags&0x0010){
         proto_item_append_text(item, "  SW_ILS");
     }
     flags&=(~( 0x0010 ));
 
-    proto_tree_add_boolean(tree, &hfi_fcdns_fc4type_snmp, tvb, offset+4, 4, flags);
+    proto_tree_add_boolean(tree, hf_fcdns_fc4type_snmp, tvb, offset+4, 4, flags);
     if (flags&0x0004){
         proto_item_append_text(item, "  SNMP");
     }
     flags&=(~( 0x0004 ));
 
-    proto_tree_add_boolean(tree, &hfi_fcdns_fc4type_gs3, tvb, offset+4, 4, flags);
+    proto_tree_add_boolean(tree, hf_fcdns_fc4type_gs3, tvb, offset+4, 4, flags);
     if (flags&0x0001){
         proto_item_append_text(item, "  GS3");
     }
@@ -685,7 +456,7 @@ dissect_fc4type (proto_tree *parent_tree, tvbuff_t *tvb, int offset, header_fiel
 
     flags = tvb_get_ntohl (tvb, offset+8);
 
-    proto_tree_add_boolean(tree, &hfi_fcdns_fc4type_vi, tvb, offset+8, 4, flags);
+    proto_tree_add_boolean(tree, hf_fcdns_fc4type_vi, tvb, offset+8, 4, flags);
     if (flags&0x0001){
         proto_item_append_text(item, "  VI");
     }
@@ -699,7 +470,7 @@ dissect_fc4type (proto_tree *parent_tree, tvbuff_t *tvb, int offset, header_fiel
 static void
 dissect_fcdns_req_portid (tvbuff_t *tvb, proto_tree *tree, int offset)
 {
-    proto_tree_add_item (tree, &hfi_fcdns_req_portid, tvb, offset, 3, ENC_NA);
+    proto_tree_add_item (tree, hf_fcdns_req_portid, tvb, offset, 3, ENC_NA);
 }
 
 static void
@@ -713,60 +484,60 @@ dissect_fcdns_ganxt (tvbuff_t *tvb, proto_tree *req_tree, gboolean isreq)
             dissect_fcdns_req_portid (tvb, req_tree, offset+1);
         }
         else {
-            proto_tree_add_item (req_tree, &hfi_fcdns_rply_ptype, tvb, offset,
+            proto_tree_add_item (req_tree, hf_fcdns_rply_ptype, tvb, offset,
                                  1, ENC_BIG_ENDIAN);
-            proto_tree_add_item (req_tree, &hfi_fcdns_rply_portid, tvb,
+            proto_tree_add_item (req_tree, hf_fcdns_rply_portid, tvb,
                                    offset+1, 3, ENC_NA);
-            proto_tree_add_item (req_tree, &hfi_fcdns_rply_pname, tvb,
+            proto_tree_add_item (req_tree, hf_fcdns_rply_pname, tvb,
                                    offset+4, 8, ENC_NA);
             len = tvb_get_guint8 (tvb, offset+12);
-            proto_tree_add_item (req_tree, &hfi_fcdns_rply_spnamelen, tvb,
+            proto_tree_add_item (req_tree, hf_fcdns_rply_spnamelen, tvb,
                                  offset+12, 1, ENC_BIG_ENDIAN);
             if (!tvb_offset_exists (tvb, 29+len))
                 return;
 
             if (len) {
-                proto_tree_add_item (req_tree, &hfi_fcdns_rply_spname, tvb,
+                proto_tree_add_item (req_tree, hf_fcdns_rply_spname, tvb,
                                      offset+13, len, ENC_ASCII|ENC_NA);
             }
 
             if (tvb_offset_exists (tvb, 292)) {
-                proto_tree_add_item (req_tree, &hfi_fcdns_rply_nname, tvb,
+                proto_tree_add_item (req_tree, hf_fcdns_rply_nname, tvb,
                                        offset+268, 8, ENC_NA);
             }
             if (tvb_offset_exists (tvb, 548)) {
                 len = tvb_get_guint8 (tvb, offset+276);
-                proto_tree_add_item (req_tree, &hfi_fcdns_rply_snamelen, tvb,
+                proto_tree_add_item (req_tree, hf_fcdns_rply_snamelen, tvb,
                                      offset+276, 1, ENC_BIG_ENDIAN);
                 if (len) {
-                    proto_tree_add_item (req_tree, &hfi_fcdns_rply_sname, tvb,
+                    proto_tree_add_item (req_tree, hf_fcdns_rply_sname, tvb,
                                          offset+277, len, ENC_ASCII|ENC_NA);
                 }
             }
             if (tvb_offset_exists (tvb, 556)) {
-                proto_tree_add_item (req_tree, &hfi_fcdns_rply_ipa, tvb,
+                proto_tree_add_item (req_tree, hf_fcdns_rply_ipa, tvb,
                                      offset+532, 8, ENC_NA);
             }
             if (tvb_offset_exists (tvb, 572)) {
-                proto_tree_add_item (req_tree, &hfi_fcdns_rply_ipnode, tvb,
+                proto_tree_add_item (req_tree, hf_fcdns_rply_ipnode, tvb,
                                      offset+540, 16, ENC_NA);
             }
             if (tvb_offset_exists (tvb, 576)) {
-                dissect_cos_flags(req_tree, tvb, offset+556, &hfi_fcdns_reply_cos);
+                dissect_cos_flags(req_tree, tvb, offset+556, hf_fcdns_reply_cos);
             }
             if (tvb_offset_exists (tvb, 608)) {
-                dissect_fc4type(req_tree, tvb, offset+560, &hfi_fcdns_rply_gft);
+                dissect_fc4type(req_tree, tvb, offset+560, hf_fcdns_rply_gft);
             }
             if (tvb_offset_exists (tvb, 624)) {
-                proto_tree_add_item (req_tree, &hfi_fcdns_rply_ipport, tvb,
+                proto_tree_add_item (req_tree, hf_fcdns_rply_ipport, tvb,
                                      offset+592, 16, ENC_NA);
             }
             if (tvb_offset_exists (tvb, 632)) {
-                proto_tree_add_item (req_tree, &hfi_fcdns_rply_fpname, tvb,
+                proto_tree_add_item (req_tree, hf_fcdns_rply_fpname, tvb,
                                        offset+608, 8, ENC_NA);
             }
             if (tvb_offset_exists (tvb, 635)) {
-                proto_tree_add_item (req_tree, &hfi_fcdns_rply_hrdaddr, tvb,
+                proto_tree_add_item (req_tree, hf_fcdns_rply_hrdaddr, tvb,
                                        offset+617, 3, ENC_NA);
             }
         }
@@ -783,7 +554,7 @@ dissect_fcdns_gpnid (tvbuff_t *tvb, proto_tree *req_tree, gboolean isreq)
             dissect_fcdns_req_portid (tvb, req_tree, offset+1);
         }
         else {
-            proto_tree_add_item (req_tree, &hfi_fcdns_rply_pname, tvb, offset,
+            proto_tree_add_item (req_tree, hf_fcdns_rply_pname, tvb, offset,
                                    8, ENC_NA);
         }
     }
@@ -799,7 +570,7 @@ dissect_fcdns_gnnid (tvbuff_t *tvb, proto_tree *req_tree, gboolean isreq)
             dissect_fcdns_req_portid (tvb, req_tree, offset+1);
         }
         else {
-            proto_tree_add_item (req_tree, &hfi_fcdns_rply_nname, tvb,
+            proto_tree_add_item (req_tree, hf_fcdns_rply_nname, tvb,
                                    offset, 8, ENC_NA);
         }
     }
@@ -815,7 +586,7 @@ dissect_fcdns_gcsid (tvbuff_t *tvb, proto_tree *req_tree, gboolean isreq)
             dissect_fcdns_req_portid (tvb, req_tree, offset);
         }
         else {
-            dissect_cos_flags(req_tree, tvb, offset, &hfi_fcdns_reply_cos);
+            dissect_cos_flags(req_tree, tvb, offset, hf_fcdns_reply_cos);
         }
     }
 }
@@ -830,7 +601,7 @@ dissect_fcdns_gftid (tvbuff_t *tvb, proto_tree *req_tree, gboolean isreq)
             dissect_fcdns_req_portid (tvb, req_tree, offset+1);
         }
         else {
-            dissect_fc4type(req_tree, tvb, offset, &hfi_fcdns_rply_gft);
+            dissect_fc4type(req_tree, tvb, offset, hf_fcdns_rply_gft);
         }
     }
 }
@@ -847,9 +618,9 @@ dissect_fcdns_gspnid (tvbuff_t *tvb, proto_tree *req_tree, gboolean isreq)
         }
         else {
             len = tvb_get_guint8 (tvb, offset);
-            proto_tree_add_item (req_tree, &hfi_fcdns_rply_spnamelen,
+            proto_tree_add_item (req_tree, hf_fcdns_rply_spnamelen,
                                  tvb, offset, 1, ENC_BIG_ENDIAN);
-            proto_tree_add_item (req_tree, &hfi_fcdns_rply_spname, tvb,
+            proto_tree_add_item (req_tree, hf_fcdns_rply_spname, tvb,
                                  offset+1, len, ENC_ASCII|ENC_NA);
         }
     }
@@ -865,7 +636,7 @@ dissect_fcdns_gptid (tvbuff_t *tvb, proto_tree *req_tree, gboolean isreq)
             dissect_fcdns_req_portid (tvb, req_tree, offset+1);
         }
         else {
-            proto_tree_add_item (req_tree, &hfi_fcdns_rply_ptype, tvb,
+            proto_tree_add_item (req_tree, hf_fcdns_rply_ptype, tvb,
                                  offset, 1, ENC_BIG_ENDIAN);
         }
     }
@@ -881,7 +652,7 @@ dissect_fcdns_gfpnid (tvbuff_t *tvb, proto_tree *req_tree, gboolean isreq)
             dissect_fcdns_req_portid (tvb, req_tree, offset+1);
         }
         else {
-            proto_tree_add_item (req_tree, &hfi_fcdns_rply_fpname, tvb,
+            proto_tree_add_item (req_tree, hf_fcdns_rply_fpname, tvb,
                                    offset, 8, ENC_NA);
         }
     }
@@ -897,7 +668,7 @@ dissect_fcdns_gfdid (tvbuff_t *tvb, proto_tree *req_tree, gboolean isreq)
     if (req_tree) {
         if (isreq) {
             dissect_fcdns_req_portid (tvb, req_tree, offset+1);
-            dissect_fc4type(req_tree, tvb, offset+4, &hfi_fcdns_fc4type);
+            dissect_fc4type(req_tree, tvb, offset+4, hf_fcdns_fc4type);
         }
         else {
             tot_len = tvb_reported_length_remaining (tvb, offset); /* excluding CT header */
@@ -905,7 +676,7 @@ dissect_fcdns_gfdid (tvbuff_t *tvb, proto_tree *req_tree, gboolean isreq)
                 /* The count of the descriptors is not returned and so we have
                  * to track the display by the length field */
                 desclen = tvb_get_guint8 (tvb, offset);
-                proto_tree_add_item (req_tree, &hfi_fcdns_rply_fc4desc, tvb,
+                proto_tree_add_item (req_tree, hf_fcdns_rply_fc4desc, tvb,
                                      offset, desclen, ENC_NA);
                 tot_len -= 255; /* descriptors are aligned to 255 bytes */
                 offset += 256;
@@ -936,11 +707,11 @@ dissect_fcdns_gidpn (tvbuff_t *tvb, proto_tree *req_tree, gboolean isreq)
 
     if (req_tree) {
         if (isreq) {
-            proto_tree_add_item (req_tree, &hfi_fcdns_req_pname, tvb,
+            proto_tree_add_item (req_tree, hf_fcdns_req_pname, tvb,
                                    offset, 8, ENC_NA);
         }
         else {
-            proto_tree_add_item (req_tree, &hfi_fcdns_rply_portid, tvb,
+            proto_tree_add_item (req_tree, hf_fcdns_rply_portid, tvb,
                                    offset+1, 3, ENC_NA);
         }
     }
@@ -953,11 +724,11 @@ dissect_fcdns_gipppn (tvbuff_t *tvb, proto_tree *req_tree, gboolean isreq)
 
     if (req_tree) {
         if (isreq) {
-            proto_tree_add_item (req_tree, &hfi_fcdns_req_pname, tvb,
+            proto_tree_add_item (req_tree, hf_fcdns_req_pname, tvb,
                                    offset, 8, ENC_NA);
         }
         else {
-            proto_tree_add_item (req_tree, &hfi_fcdns_rply_ipport, tvb, offset,
+            proto_tree_add_item (req_tree, hf_fcdns_rply_ipport, tvb, offset,
                                  16, ENC_NA);
         }
     }
@@ -971,13 +742,13 @@ dissect_fcdns_gidnn (tvbuff_t *tvb, proto_tree *req_tree, gboolean isreq)
 
     if (req_tree) {
         if (isreq) {
-            proto_tree_add_item (req_tree, &hfi_fcdns_req_nname, tvb,
+            proto_tree_add_item (req_tree, hf_fcdns_req_nname, tvb,
                                    offset, 8, ENC_NA);
         }
         else {
             do {
                 islast = tvb_get_guint8 (tvb, offset);
-                proto_tree_add_item (req_tree, &hfi_fcdns_rply_portid,
+                proto_tree_add_item (req_tree, hf_fcdns_rply_portid,
                                        tvb, offset+1, 3, ENC_NA);
                 offset += 4;
             } while (!(islast & 0x80));
@@ -992,11 +763,11 @@ dissect_fcdns_gipnn (tvbuff_t *tvb, proto_tree *req_tree, gboolean isreq)
 
     if (req_tree) {
         if (isreq) {
-            proto_tree_add_item (req_tree, &hfi_fcdns_req_nname, tvb,
+            proto_tree_add_item (req_tree, hf_fcdns_req_nname, tvb,
                                    offset, 8, ENC_NA);
         }
         else {
-            proto_tree_add_item (req_tree, &hfi_fcdns_rply_ipnode, tvb, offset,
+            proto_tree_add_item (req_tree, hf_fcdns_rply_ipnode, tvb, offset,
                                  16, ENC_NA);
         }
     }
@@ -1010,15 +781,15 @@ dissect_fcdns_gpnnn (tvbuff_t *tvb, proto_tree *req_tree, gboolean isreq)
 
     if (req_tree) {
         if (isreq) {
-            proto_tree_add_item (req_tree, &hfi_fcdns_req_nname, tvb,
+            proto_tree_add_item (req_tree, hf_fcdns_req_nname, tvb,
                                    offset, 8, ENC_NA);
         }
         else {
             do {
                 islast = tvb_get_guint8 (tvb, offset);
-                proto_tree_add_item (req_tree, &hfi_fcdns_rply_portid,
+                proto_tree_add_item (req_tree, hf_fcdns_rply_portid,
                                        tvb, offset+1, 3, ENC_NA);
-                proto_tree_add_item (req_tree, &hfi_fcdns_rply_pname,
+                proto_tree_add_item (req_tree, hf_fcdns_rply_pname,
                                        tvb, offset+8, 8, ENC_NA);
                 offset += 16;
             } while (!(islast & 0x80));
@@ -1034,14 +805,14 @@ dissect_fcdns_gsnnnn (tvbuff_t *tvb, proto_tree *req_tree, gboolean isreq)
 
     if (req_tree) {
         if (isreq) {
-            proto_tree_add_item (req_tree, &hfi_fcdns_req_nname, tvb,
+            proto_tree_add_item (req_tree, hf_fcdns_req_nname, tvb,
                                    offset, 8, ENC_NA);
         }
         else {
             len = tvb_get_guint8 (tvb, offset);
-            proto_tree_add_item (req_tree, &hfi_fcdns_rply_snamelen, tvb,
+            proto_tree_add_item (req_tree, hf_fcdns_rply_snamelen, tvb,
                                  offset, 1, ENC_BIG_ENDIAN);
-            proto_tree_add_item (req_tree, &hfi_fcdns_rply_sname, tvb,
+            proto_tree_add_item (req_tree, hf_fcdns_rply_sname, tvb,
                                  offset+1, len, ENC_ASCII|ENC_NA);
         }
     }
@@ -1055,17 +826,17 @@ dissect_fcdns_gidft (tvbuff_t *tvb, proto_tree *req_tree, gboolean isreq)
 
     if (req_tree) {
         if (isreq) {
-            proto_tree_add_item (req_tree, &hfi_fcdns_req_domainscope,
+            proto_tree_add_item (req_tree, hf_fcdns_req_domainscope,
                                  tvb, offset+1, 1, ENC_BIG_ENDIAN);
-            proto_tree_add_item (req_tree, &hfi_fcdns_req_areascope,
+            proto_tree_add_item (req_tree, hf_fcdns_req_areascope,
                                  tvb, offset+2, 1, ENC_BIG_ENDIAN);
-            proto_tree_add_item (req_tree, &hfi_fcdns_req_fc4type,
+            proto_tree_add_item (req_tree, hf_fcdns_req_fc4type,
                                  tvb, offset+3, 1, ENC_BIG_ENDIAN);
         }
         else {
             do {
                 islast = tvb_get_guint8 (tvb, offset);
-                proto_tree_add_item (req_tree, &hfi_fcdns_rply_portid,
+                proto_tree_add_item (req_tree, hf_fcdns_rply_portid,
                                        tvb, offset+1, 3, ENC_NA);
                 offset += 4;
             } while (!(islast & 0x80));
@@ -1081,19 +852,19 @@ dissect_fcdns_gpnft (tvbuff_t *tvb, proto_tree *req_tree, gboolean isreq)
 
     if (req_tree) {
         if (isreq) {
-            proto_tree_add_item (req_tree, &hfi_fcdns_req_domainscope,
+            proto_tree_add_item (req_tree, hf_fcdns_req_domainscope,
                                  tvb, offset+1, 1, ENC_BIG_ENDIAN);
-            proto_tree_add_item (req_tree, &hfi_fcdns_req_areascope,
+            proto_tree_add_item (req_tree, hf_fcdns_req_areascope,
                                  tvb, offset+2, 1, ENC_BIG_ENDIAN);
-            proto_tree_add_item (req_tree, &hfi_fcdns_req_fc4type,
+            proto_tree_add_item (req_tree, hf_fcdns_req_fc4type,
                                  tvb, offset+3, 1, ENC_BIG_ENDIAN);
         }
         else {
             do {
                 islast = tvb_get_guint8 (tvb, offset);
-                proto_tree_add_item (req_tree, &hfi_fcdns_rply_portid,
+                proto_tree_add_item (req_tree, hf_fcdns_rply_portid,
                                        tvb, offset+1, 3, ENC_NA);
-                proto_tree_add_item (req_tree, &hfi_fcdns_rply_pname,
+                proto_tree_add_item (req_tree, hf_fcdns_rply_pname,
                                        tvb, offset+4, 8, ENC_NA);
                 offset += 16;
             } while (!(islast & 0x80));
@@ -1109,19 +880,19 @@ dissect_fcdns_gnnft (tvbuff_t *tvb, proto_tree *req_tree, gboolean isreq)
 
     if (req_tree) {
         if (isreq) {
-            proto_tree_add_item (req_tree, &hfi_fcdns_req_domainscope,
+            proto_tree_add_item (req_tree, hf_fcdns_req_domainscope,
                                  tvb, offset+1, 1, ENC_BIG_ENDIAN);
-            proto_tree_add_item (req_tree, &hfi_fcdns_req_areascope,
+            proto_tree_add_item (req_tree, hf_fcdns_req_areascope,
                                  tvb, offset+2, 1, ENC_BIG_ENDIAN);
-            proto_tree_add_item (req_tree, &hfi_fcdns_req_fc4type,
+            proto_tree_add_item (req_tree, hf_fcdns_req_fc4type,
                                  tvb, offset+3, 1, ENC_BIG_ENDIAN);
         }
         else {
             do {
                 islast = tvb_get_guint8 (tvb, offset);
-                proto_tree_add_item (req_tree, &hfi_fcdns_rply_portid,
+                proto_tree_add_item (req_tree, hf_fcdns_rply_portid,
                                        tvb, offset+1, 3, ENC_NA);
-                proto_tree_add_item (req_tree, &hfi_fcdns_rply_nname,
+                proto_tree_add_item (req_tree, hf_fcdns_rply_nname,
                                        tvb, offset+4, 8, ENC_NA);
                 offset += 16;
             } while (!(islast & 0x80));
@@ -1137,17 +908,17 @@ dissect_fcdns_gidpt (tvbuff_t *tvb, proto_tree *req_tree, gboolean isreq)
 
     if (req_tree) {
         if (isreq) {
-            proto_tree_add_item (req_tree, &hfi_fcdns_req_ptype,
+            proto_tree_add_item (req_tree, hf_fcdns_req_ptype,
                                  tvb, offset, 1, ENC_BIG_ENDIAN);
-            proto_tree_add_item (req_tree, &hfi_fcdns_req_domainscope,
+            proto_tree_add_item (req_tree, hf_fcdns_req_domainscope,
                                  tvb, offset+1, 1, ENC_BIG_ENDIAN);
-            proto_tree_add_item (req_tree, &hfi_fcdns_req_areascope,
+            proto_tree_add_item (req_tree, hf_fcdns_req_areascope,
                                  tvb, offset+2, 1, ENC_BIG_ENDIAN);
         }
         else {
             do {
                 islast = tvb_get_guint8 (tvb, offset);
-                proto_tree_add_item (req_tree, &hfi_fcdns_rply_portid,
+                proto_tree_add_item (req_tree, hf_fcdns_rply_portid,
                                        tvb, offset+1, 3, ENC_NA);
                 offset += 4;
             } while (!(islast & 0x80));
@@ -1163,13 +934,13 @@ dissect_fcdns_gidipp (tvbuff_t *tvb, proto_tree *req_tree, gboolean isreq)
 
     if (req_tree) {
         if (isreq) {
-            proto_tree_add_item (req_tree, &hfi_fcdns_req_ip, tvb, offset,
+            proto_tree_add_item (req_tree, hf_fcdns_req_ip, tvb, offset,
                                  16, ENC_NA);
         }
         else {
             do {
                 islast = tvb_get_guint8 (tvb, offset);
-                proto_tree_add_item (req_tree, &hfi_fcdns_rply_portid,
+                proto_tree_add_item (req_tree, hf_fcdns_rply_portid,
                                        tvb, offset+1, 3, ENC_NA);
                 offset += 4;
             } while (!(islast & 0x80));
@@ -1185,16 +956,16 @@ dissect_fcdns_gidff (tvbuff_t *tvb, proto_tree *req_tree, gboolean isreq)
 
     if (req_tree) {
         if (isreq) {
-            proto_tree_add_item (req_tree, &hfi_fcdns_req_domainscope, tvb,
+            proto_tree_add_item (req_tree, hf_fcdns_req_domainscope, tvb,
                                  offset+1, 1, ENC_BIG_ENDIAN);
-            proto_tree_add_item (req_tree, &hfi_fcdns_req_areascope, tvb,
+            proto_tree_add_item (req_tree, hf_fcdns_req_areascope, tvb,
                                  offset+2, 1, ENC_BIG_ENDIAN);
             dissect_fc4features_and_type(req_tree, tvb, offset+6);
         }
         else {
             do {
                 islast = tvb_get_guint8 (tvb, offset);
-                proto_tree_add_item (req_tree, &hfi_fcdns_rply_portid,
+                proto_tree_add_item (req_tree, hf_fcdns_rply_portid,
                                        tvb, offset+1, 3, ENC_NA);
                 offset += 4;
             } while (!(islast & 0x80));
@@ -1209,9 +980,9 @@ dissect_fcdns_rpnid (tvbuff_t *tvb, proto_tree *req_tree, gboolean isreq)
 
     if (req_tree) {
         if (isreq) {
-            proto_tree_add_item (req_tree, &hfi_fcdns_req_portid,
+            proto_tree_add_item (req_tree, hf_fcdns_req_portid,
                                    tvb, offset+1, 3, ENC_NA);
-            proto_tree_add_item (req_tree, &hfi_fcdns_req_pname, tvb,
+            proto_tree_add_item (req_tree, hf_fcdns_req_pname, tvb,
                                    offset+4, 8, ENC_NA);
         }
     }
@@ -1224,9 +995,9 @@ dissect_fcdns_rnnid (tvbuff_t *tvb, proto_tree *req_tree, gboolean isreq)
 
     if (req_tree) {
         if (isreq) {
-            proto_tree_add_item (req_tree, &hfi_fcdns_req_portid,
+            proto_tree_add_item (req_tree, hf_fcdns_req_portid,
                                    tvb, offset+1, 3, ENC_NA);
-            proto_tree_add_item (req_tree, &hfi_fcdns_req_nname, tvb,
+            proto_tree_add_item (req_tree, hf_fcdns_req_nname, tvb,
                                    offset+4, 8, ENC_NA);
         }
     }
@@ -1238,9 +1009,9 @@ dissect_fcdns_rcsid (tvbuff_t *tvb, proto_tree *req_tree, gboolean isreq)
     int offset = 16;            /* past the fc_ct header */
 
     if (req_tree && isreq) {
-        proto_tree_add_item (req_tree, &hfi_fcdns_req_portid, tvb,
+        proto_tree_add_item (req_tree, hf_fcdns_req_portid, tvb,
                                offset+1, 3, ENC_NA);
-        dissect_cos_flags(req_tree, tvb, offset+4, &hfi_fcdns_req_cos);
+        dissect_cos_flags(req_tree, tvb, offset+4, hf_fcdns_req_cos);
     }
 }
 
@@ -1250,9 +1021,9 @@ dissect_fcdns_rptid (tvbuff_t *tvb, proto_tree *req_tree, gboolean isreq)
     int offset = 16;            /* past the fc_ct header */
 
     if (isreq) {
-        proto_tree_add_item (req_tree, &hfi_fcdns_req_portid, tvb,
+        proto_tree_add_item (req_tree, hf_fcdns_req_portid, tvb,
                                offset+1, 3, ENC_NA);
-        proto_tree_add_item (req_tree, &hfi_fcdns_req_ptype, tvb,
+        proto_tree_add_item (req_tree, hf_fcdns_req_ptype, tvb,
                              offset+4, 1, ENC_BIG_ENDIAN);
     }
 }
@@ -1263,9 +1034,9 @@ dissect_fcdns_rftid (tvbuff_t *tvb, proto_tree *req_tree, gboolean isreq)
     int offset = 16;            /* past the fc_ct header */
 
     if (isreq) {
-        proto_tree_add_item (req_tree, &hfi_fcdns_req_portid, tvb,
+        proto_tree_add_item (req_tree, hf_fcdns_req_portid, tvb,
                                offset+1, 3, ENC_NA);
-        dissect_fc4type(req_tree, tvb, offset+4, &hfi_fcdns_req_fc4types);
+        dissect_fc4type(req_tree, tvb, offset+4, hf_fcdns_req_fc4types);
     }
 }
 
@@ -1276,13 +1047,13 @@ dissect_fcdns_rspnid (tvbuff_t *tvb, proto_tree *req_tree, gboolean isreq)
     guint8 len;
 
     if (req_tree && isreq) {
-        proto_tree_add_item (req_tree, &hfi_fcdns_req_portid, tvb,
+        proto_tree_add_item (req_tree, hf_fcdns_req_portid, tvb,
                                offset+1, 3, ENC_NA);
-        proto_tree_add_item (req_tree, &hfi_fcdns_req_spnamelen, tvb,
+        proto_tree_add_item (req_tree, hf_fcdns_req_spnamelen, tvb,
                              offset+4, 1, ENC_BIG_ENDIAN);
         len = tvb_get_guint8 (tvb, offset+4);
 
-        proto_tree_add_item (req_tree, &hfi_fcdns_req_spname, tvb, offset+5,
+        proto_tree_add_item (req_tree, hf_fcdns_req_spname, tvb, offset+5,
                              len, ENC_ASCII|ENC_NA);
     }
 }
@@ -1293,9 +1064,9 @@ dissect_fcdns_rippid (tvbuff_t *tvb, proto_tree *req_tree, gboolean isreq)
     int offset = 16;            /* past the fc_ct header */
 
     if (isreq) {
-        proto_tree_add_item (req_tree, &hfi_fcdns_req_portid, tvb,
+        proto_tree_add_item (req_tree, hf_fcdns_req_portid, tvb,
                                offset+1, 3, ENC_NA);
-        proto_tree_add_item (req_tree, &hfi_fcdns_req_ip, tvb,
+        proto_tree_add_item (req_tree, hf_fcdns_req_ip, tvb,
                              offset+4, 16, ENC_NA);
     }
 }
@@ -1307,17 +1078,17 @@ dissect_fcdns_rfdid (tvbuff_t *tvb, proto_tree *req_tree, gboolean isreq)
     int len;
 
     if (isreq) {
-        proto_tree_add_item (req_tree, &hfi_fcdns_req_portid, tvb,
+        proto_tree_add_item (req_tree, hf_fcdns_req_portid, tvb,
                                offset+1, 3, ENC_NA);
-        dissect_fc4type(req_tree, tvb, offset+4, &hfi_fcdns_req_fc4types);
+        dissect_fc4type(req_tree, tvb, offset+4, hf_fcdns_req_fc4types);
 
         offset += 36;
         len = tvb_reported_length_remaining (tvb, offset);
 
         while (len > 0) {
-            proto_tree_add_item (req_tree, &hfi_fcdns_req_fdesclen, tvb, offset,
+            proto_tree_add_item (req_tree, hf_fcdns_req_fdesclen, tvb, offset,
                                  1, ENC_BIG_ENDIAN);
-            proto_tree_add_item (req_tree, &hfi_fcdns_req_fdesc, tvb, offset+1,
+            proto_tree_add_item (req_tree, hf_fcdns_req_fdesc, tvb, offset+1,
                                  len, ENC_ASCII|ENC_NA);
             offset += 256;
             len -= 256;
@@ -1331,7 +1102,7 @@ dissect_fcdns_rffid (tvbuff_t *tvb, proto_tree *req_tree, gboolean isreq)
     int offset = 16;            /* past the fc_ct header */
 
     if (isreq) {
-        proto_tree_add_item (req_tree, &hfi_fcdns_req_portid, tvb, offset+1, 3, ENC_NA);
+        proto_tree_add_item (req_tree, hf_fcdns_req_portid, tvb, offset+1, 3, ENC_NA);
         dissect_fc4features_and_type(req_tree, tvb, offset+6);
     }
 }
@@ -1342,8 +1113,8 @@ dissect_fcdns_ripnn (tvbuff_t *tvb, proto_tree *req_tree, gboolean isreq)
     int offset = 16;            /* past the fc_ct header */
 
     if (isreq) {
-        proto_tree_add_item (req_tree, &hfi_fcdns_req_nname, tvb, offset, 8, ENC_NA);
-        proto_tree_add_item (req_tree, &hfi_fcdns_req_ip, tvb, offset+8, 16, ENC_NA);
+        proto_tree_add_item (req_tree, hf_fcdns_req_nname, tvb, offset, 8, ENC_NA);
+        proto_tree_add_item (req_tree, hf_fcdns_req_ip, tvb, offset+8, 16, ENC_NA);
     }
 }
 
@@ -1354,12 +1125,12 @@ dissect_fcdns_rsnnnn (tvbuff_t *tvb, proto_tree *req_tree, gboolean isreq)
     guint8 len;
 
     if (isreq) {
-        proto_tree_add_item (req_tree, &hfi_fcdns_req_nname, tvb, offset, 8, ENC_NA);
+        proto_tree_add_item (req_tree, hf_fcdns_req_nname, tvb, offset, 8, ENC_NA);
         len = tvb_get_guint8 (tvb, offset+8);
 
-        proto_tree_add_item (req_tree, &hfi_fcdns_req_snamelen, tvb, offset+8,
+        proto_tree_add_item (req_tree, hf_fcdns_req_snamelen, tvb, offset+8,
                              1, ENC_BIG_ENDIAN);
-        proto_tree_add_item (req_tree, &hfi_fcdns_req_sname, tvb, offset+9,
+        proto_tree_add_item (req_tree, hf_fcdns_req_sname, tvb, offset+9,
                              len, ENC_ASCII|ENC_NA);
     }
 }
@@ -1370,7 +1141,7 @@ dissect_fcdns_daid (tvbuff_t *tvb, proto_tree *req_tree, gboolean isreq)
     int offset = 16;            /* past the fc_ct header */
 
     if (isreq) {
-        proto_tree_add_item (req_tree, &hfi_fcdns_req_portid, tvb, offset+1, 3, ENC_NA);
+        proto_tree_add_item (req_tree, hf_fcdns_req_portid, tvb, offset+1, 3, ENC_NA);
     }
 }
 
@@ -1389,26 +1160,26 @@ dissect_fcdns_zone_mbr (tvbuff_t *tvb, packet_info* pinfo, proto_tree *zmbr_tree
     proto_item* ti;
 
     mbrtype = tvb_get_guint8 (tvb, offset);
-    ti = proto_tree_add_uint (zmbr_tree, &hfi_fcdns_zone_mbrtype, tvb,
+    ti = proto_tree_add_uint (zmbr_tree, hf_fcdns_zone_mbrtype, tvb,
                          offset, 1, mbrtype);
-    proto_tree_add_item(zmbr_tree, &hfi_fcdns_zone_flags, tvb, offset+2, 1, ENC_NA);
+    proto_tree_add_item(zmbr_tree, hf_fcdns_zone_flags, tvb, offset+2, 1, ENC_NA);
     idlen = tvb_get_guint8 (tvb, offset+3);
-    proto_tree_add_item(zmbr_tree, &hfi_fcdns_id_length, tvb, offset+3, 1, ENC_NA);
+    proto_tree_add_item(zmbr_tree, hf_fcdns_id_length, tvb, offset+3, 1, ENC_NA);
     switch (mbrtype) {
     case FC_SWILS_ZONEMBR_WWN:
-        proto_tree_add_item (zmbr_tree, &hfi_fcdns_zone_mbrid_wwn, tvb,
+        proto_tree_add_item (zmbr_tree, hf_fcdns_zone_mbrid_wwn, tvb,
                                offset+4, 8, ENC_NA);
         break;
     case FC_SWILS_ZONEMBR_DP:
-        proto_tree_add_item (zmbr_tree, &hfi_fcdns_zone_mbrid_uint, tvb,
+        proto_tree_add_item (zmbr_tree, hf_fcdns_zone_mbrid_uint, tvb,
                                offset+4, 4, ENC_BIG_ENDIAN);
         break;
     case FC_SWILS_ZONEMBR_FCID:
-        proto_tree_add_item (zmbr_tree, &hfi_fcdns_zone_mbrid_fc, tvb,
+        proto_tree_add_item (zmbr_tree, hf_fcdns_zone_mbrid_fc, tvb,
                                offset+4, 3, ENC_NA);
         break;
     case FC_SWILS_ZONEMBR_ALIAS:
-        proto_tree_add_string (zmbr_tree, &hfi_fcdns_zone_mbrid, tvb,
+        proto_tree_add_string (zmbr_tree, hf_fcdns_zone_mbrid, tvb,
                                offset+4, idlen, zonenm_to_str (tvb, offset+4));
         break;
     default:
@@ -1425,64 +1196,64 @@ dissect_fcdns_swils_entries (tvbuff_t *tvb, proto_tree *tree, int offset)
 
     if (tree) {
         numrec = tvb_get_ntohl (tvb, offset);
-        proto_tree_add_uint(tree, &hfi_fcdns_num_entries, tvb, offset, 4, numrec);
+        proto_tree_add_uint(tree, hf_fcdns_num_entries, tvb, offset, 4, numrec);
         offset += 4;
 
         for (i = 0; i < numrec; i++) {
             objfmt = tvb_get_guint8 (tvb, offset);
 
-            proto_tree_add_item (tree, &hfi_fcdns_sw2_objfmt, tvb, offset, 1, ENC_BIG_ENDIAN);
-            proto_tree_add_item (tree, &hfi_fcdns_rply_ownerid, tvb, offset+1, 3, ENC_NA);
-            proto_tree_add_item (tree, &hfi_fcdns_rply_ptype, tvb, offset+4,
+            proto_tree_add_item (tree, hf_fcdns_sw2_objfmt, tvb, offset, 1, ENC_BIG_ENDIAN);
+            proto_tree_add_item (tree, hf_fcdns_rply_ownerid, tvb, offset+1, 3, ENC_NA);
+            proto_tree_add_item (tree, hf_fcdns_rply_ptype, tvb, offset+4,
                                  1, ENC_BIG_ENDIAN);
-            proto_tree_add_item (tree, &hfi_fcdns_rply_portid, tvb, offset+5, 3, ENC_NA);
-            proto_tree_add_item (tree, &hfi_fcdns_rply_pname, tvb, offset+8, 8, ENC_NA);
+            proto_tree_add_item (tree, hf_fcdns_rply_portid, tvb, offset+5, 3, ENC_NA);
+            proto_tree_add_item (tree, hf_fcdns_rply_pname, tvb, offset+8, 8, ENC_NA);
             offset += 16;
             if (!(objfmt & 0x1)) {
                 len = tvb_get_guint8 (tvb, offset);
-                proto_tree_add_item (tree, &hfi_fcdns_rply_spnamelen, tvb,
+                proto_tree_add_item (tree, hf_fcdns_rply_spnamelen, tvb,
                                      offset, 1, ENC_BIG_ENDIAN);
-                proto_tree_add_item (tree, &hfi_fcdns_rply_spname, tvb,
+                proto_tree_add_item (tree, hf_fcdns_rply_spname, tvb,
                                      offset+1, len, ENC_ASCII|ENC_NA);
                 offset += 256;
             }
-            proto_tree_add_item (tree, &hfi_fcdns_rply_nname, tvb, offset, 8, ENC_NA);
+            proto_tree_add_item (tree, hf_fcdns_rply_nname, tvb, offset, 8, ENC_NA);
             offset += 8;
             if (!(objfmt & 0x1)) {
                 len = tvb_get_guint8 (tvb, offset);
-                proto_tree_add_item (tree, &hfi_fcdns_rply_snamelen, tvb,
+                proto_tree_add_item (tree, hf_fcdns_rply_snamelen, tvb,
                                      offset, 1, ENC_BIG_ENDIAN);
-                proto_tree_add_item (tree, &hfi_fcdns_rply_sname, tvb,
+                proto_tree_add_item (tree, hf_fcdns_rply_sname, tvb,
                                      offset+1, len, ENC_ASCII|ENC_NA);
                 offset += 256;
             }
-            proto_tree_add_item (tree, &hfi_fcdns_rply_ipa, tvb, offset, 8, ENC_NA);
-            proto_tree_add_item (tree, &hfi_fcdns_rply_ipnode, tvb, offset+8, 16,
+            proto_tree_add_item (tree, hf_fcdns_rply_ipa, tvb, offset, 8, ENC_NA);
+            proto_tree_add_item (tree, hf_fcdns_rply_ipnode, tvb, offset+8, 16,
                                  ENC_NA);
-            dissect_cos_flags(tree, tvb, offset+24, &hfi_fcdns_reply_cos);
-            dissect_fc4type(tree, tvb, offset+28, &hfi_fcdns_rply_gft);
-            proto_tree_add_item (tree, &hfi_fcdns_rply_ipport, tvb, offset+60,
+            dissect_cos_flags(tree, tvb, offset+24, hf_fcdns_reply_cos);
+            dissect_fc4type(tree, tvb, offset+28, hf_fcdns_rply_gft);
+            proto_tree_add_item (tree, hf_fcdns_rply_ipport, tvb, offset+60,
                                  16, ENC_NA);
-            proto_tree_add_item (tree, &hfi_fcdns_rply_fpname, tvb, offset+76,
+            proto_tree_add_item (tree, hf_fcdns_rply_fpname, tvb, offset+76,
                                    8, ENC_NA);
-            proto_tree_add_item (tree, &hfi_fcdns_rply_hrdaddr, tvb, offset+85,
+            proto_tree_add_item (tree, hf_fcdns_rply_hrdaddr, tvb, offset+85,
                                    3, ENC_NA);
             offset += 88;
             if (objfmt & 0x2) {
                 dissect_fc4features(tree, tvb, offset);
                 if (tvb_get_guint8 (tvb, offset+129)) {
-                    proto_tree_add_item (tree, &hfi_fcdns_rply_fc4type, tvb,
+                    proto_tree_add_item (tree, hf_fcdns_rply_fc4type, tvb,
                                          offset+128, 1, ENC_BIG_ENDIAN);
-                    proto_tree_add_item (tree, &hfi_fcdns_num_fc4desc, tvb,
+                    proto_tree_add_item (tree, hf_fcdns_num_fc4desc, tvb,
                                          offset+129, 1, ENC_BIG_ENDIAN);
                     len = tvb_get_guint8 (tvb, offset+132);
-                    proto_tree_add_item (tree, &hfi_fcdns_rply_fc4desclen, tvb,
+                    proto_tree_add_item (tree, hf_fcdns_rply_fc4desclen, tvb,
                                          offset+132, 1, ENC_BIG_ENDIAN);
-                    proto_tree_add_item (tree, &hfi_fcdns_rply_fc4desc, tvb,
+                    proto_tree_add_item (tree, hf_fcdns_rply_fc4desc, tvb,
                                          offset+133, len, ENC_NA);
                 }
                 else {
-                    proto_tree_add_item (tree, &hfi_fcdns_num_fc4desc, tvb,
+                    proto_tree_add_item (tree, hf_fcdns_num_fc4desc, tvb,
                                          offset+129, 1, ENC_BIG_ENDIAN);
                 }
                 offset += 388;  /* FC4 desc is 260 bytes, maybe padded */
@@ -1497,7 +1268,7 @@ dissect_fcdns_geid (tvbuff_t *tvb, proto_tree *req_tree, gboolean isreq)
     int offset = 16;            /* past the fc_ct header */
 
     if (isreq) {
-        proto_tree_add_item (req_tree, &hfi_fcdns_req_portid, tvb, offset+1, 3, ENC_NA);
+        proto_tree_add_item (req_tree, hf_fcdns_req_portid, tvb, offset+1, 3, ENC_NA);
     }
     else {
         dissect_fcdns_swils_entries (tvb, req_tree, offset);
@@ -1509,7 +1280,7 @@ dissect_fcdns_gepn (tvbuff_t *tvb, proto_tree *req_tree, gboolean isreq)
 {
     int offset = 16;            /* past the fc_ct header */
     if (isreq) {
-        proto_tree_add_item(req_tree, &hfi_fcdns_req_pname, tvb, offset, 8, ENC_NA);
+        proto_tree_add_item(req_tree, hf_fcdns_req_pname, tvb, offset, 8, ENC_NA);
     }
     else {
         dissect_fcdns_swils_entries (tvb, req_tree, offset);
@@ -1522,7 +1293,7 @@ dissect_fcdns_genn (tvbuff_t *tvb, proto_tree *req_tree, gboolean isreq)
     int offset = 16;            /* past the fc_ct header */
 
     if (isreq) {
-        proto_tree_add_item (req_tree, &hfi_fcdns_req_nname, tvb, offset, 8, ENC_NA);
+        proto_tree_add_item (req_tree, hf_fcdns_req_nname, tvb, offset, 8, ENC_NA);
     }
     else {
         dissect_fcdns_swils_entries (tvb, req_tree, offset);
@@ -1536,7 +1307,7 @@ dissect_fcdns_geip (tvbuff_t *tvb, proto_tree *req_tree, gboolean isreq)
 
     if (isreq) {
         if (req_tree) {
-            proto_tree_add_item (req_tree, &hfi_fcdns_req_ip, tvb, offset, 16, ENC_NA);
+            proto_tree_add_item (req_tree, hf_fcdns_req_ip, tvb, offset, 16, ENC_NA);
         }
     }
     else {
@@ -1551,7 +1322,7 @@ dissect_fcdns_geft (tvbuff_t *tvb, proto_tree *req_tree, gboolean isreq)
 
     if (isreq) {
         if (req_tree) {
-            dissect_fc4type(req_tree, tvb, offset, &hfi_fcdns_fc4type);
+            dissect_fc4type(req_tree, tvb, offset, hf_fcdns_fc4type);
         }
     }
     else {
@@ -1566,7 +1337,7 @@ dissect_fcdns_gept (tvbuff_t *tvb, proto_tree *req_tree, gboolean isreq)
 
     if (isreq) {
         if (req_tree) {
-            proto_tree_add_item (req_tree, &hfi_fcdns_req_ptype, tvb, offset+3,
+            proto_tree_add_item (req_tree, hf_fcdns_req_ptype, tvb, offset+3,
                                  1, ENC_BIG_ENDIAN);
         }
     }
@@ -1597,8 +1368,8 @@ dissect_fcdns_gezn (tvbuff_t *tvb, proto_tree *req_tree, gboolean isreq)
     if (isreq) {
         if (req_tree) {
             str_len = tvb_get_guint8 (tvb, offset);
-            proto_tree_add_uint(req_tree, &hfi_fcdns_zonelen, tvb, offset, 1, str_len);
-            proto_tree_add_item (req_tree, &hfi_fcdns_zonenm, tvb, offset+3,
+            proto_tree_add_uint(req_tree, hf_fcdns_zonelen, tvb, offset, 1, str_len);
+            proto_tree_add_item (req_tree, hf_fcdns_zonenm, tvb, offset+3,
                                  str_len, ENC_ASCII|ENC_NA);
         }
     }
@@ -1614,7 +1385,7 @@ dissect_fcdns_geipp (tvbuff_t *tvb, proto_tree *req_tree, gboolean isreq)
 
     if (isreq) {
         if (req_tree) {
-            proto_tree_add_item (req_tree, &hfi_fcdns_portip, tvb, offset, 4, ENC_BIG_ENDIAN);
+            proto_tree_add_item (req_tree, hf_fcdns_portip, tvb, offset, 4, ENC_BIG_ENDIAN);
         }
     }
     else {
@@ -1643,10 +1414,10 @@ dissect_fcdns_rjt (tvbuff_t *tvb, proto_tree *req_tree)
     int offset = 0;
 
     if (req_tree) {
-        proto_tree_add_item (req_tree, &hfi_fcdns_reason, tvb, offset+13, 1, ENC_BIG_ENDIAN);
-        proto_tree_add_item (req_tree, &hfi_fcdns_rjtdetail, tvb, offset+14, 1,
+        proto_tree_add_item (req_tree, hf_fcdns_reason, tvb, offset+13, 1, ENC_BIG_ENDIAN);
+        proto_tree_add_item (req_tree, hf_fcdns_rjtdetail, tvb, offset+14, 1,
                              ENC_BIG_ENDIAN);
-        proto_tree_add_item (req_tree, &hfi_fcdns_vendor, tvb, offset+15, 1, ENC_BIG_ENDIAN);
+        proto_tree_add_item (req_tree, hf_fcdns_vendor, tvb, offset+15, 1, ENC_BIG_ENDIAN);
     }
 }
 
@@ -1686,13 +1457,13 @@ dissect_fcdns (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data)
 
     if (tree) {
         if (cthdr.gstype == FCCT_GSTYPE_DIRSVC) {
-            ti = proto_tree_add_protocol_format (tree, hfi_fcdns->id, tvb, 0,
+            ti = proto_tree_add_protocol_format (tree, proto_fcdns, tvb, 0,
                                                  -1,
                                                  "dNS");
             fcdns_tree = proto_item_add_subtree (ti, ett_fcdns);
         }
         else {
-            ti = proto_tree_add_protocol_format (tree, hfi_fcdns->id, tvb, 0,
+            ti = proto_tree_add_protocol_format (tree, proto_fcdns, tvb, 0,
                                                  -1,
                                                  "Unzoned NS");
             fcdns_tree = proto_item_add_subtree (ti, ett_fcdns);
@@ -1784,8 +1555,8 @@ dissect_fcdns (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data)
     }
 
      if (tree) {
-        proto_tree_add_item (fcdns_tree, &hfi_fcdns_opcode, tvb, offset+8, 2, ENC_BIG_ENDIAN);
-        proto_tree_add_item (fcdns_tree, &hfi_fcdns_maxres_size, tvb, offset+10,
+        proto_tree_add_item (fcdns_tree, hf_fcdns_opcode, tvb, offset+8, 2, ENC_BIG_ENDIAN);
+        proto_tree_add_item (fcdns_tree, hf_fcdns_maxres_size, tvb, offset+10,
                              2, ENC_BIG_ENDIAN);
     }
 
@@ -1937,81 +1708,358 @@ dissect_fcdns (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data)
 void
 proto_register_fcdns (void)
 {
-#ifndef HAVE_HFI_SECTION_INIT
-    static header_field_info *hfi[] = {
-        /* &hfi_fcdns_gssubtype */
-        &hfi_fcdns_opcode,
-        &hfi_fcdns_req_portid,
-        &hfi_fcdns_rply_pname,
-        &hfi_fcdns_rply_nname,
-        &hfi_fcdns_rply_snamelen,
-        &hfi_fcdns_rply_sname,
-        &hfi_fcdns_rply_ptype,
-        &hfi_fcdns_rply_fpname,
-        &hfi_fcdns_req_pname,
-        &hfi_fcdns_rply_portid,
-        &hfi_fcdns_req_nname,
-        &hfi_fcdns_req_domainscope,
-        &hfi_fcdns_req_areascope,
-        &hfi_fcdns_req_fc4type,
-        &hfi_fcdns_req_ptype,
-        &hfi_fcdns_req_ip,
-        &hfi_fcdns_rply_fc4type,
-        &hfi_fcdns_req_snamelen,
-        &hfi_fcdns_req_sname,
-        &hfi_fcdns_rply_spnamelen,
-        &hfi_fcdns_rply_spname,
-        &hfi_fcdns_rply_ipa,
-        &hfi_fcdns_rply_ipnode,
-        &hfi_fcdns_rply_ipport,
-        &hfi_fcdns_rply_fc4desclen,
-        &hfi_fcdns_rply_fc4desc,
-        &hfi_fcdns_rply_hrdaddr,
-        &hfi_fcdns_req_fdesclen,
-        &hfi_fcdns_req_fdesc,
-        &hfi_fcdns_req_spnamelen,
-        &hfi_fcdns_req_spname,
-        &hfi_fcdns_reason,
-        &hfi_fcdns_rjtdetail,
-        &hfi_fcdns_vendor,
-        &hfi_fcdns_zone_mbrtype,
-        &hfi_fcdns_zone_mbrid,
-        &hfi_fcdns_zone_mbrid_wwn,
-        &hfi_fcdns_zone_mbrid_uint,
-        &hfi_fcdns_zone_mbrid_fc,
-        &hfi_fcdns_zonenm,
-        &hfi_fcdns_portip,
-        &hfi_fcdns_sw2_objfmt,
-        &hfi_fcdns_num_fc4desc,
-        &hfi_fcdns_rply_ownerid,
-        &hfi_fcdns_maxres_size,
-        &hfi_fcdns_reply_cos,
-        &hfi_fcdns_req_cos,
-        &hfi_fcdns_cos_f,
-        &hfi_fcdns_cos_1,
-        &hfi_fcdns_cos_2,
-        &hfi_fcdns_cos_3,
-        &hfi_fcdns_cos_4,
-        &hfi_fcdns_cos_6,
-        &hfi_fcdns_fc4type_llcsnap,
-        &hfi_fcdns_fc4type_ip,
-        &hfi_fcdns_fc4type_fcp,
-        &hfi_fcdns_fc4type_swils,
-        &hfi_fcdns_fc4type_snmp,
-        &hfi_fcdns_fc4type_gs3,
-        &hfi_fcdns_fc4type_vi,
-        &hfi_fcdns_rply_gft,
-        &hfi_fcdns_req_fc4types,
-        &hfi_fcdns_fc4type,
-        &hfi_fcdns_fc4features,
-        &hfi_fcdns_fc4features_i,
-        &hfi_fcdns_fc4features_t,
-        &hfi_fcdns_id_length,
-        &hfi_fcdns_zone_flags,
-        &hfi_fcdns_zonelen,
-        &hfi_fcdns_num_entries
+    static hf_register_info hf[] = {
+        { &hf_fcdns_opcode,
+            { "Opcode", "fcdns.opcode",
+              FT_UINT16, BASE_HEX, VALS (fc_dns_opcode_val), 0x0,
+              NULL, HFILL }
+        },
+        { &hf_fcdns_reason,
+            { "Reason Code", "fcdns.rply.reason",
+              FT_UINT8, BASE_HEX, VALS (fc_ct_rjt_code_vals), 0x0,
+              NULL, HFILL }
+        },
+        { &hf_fcdns_vendor,
+            { "Vendor Unique Reject Code", "fcdns.rply.vendor",
+              FT_UINT8, BASE_HEX, NULL, 0x0,
+              NULL, HFILL }
+        },
+        { &hf_fcdns_req_portid,
+            { "Port Identifier", "fcdns.req.portid",
+              FT_BYTES, SEP_DOT, NULL, 0x0,
+              NULL, HFILL }
+        },
+        { &hf_fcdns_rply_pname,
+            { "Port Name", "fcdns.rply.pname",
+              FT_FCWWN, BASE_NONE, NULL, 0x0,
+              NULL, HFILL }
+        },
+        { &hf_fcdns_rply_nname,
+            { "Node Name", "fcdns.rply.nname",
+              FT_FCWWN, BASE_NONE, NULL, 0x0,
+              NULL, HFILL }
+        },
+        { &hf_fcdns_rply_gft,
+            { "FC-4 Types Supported", "fcdns.rply.gft",
+              FT_NONE, BASE_NONE, NULL, 0x0,
+              NULL, HFILL }
+        },
+        { &hf_fcdns_rply_snamelen,
+            { "Symbolic Node Name Length", "fcdns.rply.snamelen",
+              FT_UINT8, BASE_DEC, NULL, 0x0,
+              NULL, HFILL }
+        },
+        { &hf_fcdns_rply_sname,
+            { "Symbolic Node Name", "fcdns.rply.sname",
+              FT_STRING, BASE_NONE, NULL, 0x0,
+              NULL, HFILL }
+        },
+        { &hf_fcdns_rply_ptype,
+            { "Port Type", "fcdns.rply.porttype",
+              FT_UINT8, BASE_HEX, VALS (fc_dns_port_type_val), 0x0,
+              NULL, HFILL }
+        },
+        { &hf_fcdns_rply_fpname,
+            { "Fabric Port Name", "fcdns.rply.fpname",
+              FT_FCWWN, BASE_NONE, NULL, 0x0,
+              NULL, HFILL }
+        },
+        { &hf_fcdns_fc4type,
+            { "FC-4 Types", "fcdns.req.fc4types",
+              FT_NONE, BASE_NONE, NULL, 0x0,
+              NULL, HFILL }
+        },
+        { &hf_fcdns_rply_fc4type,
+            { "FC-4 Descriptor Type", "fcdns.rply.fc4type",
+              FT_UINT8, BASE_HEX, VALS (fc_fc4_val), 0x0,
+              NULL, HFILL }
+        },
+        { &hf_fcdns_rply_fc4desc,
+            { "FC-4 Descriptor", "fcdns.rply.fc4desc",
+              FT_BYTES, BASE_NONE, NULL, 0x0,
+              NULL, HFILL }
+        },
+        { &hf_fcdns_req_pname,
+            { "Port Name", "fcdns.req.portname",
+              FT_FCWWN, BASE_NONE, NULL, 0x0,
+              NULL, HFILL }
+        },
+        { &hf_fcdns_rply_portid,
+            { "Port Identifier", "fcdns.rply.portid",
+              FT_BYTES, SEP_DOT, NULL, 0x0,
+              NULL, HFILL }
+        },
+        { &hf_fcdns_req_nname,
+            { "Node Name", "fcdns.req.nname",
+              FT_FCWWN, BASE_NONE, NULL, 0x0,
+              NULL, HFILL }
+        },
+        { &hf_fcdns_req_domainscope,
+            { "Domain ID Scope", "fcdns.req.domainid",
+              FT_UINT8, BASE_HEX, NULL, 0x0,
+              NULL, HFILL }
+        },
+        { &hf_fcdns_req_areascope,
+            { "Area ID Scope", "fcdns.req.areaid",
+              FT_UINT8, BASE_HEX, NULL, 0x0,
+              NULL, HFILL }
+        },
+        { &hf_fcdns_req_ptype,
+            { "Port Type", "fcdns.req.porttype",
+              FT_UINT8, BASE_HEX, VALS (fc_dns_port_type_val), 0x0,
+              NULL, HFILL }
+        },
+        { &hf_fcdns_req_cos,
+            { "Requested Class of Service", "fcdns.req.class",
+              FT_UINT32, BASE_HEX, NULL, 0x0,
+              NULL, HFILL }
+        },
+        { &hf_fcdns_req_fc4types,
+            { "FC-4 Types Supported", "fcdns.req.fc4types",
+              FT_NONE, BASE_NONE, NULL, 0x0,
+              NULL, HFILL }
+        },
+        { &hf_fcdns_req_snamelen,
+            { "Symbolic Name Length", "fcdns.req.snamelen",
+              FT_UINT8, BASE_DEC, NULL, 0x0,
+              NULL, HFILL }
+        },
+        { &hf_fcdns_req_sname,
+            { "Symbolic Port Name", "fcdns.req.sname",
+              FT_STRING, BASE_NONE, NULL, 0x0,
+              NULL, HFILL }
+        },
+        { &hf_fcdns_rply_spnamelen,
+            { "Symbolic Port Name Length", "fcdns.rply.spnamelen",
+              FT_UINT8, BASE_DEC, NULL, 0x0,
+              NULL, HFILL }
+        },
+        { &hf_fcdns_rply_spname,
+            { "Symbolic Port Name", "fcdns.rply.spname",
+              FT_STRING, BASE_NONE, NULL, 0x0,
+              NULL, HFILL }
+        },
+        { &hf_fcdns_req_spnamelen,
+            { "Symbolic Port Name Length", "fcdns.req.spnamelen",
+              FT_UINT8, BASE_DEC, NULL, 0x0,
+              NULL, HFILL }
+        },
+        { &hf_fcdns_req_spname,
+            { "Symbolic Port Name", "fcdns.req.spname",
+              FT_STRING, BASE_NONE, NULL, 0x0,
+              NULL, HFILL }
+        },
+        { &hf_fcdns_rply_ipa,
+            { "Initial Process Associator", "fcdns.rply.ipa",
+              FT_BYTES, BASE_NONE, NULL, 0x0,
+              NULL, HFILL }
+        },
+        { &hf_fcdns_rply_ipnode,
+            { "Node IP Address", "fcdns.rply.ipnode",
+              FT_IPv6, BASE_NONE, NULL, 0x0,
+              NULL, HFILL }
+        },
+        { &hf_fcdns_rply_ipport,
+            { "Port IP Address", "fcdns.rply.ipport",
+              FT_IPv6, BASE_NONE, NULL, 0x0,
+              NULL, HFILL }
+        },
+        { &hf_fcdns_rply_fc4desclen,
+            { "FC-4 Descriptor Length", "fcdns.rply.fc4desclen",
+              FT_UINT8, BASE_DEC, NULL, 0x0,
+              NULL, HFILL }
+        },
+        { &hf_fcdns_rply_hrdaddr,
+            { "Hard Address", "fcdns.rply.hrdaddr",
+              FT_BYTES, SEP_DOT, NULL, 0x0,
+              NULL, HFILL }
+        },
+        { &hf_fcdns_req_fdesclen,
+            { "FC-4 Descriptor Length", "fcdns.req.fc4desclen",
+              FT_UINT8, BASE_DEC, NULL, 0x0,
+              NULL, HFILL }
+        },
+        { &hf_fcdns_req_fdesc,
+            { "FC-4 Descriptor", "fcdns.req.fc4desc",
+              FT_STRING, BASE_NONE, NULL, 0x0,
+              NULL, HFILL }
+        },
+        { &hf_fcdns_req_ip,
+            { "IP Address", "fcdns.req.ip",
+              FT_IPv6, BASE_NONE, NULL, 0x0,
+              NULL, HFILL }
+        },
+        { &hf_fcdns_rjtdetail,
+            { "Reason Code Explanation", "fcdns.rply.reasondet",
+              FT_UINT8, BASE_HEX, VALS (fc_dns_rjt_det_code_val), 0x0,
+              NULL, HFILL }
+        },
+        { &hf_fcdns_zone_mbrtype,
+            { "Zone Member Type", "fcdns.zone.mbrtype",
+              FT_UINT8, BASE_HEX, VALS (fc_swils_zonembr_type_val), 0x0,
+              NULL, HFILL }
+        },
+        { &hf_fcdns_zone_mbrid,
+            { "Member Identifier", "fcdns.zone.mbrid",
+              FT_STRING, BASE_NONE, NULL, 0x0,
+              NULL, HFILL }
+        },
+        { &hf_fcdns_zone_mbrid_wwn,
+            { "Member Identifier", "fcdns.zone.mbrid.wwn",
+              FT_FCWWN, BASE_NONE, NULL, 0x0,
+              NULL, HFILL }
+        },
+        { &hf_fcdns_zone_mbrid_uint,
+            { "Member Identifier", "fcdns.zone.mbrid.uint",
+              FT_UINT32, BASE_HEX, NULL, 0x0,
+              NULL, HFILL }
+        },
+        { &hf_fcdns_zone_mbrid_fc,
+            { "Member Identifier", "fcdns.zone.mbrid.fc",
+              FT_BYTES, SEP_DOT, NULL, 0x0,
+              NULL, HFILL }
+        },
+        { &hf_fcdns_id_length,
+            { "Identifier Length", "fcdns.id_length",
+              FT_UINT8, BASE_DEC, NULL, 0x0,
+              NULL, HFILL }
+        },
+        { &hf_fcdns_zone_flags,
+            { "Flags", "fcdns.zone_flags",
+              FT_UINT8, BASE_HEX, NULL, 0x0,
+              NULL, HFILL }
+        },
+        { &hf_fcdns_zonelen,
+            { "Name Length", "fcdns.zone_len",
+              FT_UINT8, BASE_DEC, NULL, 0x0,
+              NULL, HFILL }
+        },
+        { &hf_fcdns_zonenm,
+            { "Zone Name", "fcdns.zonename",
+              FT_STRING, BASE_NONE, NULL, 0x0,
+              NULL, HFILL }
+        },
+        { &hf_fcdns_portip,
+            { "Port IP Address", "fcdns.portip",
+              FT_IPv4, BASE_NONE, NULL, 0x0,
+              NULL, HFILL }
+        },
+        { &hf_fcdns_num_entries,
+            { "Number of Entries", "fcdns.num_entries",
+              FT_UINT32, BASE_HEX, NULL, 0x0,
+              NULL, HFILL }
+        },
+        { &hf_fcdns_sw2_objfmt,
+            { "Name Entry Object Format", "fcdns.entry.objfmt",
+              FT_UINT8, BASE_HEX, NULL, 0x0,
+              NULL, HFILL }
+        },
+        { &hf_fcdns_num_fc4desc,
+            { "Number of FC4 Descriptors Registered", "fcdns.entry.numfc4desc",
+              FT_UINT8, BASE_DEC, NULL, 0x0,
+              NULL, HFILL }
+        },
+        { &hf_fcdns_rply_ownerid,
+            { "Owner Id", "fcdns.rply.ownerid",
+              FT_BYTES, SEP_DOT, NULL, 0x0,
+              NULL, HFILL }
+        },
+        { &hf_fcdns_maxres_size,
+            { "Maximum/Residual Size", "fcdns.maxres_size",
+              FT_UINT16, BASE_DEC, NULL, 0x0,
+              NULL, HFILL }
+        },
+        { &hf_fcdns_reply_cos,
+            { "Class of Service Supported", "fcdns.reply.cos",
+              FT_UINT32, BASE_HEX, NULL, 0x0,
+              NULL, HFILL }
+        },
+        { &hf_fcdns_cos_f,
+            { "F", "fcdns.cos.f",
+              FT_BOOLEAN, 32, TFS(&tfs_set_notset), 0x01,
+              NULL, HFILL }
+        },
+        { &hf_fcdns_cos_1,
+            { "1", "fcdns.cos.1",
+              FT_BOOLEAN, 32, TFS(&tfs_set_notset), 0x02,
+              NULL, HFILL }
+        },
+        { &hf_fcdns_cos_2,
+            { "2", "fcdns.cos.2",
+              FT_BOOLEAN, 32, TFS(&tfs_set_notset), 0x04,
+              NULL, HFILL }
+        },
+        { &hf_fcdns_cos_3,
+            { "3", "fcdns.cos.3",
+              FT_BOOLEAN, 32, TFS(&tfs_set_notset), 0x08,
+              NULL, HFILL }
+        },
+        { &hf_fcdns_cos_4,
+            { "4", "fcdns.cos.4",
+              FT_BOOLEAN, 32, TFS(&tfs_set_notset), 0x10,
+              NULL, HFILL }
+        },
+        { &hf_fcdns_cos_6,
+            { "6", "fcdns.cos.6",
+              FT_BOOLEAN, 32, TFS(&tfs_set_notset), 0x40,
+              NULL, HFILL }
+        },
+        { &hf_fcdns_fc4type_llcsnap,
+            { "LLC/SNAP", "fcdns.fc4types.llc_snap",
+              FT_BOOLEAN, 32, TFS(&tfs_set_notset), 0x0010,
+              NULL, HFILL }
+        },
+        { &hf_fcdns_fc4type_ip,
+            { "IP", "fcdns.fc4types.ip",
+              FT_BOOLEAN, 32, TFS(&tfs_set_notset), 0x0020,
+              NULL, HFILL }
+        },
+        { &hf_fcdns_fc4type_fcp,
+            { "FCP", "fcdns.fc4types.fcp",
+              FT_BOOLEAN, 32, TFS(&tfs_set_notset), 0x0100,
+              NULL, HFILL }
+        },
+        { &hf_fcdns_fc4type_swils,
+            { "SW_ILS", "fcdns.fc4types.swils",
+              FT_BOOLEAN, 32, TFS(&tfs_set_notset), 0x0010,
+              NULL, HFILL }
+        },
+        { &hf_fcdns_fc4type_snmp,
+            { "SNMP", "fcdns.fc4types.snmp",
+              FT_BOOLEAN, 32, TFS(&tfs_set_notset), 0x0004,
+              NULL, HFILL }
+        },
+        { &hf_fcdns_fc4type_gs3,
+            { "GS3", "fcdns.fc4types.gs3",
+              FT_BOOLEAN, 32, TFS(&tfs_set_notset), 0x0001,
+              NULL, HFILL }
+        },
+        { &hf_fcdns_fc4type_vi,
+            { "VI", "fcdns.fc4types.vi",
+              FT_BOOLEAN, 32, TFS(&tfs_set_notset), 0x0001,
+              NULL, HFILL }
+        },
+        { &hf_fcdns_fc4features,
+            { "FC-4 Feature Bits", "fcdns.fc4features",
+              FT_UINT8, BASE_HEX, NULL, 0x0,
+              NULL, HFILL }
+        },
+        { &hf_fcdns_fc4features_i,
+            { "I", "fcdns.fc4features.i",
+              FT_BOOLEAN, 8, TFS(&tfs_set_notset), 0x02,
+              NULL, HFILL }
+        },
+        { &hf_fcdns_fc4features_t,
+            { "T", "fcdns.fc4features.t",
+              FT_BOOLEAN, 8, TFS(&tfs_set_notset), 0x01,
+              NULL, HFILL }
+        },
+        { &hf_fcdns_req_fc4type,
+            { "FC-4 Type", "fcdns.req.fc4type",
+              FT_UINT8, BASE_HEX, VALS (fc_fc4_val), 0x0,
+              NULL, HFILL }
+        },
     };
-#endif
 
     static gint *ett[] = {
         &ett_fcdns,
@@ -2026,12 +2074,9 @@ proto_register_fcdns (void)
     };
 
     expert_module_t* expert_fcdns;
-    int proto_fcdns;
 
     proto_fcdns = proto_register_protocol("Fibre Channel Name Server", "FC-dNS", "fcdns");
-    hfi_fcdns = proto_registrar_get_nth(proto_fcdns);
-
-    proto_register_fields(proto_fcdns, hfi, array_length(hfi));
+    proto_register_field_array(proto_fcdns, hf, array_length(hf));
     proto_register_subtree_array(ett, array_length(ett));
     expert_fcdns = expert_register_protocol(proto_fcdns);
     expert_register_field_array(expert_fcdns, ei, array_length(ei));