* Routines for FC distributed Name Server (dNS)
* Copyright 2001, Dinesh G Dutt <ddutt@andiamo.com>
*
- * $Id$
- *
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * Copied from WHATEVER_FILE_YOU_USED (where "WHATEVER_FILE_YOU_USED"
- * is a dissector file; if you just copied this from README.developer,
- * don't bother with the "Copied from" - you don't even need to put
- * in a "Copied from" if you copied an existing dissector, especially
- * if the bulk of the code in the new dissector is your code)
- *
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
+#define NEW_PROTO_TREE_API
-#ifdef HAVE_NETINET_IN_H
-# include <netinet/in.h>
-#endif
-
-#include <glib.h>
-
-#ifdef NEED_SNPRINTF_H
-# include "snprintf.h"
-#endif
+#include "config.h"
#include <epan/packet.h>
-#include <epan/conversation.h>
-#include "etypes.h"
+#include <epan/expert.h>
+#include <epan/to_str.h>
#include "packet-fc.h"
#include "packet-fcct.h"
#include "packet-fcdns.h"
#include "packet-fcswils.h"
+void proto_register_fcdns(void);
+void proto_reg_handoff_fcdns(void);
+
/*
* See FC-GS-2.
*/
-/* Initialize the protocol and registered fields */
-static int proto_fcdns = -1;
-static int hf_fcdns_gssubtype = -1;
-static int hf_fcdns_opcode = -1;
-static int hf_fcdns_reason = -1;
-static int hf_fcdns_vendor = -1;
-static int hf_fcdns_req_portid = -1;
-static int hf_fcdns_rply_pname = -1;
-static int hf_fcdns_rply_nname = -1;
-static int hf_fcdns_rply_cos = -1;
-static int hf_fcdns_rply_gft = -1;
-static int hf_fcdns_rply_snamelen = -1;
-static int hf_fcdns_rply_sname = -1;
-static int hf_fcdns_rply_ptype = -1;
-static int hf_fcdns_rply_fpname = -1;
-static int hf_fcdns_fc4type = -1;
-static int hf_fcdns_rply_fc4type = -1;
-static int hf_fcdns_rply_fc4desc = -1;
-static int hf_fcdns_rply_fc4feat = -1;
-static int hf_fcdns_req_pname = -1;
-static int hf_fcdns_rply_portid = -1;
-static int hf_fcdns_req_nname = -1;
-static int hf_fcdns_req_domainscope = -1;
-static int hf_fcdns_req_areascope = -1;
-static int hf_fcdns_req_fc4type = -1;
-static int hf_fcdns_req_ptype = -1;
-static int hf_fcdns_req_fc4feature = -1;
-static int hf_fcdns_req_cos = -1;
-static int hf_fcdns_req_fc4types = -1;
-static int hf_fcdns_req_snamelen = -1;
-static int hf_fcdns_req_sname = -1;
-static int hf_fcdns_rply_spnamelen = -1;
-static int hf_fcdns_rply_spname = -1;
-static int hf_fcdns_req_spnamelen = -1;
-static int hf_fcdns_req_spname = -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_fc4desclen = -1;
-static int hf_fcdns_rply_hrdaddr = -1;
-static int hf_fcdns_req_fdesclen = -1;
-static int hf_fcdns_req_fdesc = -1;
-static int hf_fcdns_req_ip = -1;
-static int hf_fcdns_rjtdetail = -1;
-static int hf_fcdns_zone_mbrtype = -1;
-static int hf_fcdns_zone_mbrid = -1;
-static int hf_fcdns_zonenm = -1;
-static int hf_fcdns_portip = -1;
-static int hf_fcdns_sw2_objfmt = -1;
-static int hf_fcdns_num_fc4desc = -1;
-static int hf_fcdns_rply_ownerid = -1;
-static int hf_fcdns_maxres_size = -1;
+static dissector_handle_t dns_handle;
+
+/* protocol and registered fields */
+
+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.fc4type", 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.fc4type", 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 Explanantion", "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_STRING, BASE_NONE, 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};
/* Initialize the subtree pointers */
static gint ett_fcdns = -1;
+static gint ett_cos_flags = -1;
+static gint ett_fc4flags = -1;
+static gint ett_fc4features = -1;
+
+static expert_field ei_fcdns_no_record_of_exchange = EI_INIT;
+static expert_field ei_fcdns_zone_mbrid = EI_INIT;
typedef struct _fcdns_conv_key {
guint32 conv_idx;
guint32 opcode;
} fcdns_conv_data_t;
-GHashTable *fcdns_req_hash = NULL;
-GMemChunk *fcdns_req_keys = NULL;
-GMemChunk *fcdns_req_vals = NULL;
-guint32 fcdns_init_count = 25;
-
-static dissector_handle_t data_handle;
+static GHashTable *fcdns_req_hash = NULL;
/*
* Hash Functions
static gint
fcdns_equal(gconstpointer v, gconstpointer w)
{
- const fcdns_conv_key_t *v1 = v;
- const fcdns_conv_key_t *v2 = w;
+ const fcdns_conv_key_t *v1 = (const fcdns_conv_key_t *)v;
+ const fcdns_conv_key_t *v2 = (const fcdns_conv_key_t *)w;
return (v1->conv_idx == v2->conv_idx);
}
static guint
fcdns_hash (gconstpointer v)
{
- const fcdns_conv_key_t *key = v;
- guint val;
+ const fcdns_conv_key_t *key = (const fcdns_conv_key_t *)v;
+ guint val;
- val = key->conv_idx;
+ val = key->conv_idx;
- return val;
+ return val;
}
/*
static void
fcdns_init_protocol(void)
{
- if (fcdns_req_keys)
- g_mem_chunk_destroy (fcdns_req_keys);
- if (fcdns_req_vals)
- g_mem_chunk_destroy (fcdns_req_vals);
- if (fcdns_req_hash)
- g_hash_table_destroy(fcdns_req_hash);
-
- fcdns_req_hash = g_hash_table_new(fcdns_hash, fcdns_equal);
- fcdns_req_keys = g_mem_chunk_new ("fcdns_req_keys",
- sizeof(fcdns_conv_key_t),
- fcdns_init_count *
- sizeof(fcdns_conv_key_t),
- G_ALLOC_AND_FREE);
- fcdns_req_vals = g_mem_chunk_new ("fcdns_req_vals",
- sizeof(fcdns_conv_data_t),
- fcdns_init_count *
- sizeof(fcdns_conv_data_t),
- G_ALLOC_AND_FREE);
+ if (fcdns_req_hash)
+ g_hash_table_destroy(fcdns_req_hash);
+
+ fcdns_req_hash = g_hash_table_new(fcdns_hash, fcdns_equal);
}
-static gchar *
-fccos_to_str (tvbuff_t *tvb, int offset, gchar *cosstr)
-{
- int stroff = 0,
- cos = 0;
-
- if (cosstr == NULL)
- return NULL;
- cos = tvb_get_ntohl (tvb, offset);
+static void
+dissect_cos_flags (proto_tree *parent_tree, tvbuff_t *tvb, int offset, const header_field_info *hfinfo)
+{
+ static const int * 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,
+ NULL
+ };
- cosstr[0] = '\0';
+ proto_tree_add_bitmask_with_flags(parent_tree, tvb, offset, hfinfo->id,
+ ett_cos_flags, flags, ENC_BIG_ENDIAN, BMT_NO_FALSE|BMT_NO_TFS);
+}
- if (cos & 0x1) {
- strcpy (cosstr, "F, ");
- stroff += 3;
- }
-
- if (cos & 0x2) {
- strcpy (&cosstr[stroff], "1, ");
- stroff += 3;
- }
- if (cos & 0x4) {
- strcpy (&cosstr[stroff], "2, ");
- stroff += 3;
- }
- if (cos & 0x8) {
- strcpy (&cosstr[stroff], "3, ");
- stroff += 3;
- }
+/* The feature routines just decode FCP's FC-4 features field
+ * based on the flahs in offset and the type in offset+1
+ */
+static void
+dissect_fc4features_and_type (proto_tree *parent_tree, tvbuff_t *tvb, int offset)
+{
+ guint8 type;
+ static const int * flags[] = {
+ &hfi_fcdns_fc4features_i.id,
+ &hfi_fcdns_fc4features_t.id,
+ NULL
+ };
- if (cos & 0x10) {
- strcpy (&cosstr[stroff], "4, ");
- stroff += 3;
- }
+ type = tvb_get_guint8(tvb, offset+1);
- if (cos & 0x40) {
- strcpy (&cosstr[stroff], "6");
+ if(type==FC_TYPE_SCSI){
+ proto_tree_add_bitmask_with_flags(parent_tree, tvb, offset, hfi_fcdns_fc4features.id,
+ 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);
}
- return (cosstr);
-}
-
-/* The feature routines just decode FCP's FC-4 features field */
-static gchar *
-fc4feature_to_str (guint8 fc4feature, guint8 fc4type, gchar *str)
-{
- int stroff = 0;
-
- *str = '\0';
-
- if (fc4type == FC_TYPE_SCSI) {
- if (fc4feature & 0x1) {
- strcpy (str, "T, ");
- stroff += 3;
- }
-
- if (fc4feature & 0x2) {
- strcpy (&str[stroff], "I");
- }
- }
- else {
- sprintf (str, "0x%x", fc4feature);
- }
- return (str);
+ proto_tree_add_item (parent_tree, &hfi_fcdns_req_fc4type, tvb, offset+1, 1, ENC_BIG_ENDIAN);
}
-static gchar *
-fc4ftrs_to_str (tvbuff_t *tvb, int offset, gchar *str)
+/* The feature routines just decode FCP's FC-4 features field
+ */
+static void
+dissect_fc4features (proto_tree *parent_tree, tvbuff_t *tvb, int offset)
{
- guint8 fc4feature;
- int stroff = 0;
-
- if (str == NULL) {
- return NULL;
- }
+ static const int * flags[] = {
+ &hfi_fcdns_fc4features_i.id,
+ &hfi_fcdns_fc4features_t.id,
+ NULL
+ };
- *str = '\0';
- fc4feature = tvb_get_guint8 (tvb, offset+7);
+ proto_tree_add_bitmask(parent_tree, tvb, offset, hfi_fcdns_fc4features_i.id,
+ ett_fc4features, flags, ENC_NA);
+}
- if (fc4feature & 0x1) {
- strcpy (str, "T, ");
- stroff += 3;
- }
- if (fc4feature & 0x2) {
- strcpy (&str[stroff], "I");
- }
-
- return (str);
-}
/* Decodes LLC/SNAP, IP, FCP, VI, GS, SW_ILS types only */
-/* Max len of str to be allocated by caller is 40 */
-static gchar *
-fc4type_to_str (tvbuff_t *tvb, int offset, gchar *str)
+static void
+dissect_fc4type (proto_tree *parent_tree, tvbuff_t *tvb, int offset, header_field_info *hfinfo)
{
- guint32 fc4tword;
- int stroff = 0;
+ proto_item *item;
+ proto_tree *tree;
+ guint32 flags;
- if (str == NULL) {
- return NULL;
- }
+ item=proto_tree_add_item(parent_tree, hfinfo, tvb, offset,
+ 32, ENC_NA);
+ tree=proto_item_add_subtree(item, ett_fc4flags);
- *str = '\0';
+ flags = tvb_get_ntohl (tvb, offset);
- fc4tword = tvb_get_ntohl (tvb, offset);
-
- if (fc4tword & 0x10) {
- strcpy (str, "LLC/SNAP, ");
- stroff += 10;
+ proto_tree_add_boolean(tree, &hfi_fcdns_fc4type_fcp, tvb, offset, 4, flags);
+ if (flags&0x0100){
+ proto_item_append_text(item, " FCP");
}
-
- if (fc4tword & 0x20) {
- strcpy (&str[stroff], "IP, ");
- stroff += 4;
+ flags&=(~( 0x0100 ));
+
+ proto_tree_add_boolean(tree, &hfi_fcdns_fc4type_ip, tvb, offset, 4, flags);
+ if (flags&0x0020){
+ proto_item_append_text(item, " IP");
}
+ flags&=(~( 0x0020 ));
- if (fc4tword & 0x0100) {
- strcpy (&str[stroff], "FCP, ");
- stroff += 5;
+ proto_tree_add_boolean(tree, &hfi_fcdns_fc4type_llcsnap, tvb, offset, 4, flags);
+ if (flags&0x0010){
+ proto_item_append_text(item, " LLC/SNAP");
}
+ /*flags&=(~( 0x0010 ));*/
- fc4tword = tvb_get_ntohl (tvb, offset+4);
-
- if (fc4tword & 0x1) {
- strcpy (&str[stroff], "GS3, ");
- stroff += 5;
+
+ flags = tvb_get_ntohl (tvb, offset+4);
+
+ proto_tree_add_boolean(tree, &hfi_fcdns_fc4type_swils, tvb, offset+4, 4, flags);
+ if (flags&0x0010){
+ proto_item_append_text(item, " SW_ILS");
}
+ flags&=(~( 0x0010 ));
- if (fc4tword & 0x4) {
- strcpy (&str[stroff], "SNMP, ");
- stroff += 6;
+ proto_tree_add_boolean(tree, &hfi_fcdns_fc4type_snmp, tvb, offset+4, 4, flags);
+ if (flags&0x0004){
+ proto_item_append_text(item, " SNMP");
}
+ flags&=(~( 0x0004 ));
- if (fc4tword & 0x10) {
- strcpy (&str[stroff], "SW_ILS, ");
- stroff += 8;
+ proto_tree_add_boolean(tree, &hfi_fcdns_fc4type_gs3, tvb, offset+4, 4, flags);
+ if (flags&0x0001){
+ proto_item_append_text(item, " GS3");
}
+ /*flags&=(~( 0x0001 ));*/
+
- fc4tword = tvb_get_ntohl (tvb, offset+8);
- if (fc4tword & 0x1) {
- strcpy (&str[stroff], "VI, ");
- stroff += 3;
+ flags = tvb_get_ntohl (tvb, offset+8);
+
+ proto_tree_add_boolean(tree, &hfi_fcdns_fc4type_vi, tvb, offset+8, 4, flags);
+ if (flags&0x0001){
+ proto_item_append_text(item, " VI");
}
- return (str);
+ /*flags&=(~( 0x0001 ));*/
}
/* Code to actually dissect the packets */
static void
dissect_fcdns_req_portid (tvbuff_t *tvb, proto_tree *tree, int offset)
{
- if (tree) {
- proto_tree_add_string (tree, hf_fcdns_req_portid, tvb, offset, 3,
- fc_to_str (tvb_get_ptr (tvb, offset, 3)));
- }
+ proto_tree_add_item (tree, &hfi_fcdns_req_portid, tvb, offset, 3, ENC_NA);
}
static void
{
int offset = 16; /* past the fc_ct header */
guint8 len;
- gchar str[128];
if (req_tree) {
if (isreq) {
dissect_fcdns_req_portid (tvb, req_tree, offset+1);
}
else {
- proto_tree_add_item (req_tree, hf_fcdns_rply_ptype, tvb, offset,
- 1, 0);
- proto_tree_add_string (req_tree, hf_fcdns_rply_portid, tvb,
- offset+1, 3,
- fc_to_str (tvb_get_ptr (tvb, offset+1, 3)));
- proto_tree_add_string (req_tree, hf_fcdns_rply_pname, tvb,
- offset+4, 8,
- fcwwn_to_str (tvb_get_ptr (tvb, offset+4,
- 8)));
+ proto_tree_add_item (req_tree, &hfi_fcdns_rply_ptype, tvb, offset,
+ 1, ENC_BIG_ENDIAN);
+ proto_tree_add_item (req_tree, &hfi_fcdns_rply_portid, tvb,
+ offset+1, 3, ENC_NA);
+ proto_tree_add_item (req_tree, &hfi_fcdns_rply_pname, tvb,
+ offset+4, 8, ENC_NA);
len = tvb_get_guint8 (tvb, offset+12);
- proto_tree_add_item (req_tree, hf_fcdns_rply_spnamelen, tvb,
- offset+12, 1, 0);
+ proto_tree_add_item (req_tree, &hfi_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, hf_fcdns_rply_spname, tvb,
- offset+13, len, 0);
+ proto_tree_add_item (req_tree, &hfi_fcdns_rply_spname, tvb,
+ offset+13, len, ENC_ASCII|ENC_NA);
}
if (tvb_offset_exists (tvb, 292)) {
- proto_tree_add_string (req_tree, hf_fcdns_rply_nname, tvb,
- offset+268, 8,
- fcwwn_to_str (tvb_get_ptr (tvb,
- offset+268,
- 0)));
+ proto_tree_add_item (req_tree, &hfi_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, hf_fcdns_rply_snamelen, tvb,
- offset+276, 1, 0);
+ proto_tree_add_item (req_tree, &hfi_fcdns_rply_snamelen, tvb,
+ offset+276, 1, ENC_BIG_ENDIAN);
if (len) {
- proto_tree_add_item (req_tree, hf_fcdns_rply_sname, tvb,
- offset+277, len, 0);
+ proto_tree_add_item (req_tree, &hfi_fcdns_rply_sname, tvb,
+ offset+277, len, ENC_ASCII|ENC_NA);
}
}
if (tvb_offset_exists (tvb, 556)) {
- proto_tree_add_item (req_tree, hf_fcdns_rply_ipa, tvb,
- offset+532, 8, 0);
+ proto_tree_add_item (req_tree, &hfi_fcdns_rply_ipa, tvb,
+ offset+532, 8, ENC_NA);
}
if (tvb_offset_exists (tvb, 572)) {
- proto_tree_add_item (req_tree, hf_fcdns_rply_ipnode, tvb,
- offset+540, 16, 0);
+ proto_tree_add_item (req_tree, &hfi_fcdns_rply_ipnode, tvb,
+ offset+540, 16, ENC_NA);
}
if (tvb_offset_exists (tvb, 576)) {
- proto_tree_add_string (req_tree, hf_fcdns_rply_cos, tvb, offset+556,
- 4,
- fccos_to_str (tvb, offset+556, str));
+ dissect_cos_flags(req_tree, tvb, offset+556, &hfi_fcdns_reply_cos);
}
if (tvb_offset_exists (tvb, 608)) {
- proto_tree_add_string (req_tree, hf_fcdns_rply_gft, tvb, offset+560,
- 32,
- fc4type_to_str (tvb, offset+560, str));
+ dissect_fc4type(req_tree, tvb, offset+560, &hfi_fcdns_rply_gft);
}
if (tvb_offset_exists (tvb, 624)) {
- proto_tree_add_item (req_tree, hf_fcdns_rply_ipport, tvb,
- offset+592, 16, 0);
+ proto_tree_add_item (req_tree, &hfi_fcdns_rply_ipport, tvb,
+ offset+592, 16, ENC_NA);
}
if (tvb_offset_exists (tvb, 632)) {
- proto_tree_add_string (req_tree, hf_fcdns_rply_fpname, tvb,
- offset+608, 8,
- fcwwn_to_str (tvb_get_ptr (tvb, offset+608,
- 8)));
+ proto_tree_add_item (req_tree, &hfi_fcdns_rply_fpname, tvb,
+ offset+608, 8, ENC_NA);
}
if (tvb_offset_exists (tvb, 635)) {
- proto_tree_add_string (req_tree, hf_fcdns_rply_hrdaddr, tvb,
- offset+617, 3,
- fc_to_str (tvb_get_ptr (tvb, offset+617,
- 3)));
+ proto_tree_add_item (req_tree, &hfi_fcdns_rply_hrdaddr, tvb,
+ offset+617, 3, ENC_NA);
}
}
}
dissect_fcdns_req_portid (tvb, req_tree, offset+1);
}
else {
- proto_tree_add_string (req_tree, hf_fcdns_rply_pname, tvb, offset,
- 8, fcwwn_to_str (tvb_get_ptr (tvb, offset,
- 8)));
+ proto_tree_add_item (req_tree, &hfi_fcdns_rply_pname, tvb, offset,
+ 8, ENC_NA);
}
}
}
dissect_fcdns_req_portid (tvb, req_tree, offset+1);
}
else {
- proto_tree_add_string (req_tree, hf_fcdns_rply_nname, tvb,
- offset, 8,
- fcwwn_to_str (tvb_get_ptr (tvb, offset,
- 8)));
+ proto_tree_add_item (req_tree, &hfi_fcdns_rply_nname, tvb,
+ offset, 8, ENC_NA);
}
}
}
dissect_fcdns_gcsid (tvbuff_t *tvb, proto_tree *req_tree, gboolean isreq)
{
int offset = 16; /* past the fc_ct header */
- gchar cosstr[64];
if (req_tree) {
if (isreq) {
dissect_fcdns_req_portid (tvb, req_tree, offset);
}
else {
- proto_tree_add_string (req_tree, hf_fcdns_rply_cos, tvb,
- offset, 4,
- fccos_to_str (tvb, offset, cosstr));
+ dissect_cos_flags(req_tree, tvb, offset, &hfi_fcdns_reply_cos);
}
}
}
dissect_fcdns_gftid (tvbuff_t *tvb, proto_tree *req_tree, gboolean isreq)
{
int offset = 16; /* past the fc_ct header */
- gchar fc4str[64];
if (req_tree) {
if (isreq) {
dissect_fcdns_req_portid (tvb, req_tree, offset+1);
}
else {
- proto_tree_add_string (req_tree, hf_fcdns_rply_gft, tvb,
- offset, 32,
- fc4type_to_str (tvb, offset, fc4str));
+ dissect_fc4type(req_tree, tvb, offset, &hfi_fcdns_rply_gft);
}
}
}
}
else {
len = tvb_get_guint8 (tvb, offset);
- proto_tree_add_item (req_tree, hf_fcdns_rply_spnamelen,
- tvb, offset, 1, 0);
- proto_tree_add_string (req_tree, hf_fcdns_rply_spname, tvb,
- offset+1, len,
- tvb_get_ptr (tvb, offset+1, len));
+ proto_tree_add_item (req_tree, &hfi_fcdns_rply_spnamelen,
+ tvb, offset, 1, ENC_BIG_ENDIAN);
+ proto_tree_add_item (req_tree, &hfi_fcdns_rply_spname, tvb,
+ offset+1, len, ENC_ASCII|ENC_NA);
}
}
}
dissect_fcdns_req_portid (tvb, req_tree, offset+1);
}
else {
- proto_tree_add_item (req_tree, hf_fcdns_rply_ptype, tvb,
- offset, 1, 0);
+ proto_tree_add_item (req_tree, &hfi_fcdns_rply_ptype, tvb,
+ offset, 1, ENC_BIG_ENDIAN);
}
}
}
dissect_fcdns_req_portid (tvb, req_tree, offset+1);
}
else {
- proto_tree_add_string (req_tree, hf_fcdns_rply_fpname, tvb,
- offset, 8,
- fcwwn_to_str (tvb_get_ptr (tvb, offset,
- 8)));
+ proto_tree_add_item (req_tree, &hfi_fcdns_rply_fpname, tvb,
+ offset, 8, ENC_NA);
}
}
dissect_fcdns_gfdid (tvbuff_t *tvb, proto_tree *req_tree, gboolean isreq)
{
int offset = 16; /* past the fc_ct header */
- gchar fc4str[128];
int tot_len, desclen;
if (req_tree) {
if (isreq) {
dissect_fcdns_req_portid (tvb, req_tree, offset+1);
- proto_tree_add_string (req_tree, hf_fcdns_fc4type, tvb, offset+4,
- 32,
- fc4type_to_str (tvb, offset+4, fc4str));
+ dissect_fc4type(req_tree, tvb, offset+4, &hfi_fcdns_fc4type);
}
else {
- tot_len = tvb_length (tvb) - offset; /* excluding CT header */
+ tot_len = tvb_reported_length_remaining (tvb, offset); /* excluding CT header */
while (tot_len > 0) {
/* 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, hf_fcdns_rply_fc4desc, tvb,
- offset, desclen, 0);
+ proto_tree_add_item (req_tree, &hfi_fcdns_rply_fc4desc, tvb,
+ offset, desclen, ENC_NA);
tot_len -= 255; /* descriptors are aligned to 255 bytes */
offset += 256;
}
dissect_fcdns_gffid (tvbuff_t *tvb, proto_tree *req_tree, gboolean isreq)
{
int offset = 16; /* past the fc_ct header */
- gchar fc4fstr[128];
if (req_tree) {
if (isreq) {
dissect_fcdns_req_portid (tvb, req_tree, offset+1);
}
else {
- proto_tree_add_string (req_tree, hf_fcdns_rply_fc4feat, tvb,
- offset, 128,
- fc4ftrs_to_str (tvb, offset, fc4fstr));
+ dissect_fc4features(req_tree, tvb, offset);
}
}
}
if (req_tree) {
if (isreq) {
- proto_tree_add_string (req_tree, hf_fcdns_req_pname, tvb,
- offset, 8,
- fcwwn_to_str (tvb_get_ptr (tvb, offset,
- 8)));
+ proto_tree_add_item (req_tree, &hfi_fcdns_req_pname, tvb,
+ offset, 8, ENC_NA);
}
else {
- proto_tree_add_string (req_tree, hf_fcdns_rply_portid, tvb,
- offset+1, 3,
- fc_to_str (tvb_get_ptr (tvb, offset+1,
- 3)));
+ proto_tree_add_item (req_tree, &hfi_fcdns_rply_portid, tvb,
+ offset+1, 3, ENC_NA);
}
}
}
if (req_tree) {
if (isreq) {
- proto_tree_add_string (req_tree, hf_fcdns_req_pname, tvb,
- offset, 8,
- fcwwn_to_str (tvb_get_ptr (tvb, offset,
- 8)));
+ proto_tree_add_item (req_tree, &hfi_fcdns_req_pname, tvb,
+ offset, 8, ENC_NA);
}
else {
- proto_tree_add_item (req_tree, hf_fcdns_rply_ipport, tvb, offset,
- 16, 0);
+ proto_tree_add_item (req_tree, &hfi_fcdns_rply_ipport, tvb, offset,
+ 16, ENC_NA);
}
}
}
if (req_tree) {
if (isreq) {
- proto_tree_add_string (req_tree, hf_fcdns_req_nname, tvb,
- offset, 8,
- fcwwn_to_str (tvb_get_ptr (tvb, offset,
- 8)));
+ proto_tree_add_item (req_tree, &hfi_fcdns_req_nname, tvb,
+ offset, 8, ENC_NA);
}
else {
do {
islast = tvb_get_guint8 (tvb, offset);
- proto_tree_add_string (req_tree, hf_fcdns_rply_portid,
- tvb, offset+1, 3,
- fc_to_str (tvb_get_ptr (tvb, offset+1,
- 3)));
+ proto_tree_add_item (req_tree, &hfi_fcdns_rply_portid,
+ tvb, offset+1, 3, ENC_NA);
offset += 4;
} while (!(islast & 0x80));
}
if (req_tree) {
if (isreq) {
- proto_tree_add_string (req_tree, hf_fcdns_req_nname, tvb,
- offset, 8,
- fcwwn_to_str (tvb_get_ptr (tvb, offset,
- 8)));
+ proto_tree_add_item (req_tree, &hfi_fcdns_req_nname, tvb,
+ offset, 8, ENC_NA);
}
else {
- proto_tree_add_item (req_tree, hf_fcdns_rply_ipnode, tvb, offset,
- 16, 0);
+ proto_tree_add_item (req_tree, &hfi_fcdns_rply_ipnode, tvb, offset,
+ 16, ENC_NA);
}
}
}
if (req_tree) {
if (isreq) {
- proto_tree_add_string (req_tree, hf_fcdns_req_nname, tvb,
- offset, 8,
- fcwwn_to_str (tvb_get_ptr (tvb, offset,
- 8)));
+ proto_tree_add_item (req_tree, &hfi_fcdns_req_nname, tvb,
+ offset, 8, ENC_NA);
}
else {
do {
islast = tvb_get_guint8 (tvb, offset);
- proto_tree_add_string (req_tree, hf_fcdns_rply_portid,
- tvb, offset+1, 3,
- fc_to_str (tvb_get_ptr (tvb, offset+1,
- 3)));
- proto_tree_add_string (req_tree, hf_fcdns_rply_pname,
- tvb, offset+8, 8,
- fcwwn_to_str (tvb_get_ptr (tvb,
- offset+8,
- 8)));
+ proto_tree_add_item (req_tree, &hfi_fcdns_rply_portid,
+ tvb, offset+1, 3, ENC_NA);
+ proto_tree_add_item (req_tree, &hfi_fcdns_rply_pname,
+ tvb, offset+8, 8, ENC_NA);
offset += 16;
} while (!(islast & 0x80));
}
if (req_tree) {
if (isreq) {
- proto_tree_add_string (req_tree, hf_fcdns_req_nname, tvb,
- offset, 8,
- fcwwn_to_str (tvb_get_ptr (tvb, offset,
- 8)));
+ proto_tree_add_item (req_tree, &hfi_fcdns_req_nname, tvb,
+ offset, 8, ENC_NA);
}
else {
len = tvb_get_guint8 (tvb, offset);
- proto_tree_add_item (req_tree, hf_fcdns_rply_snamelen, tvb,
- offset, 1, 0);
- proto_tree_add_item (req_tree, hf_fcdns_rply_sname, tvb,
- offset+1, len, 0);
+ proto_tree_add_item (req_tree, &hfi_fcdns_rply_snamelen, tvb,
+ offset, 1, ENC_BIG_ENDIAN);
+ proto_tree_add_item (req_tree, &hfi_fcdns_rply_sname, tvb,
+ offset+1, len, ENC_ASCII|ENC_NA);
}
}
}
if (req_tree) {
if (isreq) {
- proto_tree_add_item (req_tree, hf_fcdns_req_domainscope,
- tvb, offset+1, 1, 0);
- proto_tree_add_item (req_tree, hf_fcdns_req_areascope,
- tvb, offset+2, 1, 0);
- proto_tree_add_item (req_tree, hf_fcdns_req_fc4type,
- tvb, offset+3, 1, 0);
+ proto_tree_add_item (req_tree, &hfi_fcdns_req_domainscope,
+ tvb, offset+1, 1, ENC_BIG_ENDIAN);
+ proto_tree_add_item (req_tree, &hfi_fcdns_req_areascope,
+ tvb, offset+2, 1, ENC_BIG_ENDIAN);
+ proto_tree_add_item (req_tree, &hfi_fcdns_req_fc4type,
+ tvb, offset+3, 1, ENC_BIG_ENDIAN);
}
else {
do {
islast = tvb_get_guint8 (tvb, offset);
- proto_tree_add_string (req_tree, hf_fcdns_rply_portid,
- tvb, offset+1, 3,
- fc_to_str (tvb_get_ptr (tvb, offset+1,
- 3)));
+ proto_tree_add_item (req_tree, &hfi_fcdns_rply_portid,
+ tvb, offset+1, 3, ENC_NA);
offset += 4;
} while (!(islast & 0x80));
}
if (req_tree) {
if (isreq) {
- proto_tree_add_item (req_tree, hf_fcdns_req_domainscope,
- tvb, offset+1, 1, 0);
- proto_tree_add_item (req_tree, hf_fcdns_req_areascope,
- tvb, offset+2, 1, 0);
- proto_tree_add_item (req_tree, hf_fcdns_req_fc4type,
- tvb, offset+3, 1, 0);
+ proto_tree_add_item (req_tree, &hfi_fcdns_req_domainscope,
+ tvb, offset+1, 1, ENC_BIG_ENDIAN);
+ proto_tree_add_item (req_tree, &hfi_fcdns_req_areascope,
+ tvb, offset+2, 1, ENC_BIG_ENDIAN);
+ proto_tree_add_item (req_tree, &hfi_fcdns_req_fc4type,
+ tvb, offset+3, 1, ENC_BIG_ENDIAN);
}
else {
do {
islast = tvb_get_guint8 (tvb, offset);
- proto_tree_add_string (req_tree, hf_fcdns_rply_portid,
- tvb, offset+1, 3,
- fc_to_str (tvb_get_ptr (tvb, offset+1,
- 3)));
- proto_tree_add_string (req_tree, hf_fcdns_rply_pname,
- tvb, offset+4, 8,
- fcwwn_to_str (tvb_get_ptr (tvb, offset+8,
- 8)));
+ proto_tree_add_item (req_tree, &hfi_fcdns_rply_portid,
+ tvb, offset+1, 3, ENC_NA);
+ proto_tree_add_item (req_tree, &hfi_fcdns_rply_pname,
+ tvb, offset+4, 8, ENC_NA);
offset += 16;
} while (!(islast & 0x80));
}
if (req_tree) {
if (isreq) {
- proto_tree_add_item (req_tree, hf_fcdns_req_domainscope,
- tvb, offset+1, 1, 0);
- proto_tree_add_item (req_tree, hf_fcdns_req_areascope,
- tvb, offset+2, 1, 0);
- proto_tree_add_item (req_tree, hf_fcdns_req_fc4type,
- tvb, offset+3, 1, 0);
+ proto_tree_add_item (req_tree, &hfi_fcdns_req_domainscope,
+ tvb, offset+1, 1, ENC_BIG_ENDIAN);
+ proto_tree_add_item (req_tree, &hfi_fcdns_req_areascope,
+ tvb, offset+2, 1, ENC_BIG_ENDIAN);
+ proto_tree_add_item (req_tree, &hfi_fcdns_req_fc4type,
+ tvb, offset+3, 1, ENC_BIG_ENDIAN);
}
else {
do {
islast = tvb_get_guint8 (tvb, offset);
- proto_tree_add_string (req_tree, hf_fcdns_rply_portid,
- tvb, offset+1, 3,
- fc_to_str (tvb_get_ptr (tvb, offset+1,
- 3)));
- proto_tree_add_string (req_tree, hf_fcdns_rply_nname,
- tvb, offset+4, 8,
- fcwwn_to_str (tvb_get_ptr (tvb, offset+8,
- 8)));
+ proto_tree_add_item (req_tree, &hfi_fcdns_rply_portid,
+ tvb, offset+1, 3, ENC_NA);
+ proto_tree_add_item (req_tree, &hfi_fcdns_rply_nname,
+ tvb, offset+4, 8, ENC_NA);
offset += 16;
} while (!(islast & 0x80));
}
if (req_tree) {
if (isreq) {
- proto_tree_add_item (req_tree, hf_fcdns_req_ptype,
- tvb, offset, 1, 0);
- proto_tree_add_item (req_tree, hf_fcdns_req_domainscope,
- tvb, offset+1, 1, 0);
- proto_tree_add_item (req_tree, hf_fcdns_req_areascope,
- tvb, offset+2, 1, 0);
+ proto_tree_add_item (req_tree, &hfi_fcdns_req_ptype,
+ tvb, offset, 1, ENC_BIG_ENDIAN);
+ proto_tree_add_item (req_tree, &hfi_fcdns_req_domainscope,
+ tvb, offset+1, 1, ENC_BIG_ENDIAN);
+ proto_tree_add_item (req_tree, &hfi_fcdns_req_areascope,
+ tvb, offset+2, 1, ENC_BIG_ENDIAN);
}
else {
do {
islast = tvb_get_guint8 (tvb, offset);
- proto_tree_add_string (req_tree, hf_fcdns_rply_portid,
- tvb, offset+1, 3,
- fc_to_str (tvb_get_ptr (tvb, offset+1,
- 3)));
+ proto_tree_add_item (req_tree, &hfi_fcdns_rply_portid,
+ tvb, offset+1, 3, ENC_NA);
offset += 4;
} while (!(islast & 0x80));
}
if (req_tree) {
if (isreq) {
- proto_tree_add_item (req_tree, hf_fcdns_req_ip, tvb, offset,
- 16, 0);
+ proto_tree_add_item (req_tree, &hfi_fcdns_req_ip, tvb, offset,
+ 16, ENC_NA);
}
else {
do {
islast = tvb_get_guint8 (tvb, offset);
- proto_tree_add_string (req_tree, hf_fcdns_rply_portid,
- tvb, offset+1, 3,
- fc_to_str (tvb_get_ptr (tvb, offset+1,
- 3)));
+ proto_tree_add_item (req_tree, &hfi_fcdns_rply_portid,
+ tvb, offset+1, 3, ENC_NA);
offset += 4;
} while (!(islast & 0x80));
}
{
int offset = 16; /* past the fc_ct header */
guint8 islast;
- gchar str[64];
if (req_tree) {
if (isreq) {
- proto_tree_add_item (req_tree, hf_fcdns_req_domainscope, tvb,
- offset+1, 1, 0);
- proto_tree_add_item (req_tree, hf_fcdns_req_areascope, tvb,
- offset+2, 1, 0);
- proto_tree_add_string (req_tree, hf_fcdns_req_fc4feature, tvb,
- offset+6, 1,
- fc4feature_to_str (tvb_get_guint8 (tvb, offset+6),
- tvb_get_guint8 (tvb, offset+7),
- str));
- proto_tree_add_item (req_tree, hf_fcdns_req_fc4type, tvb,
- offset+7, 1, 0);
+ proto_tree_add_item (req_tree, &hfi_fcdns_req_domainscope, tvb,
+ offset+1, 1, ENC_BIG_ENDIAN);
+ proto_tree_add_item (req_tree, &hfi_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_string (req_tree, hf_fcdns_rply_portid,
- tvb, offset+1, 3,
- fc_to_str (tvb_get_ptr (tvb, offset+1,
- 3)));
+ proto_tree_add_item (req_tree, &hfi_fcdns_rply_portid,
+ tvb, offset+1, 3, ENC_NA);
offset += 4;
} while (!(islast & 0x80));
}
if (req_tree) {
if (isreq) {
- proto_tree_add_string (req_tree, hf_fcdns_req_portid,
- tvb, offset+1, 3,
- fc_to_str (tvb_get_ptr (tvb, offset+1,
- 3)));
- proto_tree_add_string (req_tree, hf_fcdns_req_pname, tvb,
- offset+4, 8,
- fcwwn_to_str (tvb_get_ptr (tvb, offset+4,
- 8)));
+ proto_tree_add_item (req_tree, &hfi_fcdns_req_portid,
+ tvb, offset+1, 3, ENC_NA);
+ proto_tree_add_item (req_tree, &hfi_fcdns_req_pname, tvb,
+ offset+4, 8, ENC_NA);
}
}
}
if (req_tree) {
if (isreq) {
- proto_tree_add_string (req_tree, hf_fcdns_req_portid,
- tvb, offset+1, 3,
- fc_to_str (tvb_get_ptr (tvb, offset+1,
- 3)));
- proto_tree_add_string (req_tree, hf_fcdns_req_nname, tvb,
- offset+4, 8,
- fcwwn_to_str (tvb_get_ptr (tvb, offset+4,
- 8)));
+ proto_tree_add_item (req_tree, &hfi_fcdns_req_portid,
+ tvb, offset+1, 3, ENC_NA);
+ proto_tree_add_item (req_tree, &hfi_fcdns_req_nname, tvb,
+ offset+4, 8, ENC_NA);
}
}
}
dissect_fcdns_rcsid (tvbuff_t *tvb, proto_tree *req_tree, gboolean isreq)
{
int offset = 16; /* past the fc_ct header */
- gchar cos[64];
if (req_tree && isreq) {
- proto_tree_add_string (req_tree, hf_fcdns_req_portid, tvb,
- offset+1, 3,
- fc_to_str (tvb_get_ptr (tvb, offset+1,
- 3)));
- proto_tree_add_string (req_tree, hf_fcdns_req_cos, tvb,
- offset+4, 4,
- fccos_to_str (tvb, offset+4, cos));
+ proto_tree_add_item (req_tree, &hfi_fcdns_req_portid, tvb,
+ offset+1, 3, ENC_NA);
+ dissect_cos_flags(req_tree, tvb, offset+4, &hfi_fcdns_req_cos);
}
}
{
int offset = 16; /* past the fc_ct header */
- if (req_tree && isreq) {
- proto_tree_add_string (req_tree, hf_fcdns_req_portid, tvb,
- offset+1, 3,
- fc_to_str (tvb_get_ptr (tvb, offset+1,
- 3)));
- proto_tree_add_item (req_tree, hf_fcdns_req_ptype, tvb,
- offset+4, 1, 0);
+ if (isreq) {
+ proto_tree_add_item (req_tree, &hfi_fcdns_req_portid, tvb,
+ offset+1, 3, ENC_NA);
+ proto_tree_add_item (req_tree, &hfi_fcdns_req_ptype, tvb,
+ offset+4, 1, ENC_BIG_ENDIAN);
}
}
dissect_fcdns_rftid (tvbuff_t *tvb, proto_tree *req_tree, gboolean isreq)
{
int offset = 16; /* past the fc_ct header */
- gchar fc4str[128];
- if (req_tree && isreq) {
- proto_tree_add_string (req_tree, hf_fcdns_req_portid, tvb,
- offset+1, 3,
- fc_to_str (tvb_get_ptr (tvb, offset+1,
- 3)));
- proto_tree_add_string (req_tree, hf_fcdns_req_fc4types, tvb,
- offset+4, 32,
- fc4type_to_str (tvb, offset+4, fc4str));
+ if (isreq) {
+ proto_tree_add_item (req_tree, &hfi_fcdns_req_portid, tvb,
+ offset+1, 3, ENC_NA);
+ dissect_fc4type(req_tree, tvb, offset+4, &hfi_fcdns_req_fc4types);
}
}
guint8 len;
if (req_tree && isreq) {
- proto_tree_add_string (req_tree, hf_fcdns_req_portid, tvb,
- offset+1, 3,
- fc_to_str (tvb_get_ptr (tvb, offset+1,
- 3)));
- proto_tree_add_item (req_tree, hf_fcdns_req_spnamelen, tvb,
- offset+4, 1, 0);
+ proto_tree_add_item (req_tree, &hfi_fcdns_req_portid, tvb,
+ offset+1, 3, ENC_NA);
+ proto_tree_add_item (req_tree, &hfi_fcdns_req_spnamelen, tvb,
+ offset+4, 1, ENC_BIG_ENDIAN);
len = tvb_get_guint8 (tvb, offset+4);
-
- proto_tree_add_item (req_tree, hf_fcdns_req_spname, tvb, offset+5,
- len, 0);
+
+ proto_tree_add_item (req_tree, &hfi_fcdns_req_spname, tvb, offset+5,
+ len, ENC_ASCII|ENC_NA);
}
}
{
int offset = 16; /* past the fc_ct header */
- if (req_tree && isreq) {
- proto_tree_add_string (req_tree, hf_fcdns_req_portid, tvb,
- offset+1, 3,
- fc_to_str (tvb_get_ptr (tvb, offset+1,
- 3)));
- proto_tree_add_item (req_tree, hf_fcdns_req_ip, tvb,
- offset+4, 16, 0);
+ if (isreq) {
+ proto_tree_add_item (req_tree, &hfi_fcdns_req_portid, tvb,
+ offset+1, 3, ENC_NA);
+ proto_tree_add_item (req_tree, &hfi_fcdns_req_ip, tvb,
+ offset+4, 16, ENC_NA);
}
}
dissect_fcdns_rfdid (tvbuff_t *tvb, proto_tree *req_tree, gboolean isreq)
{
int offset = 16; /* past the fc_ct header */
- int len, dlen;
- gchar fc4str[128];
+ int len;
+
+ if (isreq) {
+ proto_tree_add_item (req_tree, &hfi_fcdns_req_portid, tvb,
+ offset+1, 3, ENC_NA);
+ dissect_fc4type(req_tree, tvb, offset+4, &hfi_fcdns_req_fc4types);
- if (req_tree && isreq) {
- proto_tree_add_string (req_tree, hf_fcdns_req_portid, tvb,
- offset+1, 3,
- fc_to_str (tvb_get_ptr (tvb, offset+1,
- 3)));
- proto_tree_add_string (req_tree, hf_fcdns_req_fc4types, tvb,
- offset+4, 32,
- fc4type_to_str (tvb, offset+4, fc4str));
-
- len = tvb_length (tvb) - offset - 36;
offset += 36;
-
+ len = tvb_reported_length_remaining (tvb, offset);
+
while (len > 0) {
- dlen = tvb_get_guint8 (tvb, offset);
- proto_tree_add_item (req_tree, hf_fcdns_req_fdesclen, tvb, offset,
- 1, 0);
- proto_tree_add_item (req_tree, hf_fcdns_req_fdesc, tvb, offset+1,
- len, 0);
+ proto_tree_add_item (req_tree, &hfi_fcdns_req_fdesclen, tvb, offset,
+ 1, ENC_BIG_ENDIAN);
+ proto_tree_add_item (req_tree, &hfi_fcdns_req_fdesc, tvb, offset+1,
+ len, ENC_ASCII|ENC_NA);
offset += 256;
len -= 256;
}
dissect_fcdns_rffid (tvbuff_t *tvb, proto_tree *req_tree, gboolean isreq)
{
int offset = 16; /* past the fc_ct header */
- gchar fc4str[64];
- if (req_tree && isreq) {
- proto_tree_add_string (req_tree, hf_fcdns_req_portid, tvb, offset+1, 3,
- fc_to_str (tvb_get_ptr (tvb, offset+1, 3)));
- proto_tree_add_string (req_tree, hf_fcdns_req_fc4feature, tvb,
- offset+6, 1,
- fc4feature_to_str (tvb_get_guint8 (tvb,
- offset+6),
- tvb_get_guint8 (tvb,
- offset+7),
- fc4str));
- proto_tree_add_item (req_tree, hf_fcdns_req_fc4type, tvb, offset+7,
- 1, 0);
+ if (isreq) {
+ proto_tree_add_item (req_tree, &hfi_fcdns_req_portid, tvb, offset+1, 3, ENC_NA);
+ dissect_fc4features_and_type(req_tree, tvb, offset+6);
}
}
{
int offset = 16; /* past the fc_ct header */
- if (req_tree && isreq) {
- proto_tree_add_string (req_tree, hf_fcdns_req_nname, tvb, offset, 8,
- fcwwn_to_str (tvb_get_ptr (tvb, offset, 8)));
- proto_tree_add_item (req_tree, hf_fcdns_req_ip, tvb, offset+8, 16, 0);
+ 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);
}
}
int offset = 16; /* past the fc_ct header */
guint8 len;
- if (req_tree && isreq) {
- proto_tree_add_string (req_tree, hf_fcdns_req_nname, tvb, offset, 8,
- fcwwn_to_str (tvb_get_ptr (tvb, offset, 8)));
+ if (isreq) {
+ proto_tree_add_item (req_tree, &hfi_fcdns_req_nname, tvb, offset, 8, ENC_NA);
len = tvb_get_guint8 (tvb, offset+8);
- proto_tree_add_item (req_tree, hf_fcdns_req_snamelen, tvb, offset+8,
- 1, 0);
- proto_tree_add_item (req_tree, hf_fcdns_req_sname, tvb, offset+9,
- len, 0);
+ proto_tree_add_item (req_tree, &hfi_fcdns_req_snamelen, tvb, offset+8,
+ 1, ENC_BIG_ENDIAN);
+ proto_tree_add_item (req_tree, &hfi_fcdns_req_sname, tvb, offset+9,
+ len, ENC_ASCII|ENC_NA);
}
}
{
int offset = 16; /* past the fc_ct header */
- if (req_tree && isreq) {
- proto_tree_add_string (req_tree, hf_fcdns_req_portid, tvb, offset+1, 3,
- fc_to_str (tvb_get_ptr (tvb, offset+1, 3)));
+ if (isreq) {
+ proto_tree_add_item (req_tree, &hfi_fcdns_req_portid, tvb, offset+1, 3, ENC_NA);
}
}
zonenm_to_str (tvbuff_t *tvb, gint offset)
{
int len = tvb_get_guint8 (tvb, offset);
- return tvb_get_string (tvb, offset+4, len);
+ return tvb_get_string_enc(wmem_packet_scope(), tvb, offset+4, len, ENC_ASCII);
}
static void
-dissect_fcdns_zone_mbr (tvbuff_t *tvb, proto_tree *zmbr_tree, int offset)
+dissect_fcdns_zone_mbr (tvbuff_t *tvb, packet_info* pinfo, proto_tree *zmbr_tree, int offset)
{
guint8 mbrtype;
int idlen;
- char dpbuf[2+8+1];
- char *str;
+ proto_item* ti;
mbrtype = tvb_get_guint8 (tvb, offset);
- proto_tree_add_uint (zmbr_tree, hf_fcdns_zone_mbrtype, tvb,
+ ti = proto_tree_add_uint (zmbr_tree, &hfi_fcdns_zone_mbrtype, tvb,
offset, 1, mbrtype);
- proto_tree_add_text (zmbr_tree, tvb, offset+2, 1, "Flags: 0x%x",
- tvb_get_guint8 (tvb, offset+2));
+ proto_tree_add_item(zmbr_tree, &hfi_fcdns_zone_flags, tvb, offset+2, 1, ENC_NA);
idlen = tvb_get_guint8 (tvb, offset+3);
- proto_tree_add_text (zmbr_tree, tvb, offset+3, 1,
- "Identifier Length: %d", idlen);
+ proto_tree_add_item(zmbr_tree, &hfi_fcdns_id_length, tvb, offset+3, 1, ENC_NA);
switch (mbrtype) {
case FC_SWILS_ZONEMBR_WWN:
- proto_tree_add_string (zmbr_tree, hf_fcdns_zone_mbrid, tvb,
- offset+4, 8,
- fcwwn_to_str (tvb_get_ptr (tvb,
- offset+4,
- 8)));
+ proto_tree_add_item (zmbr_tree, &hfi_fcdns_zone_mbrid_wwn, tvb,
+ offset+4, 8, ENC_NA);
break;
case FC_SWILS_ZONEMBR_DP:
- sprintf(dpbuf, "0x%08x", tvb_get_ntohl (tvb, offset+4));
- proto_tree_add_string (zmbr_tree, hf_fcdns_zone_mbrid, tvb,
- offset+4, 4, dpbuf);
+ proto_tree_add_item (zmbr_tree, &hfi_fcdns_zone_mbrid_uint, tvb,
+ offset+4, 4, ENC_BIG_ENDIAN);
break;
case FC_SWILS_ZONEMBR_FCID:
- proto_tree_add_string (zmbr_tree, hf_fcdns_zone_mbrid, tvb,
- offset+4, 4,
- fc_to_str (tvb_get_ptr (tvb,
- offset+5,
- 3)));
+ proto_tree_add_item (zmbr_tree, &hfi_fcdns_zone_mbrid_fc, tvb,
+ offset+4, 3, ENC_NA);
break;
case FC_SWILS_ZONEMBR_ALIAS:
- str = zonenm_to_str (tvb, offset+4);
- proto_tree_add_string (zmbr_tree, hf_fcdns_zone_mbrid, tvb,
- offset+4, idlen, str);
- g_free (str);
+ proto_tree_add_string (zmbr_tree, &hfi_fcdns_zone_mbrid, tvb,
+ offset+4, idlen, zonenm_to_str (tvb, offset+4));
break;
default:
- proto_tree_add_string (zmbr_tree, hf_fcdns_zone_mbrid, tvb,
- offset+4, idlen,
- "Unknown member type format");
-
+ expert_add_info(pinfo, ti, &ei_fcdns_zone_mbrid);
+
}
}
{
int numrec, i, len;
guint8 objfmt;
- gchar str[512];
-
- numrec = tvb_get_ntohl (tvb, offset);
if (tree) {
- proto_tree_add_text (tree, tvb, offset, 4, "Number of Entries: %d",
- numrec);
+ numrec = tvb_get_ntohl (tvb, offset);
+ proto_tree_add_uint(tree, &hfi_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, hf_fcdns_sw2_objfmt, tvb, offset, 1, 0);
- proto_tree_add_string (tree, hf_fcdns_rply_ownerid, tvb, offset+1,
- 3, fc_to_str (tvb_get_ptr (tvb, offset+1,
- 3)));
- proto_tree_add_item (tree, hf_fcdns_rply_ptype, tvb, offset+4,
- 1, 0);
- proto_tree_add_string (tree, hf_fcdns_rply_portid, tvb, offset+5, 3,
- fc_to_str (tvb_get_ptr (tvb, offset+5, 3)));
- proto_tree_add_string (tree, hf_fcdns_rply_pname, tvb, offset+8, 8,
- fcwwn_to_str (tvb_get_ptr (tvb, offset+8,
- 8)));
+ 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,
+ 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);
offset += 16;
if (!(objfmt & 0x1)) {
len = tvb_get_guint8 (tvb, offset);
- proto_tree_add_item (tree, hf_fcdns_rply_spnamelen, tvb,
- offset, 1, 0);
- proto_tree_add_item (tree, hf_fcdns_rply_spname, tvb,
- offset+1, len, 0);
+ proto_tree_add_item (tree, &hfi_fcdns_rply_spnamelen, tvb,
+ offset, 1, ENC_BIG_ENDIAN);
+ proto_tree_add_item (tree, &hfi_fcdns_rply_spname, tvb,
+ offset+1, len, ENC_ASCII|ENC_NA);
offset += 256;
}
- proto_tree_add_string (tree, hf_fcdns_rply_nname, tvb, offset, 8,
- fcwwn_to_str (tvb_get_ptr (tvb, offset, 8)));
+ proto_tree_add_item (tree, &hfi_fcdns_rply_nname, tvb, offset, 8, ENC_NA);
offset += 8;
if (!(objfmt & 0x1)) {
len = tvb_get_guint8 (tvb, offset);
- proto_tree_add_item (tree, hf_fcdns_rply_snamelen, tvb,
- offset, 1, 0);
- proto_tree_add_item (tree, hf_fcdns_rply_sname, tvb,
- offset+1, len, 0);
+ proto_tree_add_item (tree, &hfi_fcdns_rply_snamelen, tvb,
+ offset, 1, ENC_BIG_ENDIAN);
+ proto_tree_add_item (tree, &hfi_fcdns_rply_sname, tvb,
+ offset+1, len, ENC_ASCII|ENC_NA);
offset += 256;
}
- proto_tree_add_item (tree, hf_fcdns_rply_ipa, tvb, offset, 8, 0);
- proto_tree_add_item (tree, hf_fcdns_rply_ipnode, tvb, offset+8, 16,
- 0);
- proto_tree_add_string (tree, hf_fcdns_rply_cos, tvb, offset+24, 4,
- fccos_to_str (tvb, offset+24, str));
- proto_tree_add_string (tree, hf_fcdns_rply_gft, tvb, offset+28,
- 32,
- fc4type_to_str (tvb, offset+28, str));
- proto_tree_add_item (tree, hf_fcdns_rply_ipport, tvb, offset+60,
- 16, 0);
- proto_tree_add_string (tree, hf_fcdns_rply_fpname, tvb, offset+76,
- 8, fcwwn_to_str (tvb_get_ptr (tvb,
- offset+76,
- 8)));
- proto_tree_add_string (tree, hf_fcdns_rply_hrdaddr, tvb, offset+85,
- 3, fc_to_str (tvb_get_ptr (tvb, offset+85,
- 3)));
+ 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,
+ 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,
+ 16, ENC_NA);
+ proto_tree_add_item (tree, &hfi_fcdns_rply_fpname, tvb, offset+76,
+ 8, ENC_NA);
+ proto_tree_add_item (tree, &hfi_fcdns_rply_hrdaddr, tvb, offset+85,
+ 3, ENC_NA);
offset += 88;
if (objfmt & 0x2) {
- proto_tree_add_string (tree, hf_fcdns_rply_fc4feat, tvb,
- offset, 128,
- fc4ftrs_to_str (tvb, offset, str));
+ dissect_fc4features(tree, tvb, offset);
if (tvb_get_guint8 (tvb, offset+129)) {
- proto_tree_add_item (tree, hf_fcdns_rply_fc4type, tvb,
- offset+128, 1, 0);
- proto_tree_add_item (tree, hf_fcdns_num_fc4desc, tvb,
- offset+129, 1, 0);
+ proto_tree_add_item (tree, &hfi_fcdns_rply_fc4type, tvb,
+ offset+128, 1, ENC_BIG_ENDIAN);
+ proto_tree_add_item (tree, &hfi_fcdns_num_fc4desc, tvb,
+ offset+129, 1, ENC_BIG_ENDIAN);
len = tvb_get_guint8 (tvb, offset+132);
- proto_tree_add_item (tree, hf_fcdns_rply_fc4desclen, tvb,
- offset+132, 1, 0);
- proto_tree_add_item (tree, hf_fcdns_rply_fc4desc, tvb,
- offset+133, len, 0);
+ proto_tree_add_item (tree, &hfi_fcdns_rply_fc4desclen, tvb,
+ offset+132, 1, ENC_BIG_ENDIAN);
+ proto_tree_add_item (tree, &hfi_fcdns_rply_fc4desc, tvb,
+ offset+133, len, ENC_NA);
}
else {
- proto_tree_add_item (tree, hf_fcdns_num_fc4desc, tvb,
- offset+129, 1, 0);
+ proto_tree_add_item (tree, &hfi_fcdns_num_fc4desc, tvb,
+ offset+129, 1, ENC_BIG_ENDIAN);
}
- offset += 388; /* FC4 desc is 260 bytes, maybe padded */
+ offset += 388; /* FC4 desc is 260 bytes, maybe padded */
}
}
}
int offset = 16; /* past the fc_ct header */
if (isreq) {
- if (req_tree) {
- proto_tree_add_string (req_tree, hf_fcdns_req_portid, tvb, offset+1,
- 3, fc_to_str (tvb_get_ptr (tvb, offset+1,
- 3)));
- }
+ proto_tree_add_item (req_tree, &hfi_fcdns_req_portid, tvb, offset+1, 3, ENC_NA);
}
else {
dissect_fcdns_swils_entries (tvb, req_tree, offset);
{
int offset = 16; /* past the fc_ct header */
if (isreq) {
- if (req_tree) {
- proto_tree_add_string (req_tree, hf_fcdns_req_pname, tvb, offset, 8,
- fcwwn_to_str (tvb_get_ptr (tvb, offset, 8)));
- }
+ proto_tree_add_item(req_tree, &hfi_fcdns_req_pname, tvb, offset, 8, ENC_NA);
}
else {
dissect_fcdns_swils_entries (tvb, req_tree, offset);
int offset = 16; /* past the fc_ct header */
if (isreq) {
- if (req_tree) {
- proto_tree_add_string (req_tree, hf_fcdns_req_nname, tvb, offset, 8,
- fcwwn_to_str (tvb_get_ptr (tvb, offset, 8)));
- }
+ proto_tree_add_item (req_tree, &hfi_fcdns_req_nname, tvb, offset, 8, ENC_NA);
}
else {
dissect_fcdns_swils_entries (tvb, req_tree, offset);
if (isreq) {
if (req_tree) {
- proto_tree_add_item (req_tree, hf_fcdns_req_ip, tvb, offset, 16, 0);
+ proto_tree_add_item (req_tree, &hfi_fcdns_req_ip, tvb, offset, 16, ENC_NA);
}
}
else {
dissect_fcdns_geft (tvbuff_t *tvb, proto_tree *req_tree, gboolean isreq)
{
int offset = 16; /* past the fc_ct header */
- gchar str[128];
if (isreq) {
if (req_tree) {
- proto_tree_add_string (req_tree, hf_fcdns_fc4type, tvb, offset, 32,
- fc4type_to_str (tvb, offset, str));
+ dissect_fc4type(req_tree, tvb, offset, &hfi_fcdns_fc4type);
}
}
else {
if (isreq) {
if (req_tree) {
- proto_tree_add_item (req_tree, hf_fcdns_req_ptype, tvb, offset+3,
- 1, 0);
+ proto_tree_add_item (req_tree, &hfi_fcdns_req_ptype, tvb, offset+3,
+ 1, ENC_BIG_ENDIAN);
}
}
else {
}
static void
-dissect_fcdns_gezm (tvbuff_t *tvb, proto_tree *req_tree, gboolean isreq)
+dissect_fcdns_gezm (tvbuff_t *tvb, packet_info* pinfo, proto_tree *req_tree, gboolean isreq)
{
int offset = 16; /* past the fc_ct header */
if (isreq) {
- if (req_tree) {
- dissect_fcdns_zone_mbr (tvb, req_tree, offset);
- }
+ dissect_fcdns_zone_mbr (tvb, pinfo, req_tree, offset);
}
else {
dissect_fcdns_swils_entries (tvb, req_tree, offset);
dissect_fcdns_gezn (tvbuff_t *tvb, proto_tree *req_tree, gboolean isreq)
{
int offset = 16; /* past the fc_ct header */
- int strlen;
+ int str_len;
if (isreq) {
if (req_tree) {
- strlen = tvb_get_guint8 (tvb, offset);
- proto_tree_add_text (req_tree, tvb, offset, 1, "Name Length: %d",
- strlen);
- proto_tree_add_string (req_tree, hf_fcdns_zonenm, tvb, offset+3,
- strlen, tvb_get_ptr (tvb, offset+3, strlen));
+ 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,
+ str_len, ENC_ASCII|ENC_NA);
}
}
else {
if (isreq) {
if (req_tree) {
- proto_tree_add_item (req_tree, hf_fcdns_portip, tvb, offset, 4, 0);
+ proto_tree_add_item (req_tree, &hfi_fcdns_portip, tvb, offset, 4, ENC_BIG_ENDIAN);
}
}
else {
dissect_fcdns_geff (tvbuff_t *tvb, proto_tree *req_tree, gboolean isreq)
{
int offset = 16; /* past the fc_ct header */
- gchar str[256];
if (isreq) {
if (req_tree) {
- proto_tree_add_string (req_tree, hf_fcdns_req_fc4feature, tvb, offset,
- 128, fc4ftrs_to_str (tvb, offset, str));
+ dissect_fc4features(req_tree, tvb, offset);
}
}
else {
int offset = 0;
if (req_tree) {
- proto_tree_add_item (req_tree, hf_fcdns_reason, tvb, offset+13, 1, 0);
- proto_tree_add_item (req_tree, hf_fcdns_rjtdetail, tvb, offset+14, 1,
- 0);
- proto_tree_add_item (req_tree, hf_fcdns_vendor, tvb, offset+15, 1, 0);
+ 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,
+ ENC_BIG_ENDIAN);
+ proto_tree_add_item (req_tree, &hfi_fcdns_vendor, tvb, offset+15, 1, ENC_BIG_ENDIAN);
}
}
-static void
-dissect_fcdns (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
+static int
+dissect_fcdns (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data)
{
/* Set up structures needed to add the protocol subtree and manage it */
proto_item *ti = NULL;
conversation_t *conversation;
fcdns_conv_data_t *cdata;
fcdns_conv_key_t ckey, *req_key;
+ fc_hdr *fchdr;
+
+ /* Reject the packet if data is NULL */
+ if (data == NULL)
+ return 0;
+ fchdr = (fc_hdr *)data;
tvb_memcpy (tvb, (guint8 *)&cthdr, offset, FCCT_PRMBL_SIZE);
cthdr.revision = tvb_get_guint8 (tvb, offset);
cthdr.in_id = tvb_get_ntoh24 (tvb, offset+1);
- cthdr.opcode = ntohs (cthdr.opcode);
+ cthdr.opcode = g_ntohs (cthdr.opcode);
opcode = cthdr.opcode;
- cthdr.maxres_size = ntohs (cthdr.maxres_size);
+ cthdr.maxres_size = g_ntohs (cthdr.maxres_size);
/* Determine the type of server the request/response is for */
- if (check_col(pinfo->cinfo, COL_PROTOCOL)) {
- if (cthdr.gstype == FCCT_GSTYPE_DIRSVC)
- col_set_str (pinfo->cinfo, COL_PROTOCOL, "dNS");
- else
- col_set_str (pinfo->cinfo, COL_PROTOCOL, "Unzoned NS");
- }
+ if (cthdr.gstype == FCCT_GSTYPE_DIRSVC)
+ col_set_str (pinfo->cinfo, COL_PROTOCOL, "dNS");
+ else
+ col_set_str (pinfo->cinfo, COL_PROTOCOL, "Unzoned NS");
if (tree) {
if (cthdr.gstype == FCCT_GSTYPE_DIRSVC) {
- ti = proto_tree_add_protocol_format (tree, proto_fcdns, tvb, 0,
- tvb_reported_length (tvb),
+ ti = proto_tree_add_protocol_format (tree, hfi_fcdns->id, tvb, 0,
+ -1,
"dNS");
fcdns_tree = proto_item_add_subtree (ti, ett_fcdns);
}
else {
- ti = proto_tree_add_protocol_format (tree, proto_fcdns, tvb, 0,
- tvb_reported_length (tvb),
+ ti = proto_tree_add_protocol_format (tree, hfi_fcdns->id, tvb, 0,
+ -1,
"Unzoned NS");
fcdns_tree = proto_item_add_subtree (ti, ett_fcdns);
}
}
if ((opcode != FCCT_MSG_ACC) && (opcode != FCCT_MSG_RJT)) {
- conversation = find_conversation (&pinfo->src, &pinfo->dst,
- pinfo->ptype, pinfo->oxid,
- pinfo->rxid, NO_PORT2);
+ conversation = find_conversation (pinfo->fd->num, &pinfo->src, &pinfo->dst,
+ pinfo->ptype, fchdr->oxid,
+ fchdr->rxid, NO_PORT2);
if (!conversation) {
- conversation = conversation_new (&pinfo->src, &pinfo->dst,
- pinfo->ptype, pinfo->oxid,
- pinfo->rxid, NO_PORT2);
+ conversation = conversation_new (pinfo->fd->num, &pinfo->src, &pinfo->dst,
+ pinfo->ptype, fchdr->oxid,
+ fchdr->rxid, NO_PORT2);
}
-
+
ckey.conv_idx = conversation->index;
-
+
cdata = (fcdns_conv_data_t *)g_hash_table_lookup (fcdns_req_hash,
&ckey);
if (cdata) {
/* Since we never free the memory used by an exchange, this maybe a
* case of another request using the same exchange as a previous
- * req.
+ * req.
*/
cdata->opcode = opcode;
}
else {
- req_key = g_mem_chunk_alloc (fcdns_req_keys);
+ req_key = wmem_new(wmem_file_scope(), fcdns_conv_key_t);
req_key->conv_idx = conversation->index;
-
- cdata = g_mem_chunk_alloc (fcdns_req_vals);
+
+ cdata = wmem_new(wmem_file_scope(), fcdns_conv_data_t);
cdata->opcode = opcode;
-
+
g_hash_table_insert (fcdns_req_hash, req_key, cdata);
}
- if (check_col (pinfo->cinfo, COL_INFO)) {
- col_set_str (pinfo->cinfo, COL_INFO, val_to_str (opcode, fc_dns_opcode_val,
+ col_add_str (pinfo->cinfo, COL_INFO, val_to_str (opcode, fc_dns_opcode_val,
"0x%x"));
- }
}
else {
/* Opcode is ACC or RJT */
- conversation = find_conversation (&pinfo->src, &pinfo->dst,
- pinfo->ptype, pinfo->oxid,
- pinfo->rxid, NO_PORT2);
+ conversation = find_conversation (pinfo->fd->num, &pinfo->src, &pinfo->dst,
+ pinfo->ptype, fchdr->oxid,
+ fchdr->rxid, NO_PORT2);
isreq = 0;
if (!conversation) {
- if (tree && (opcode == FCCT_MSG_ACC)) {
- if (check_col (pinfo->cinfo, COL_INFO)) {
- col_set_str (pinfo->cinfo, COL_INFO,
+ if (opcode == FCCT_MSG_ACC) {
+ col_add_str (pinfo->cinfo, COL_INFO,
val_to_str (opcode, fc_dns_opcode_val,
"0x%x"));
- }
/* No record of what this accept is for. Can't decode */
- proto_tree_add_text (fcdns_tree, tvb, 0, tvb_length (tvb),
- "No record of Exchg. Unable to decode MSG_ACC/RJT");
- return;
+ proto_tree_add_expert(fcdns_tree, pinfo, &ei_fcdns_no_record_of_exchange, tvb, 0, -1);
+ return 0;
}
}
else {
else
failed_opcode = cdata->opcode;
}
-
- if (check_col (pinfo->cinfo, COL_INFO)) {
- if (opcode != FCCT_MSG_RJT) {
- col_add_fstr (pinfo->cinfo, COL_INFO, "ACC (%s)",
- val_to_str (opcode, fc_dns_opcode_val,
- "0x%x"));
- }
- else {
- col_add_fstr (pinfo->cinfo, COL_INFO, "RJT (%s)",
- val_to_str (failed_opcode,
- fc_dns_opcode_val,
- "0x%x"));
- }
+
+ if (opcode != FCCT_MSG_RJT) {
+ col_add_fstr (pinfo->cinfo, COL_INFO, "ACC (%s)",
+ val_to_str (opcode, fc_dns_opcode_val,
+ "0x%x"));
+ }
+ else {
+ col_add_fstr (pinfo->cinfo, COL_INFO, "RJT (%s)",
+ val_to_str (failed_opcode,
+ fc_dns_opcode_val,
+ "0x%x"));
}
-
+
if (tree) {
if ((cdata == NULL) && (opcode != FCCT_MSG_RJT)) {
/* No record of what this accept is for. Can't decode */
- proto_tree_add_text (fcdns_tree, tvb, 0, tvb_length (tvb),
- "No record of Exchg. Unable to decode MSG_ACC/RJT");
- return;
+ proto_tree_add_expert(fcdns_tree, pinfo, &ei_fcdns_no_record_of_exchange, tvb, 0, -1);
+ return 0;
}
}
}
}
if (tree) {
- proto_tree_add_item (fcdns_tree, hf_fcdns_opcode, tvb, offset+8, 2, 0);
- proto_tree_add_item (fcdns_tree, hf_fcdns_maxres_size, tvb, offset+10,
- 2, 0);
+ 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,
+ 2, ENC_BIG_ENDIAN);
}
-
+
switch (opcode) {
case FCCT_MSG_RJT:
dissect_fcdns_rjt (tvb, fcdns_tree);
dissect_fcdns_gept (tvb, fcdns_tree, isreq);
break;
case FCDNS_GE_ZM:
- dissect_fcdns_gezm (tvb, fcdns_tree, isreq);
+ dissect_fcdns_gezm (tvb, pinfo, fcdns_tree, isreq);
break;
case FCDNS_GE_ZN:
dissect_fcdns_gezn (tvb, fcdns_tree, isreq);
default:
break;
}
-}
-/* Register the protocol with Ethereal */
+ return tvb_length(tvb);
+}
-/* this format is required because a script is used to build the C function
- that calls all the protocol registration.
-*/
+/* Register the protocol with Wireshark */
void
proto_register_fcdns (void)
-{
-
-/* Setup list of header fields See Section 1.6.1 for details*/
- static hf_register_info hf[] = {
- { &hf_fcdns_gssubtype,
- {"GS_Subtype", "fcdns.gssubtype", FT_UINT8, BASE_HEX,
- VALS (fc_dns_subtype_val), 0x0, "", HFILL}},
- {&hf_fcdns_opcode,
- {"Opcode", "fcdns.opcode", FT_UINT16, BASE_HEX, VALS (fc_dns_opcode_val),
- 0x0, "", HFILL}},
- { &hf_fcdns_req_portid,
- {"Port Identifier", "fcdns.req.portid", FT_STRING, BASE_HEX, NULL, 0x0,
- "", HFILL}},
- { &hf_fcdns_rply_pname,
- {"Port Name", "fcdns.rply.pname", FT_STRING, BASE_HEX, NULL, 0x0, "",
- HFILL}},
- { &hf_fcdns_rply_nname,
- {"Node Name", "fcdns.rply.nname", FT_STRING, BASE_HEX, NULL, 0x0, "",
- HFILL}},
- { &hf_fcdns_rply_cos,
- {"Class of Service Supported", "fcdns.rply.cos", FT_STRING, BASE_HEX,
- NULL, 0x0, "", HFILL}},
- { &hf_fcdns_rply_gft,
- {"FC-4 Types Supported", "fcdns.rply.fc4type", FT_STRING, BASE_HEX,
- NULL, 0x0, "", HFILL}},
- { &hf_fcdns_rply_snamelen,
- {"Symbolic Node Name Length", "fcdns.rply.snamelen", FT_UINT8, BASE_DEC,
- NULL, 0x0, "", HFILL}},
- { &hf_fcdns_rply_sname,
- {"Symbolic Node Name", "fcdns.rply.sname", FT_STRING, BASE_HEX, NULL,
- 0x0, "", HFILL}},
- { &hf_fcdns_rply_ptype,
- {"Port Type", "fcdns.rply.porttype", FT_UINT8, BASE_HEX,
- VALS (fc_dns_port_type_val), 0x0, "", HFILL}},
- { &hf_fcdns_rply_fpname,
- {"Fabric Port Name", "fcdns.rply.fpname", FT_STRING, BASE_HEX, NULL,
- 0x0, "", HFILL}},
- { &hf_fcdns_fc4type,
- {"FC-4 Type", "fcdns.req.fc4type", FT_STRING, BASE_HEX, NULL, 0x0,
- "", HFILL}},
- { &hf_fcdns_rply_fc4feat,
- {"FC-4 Features", "fcdns.rply.fc4features", FT_STRING, BASE_HEX,
- NULL, 0x0, "", HFILL}},
- { &hf_fcdns_req_pname,
- {"Port Name", "fcdns.req.portname", FT_STRING, BASE_HEX, NULL, 0x0,
- "", HFILL}},
- { &hf_fcdns_rply_portid,
- {"Port Identifier", "fcdns.rply.portid", FT_STRING, BASE_HEX, NULL,
- 0x0, "", HFILL}},
- { &hf_fcdns_req_nname,
- {"Node Name", "fcdns.req.nname", FT_STRING, BASE_HEX, NULL, 0x0,
- "", HFILL}},
- { &hf_fcdns_req_domainscope,
- {"Domain ID Scope", "fcdns.req.domainid", FT_UINT8, BASE_HEX, NULL,
- 0x0, "", HFILL}},
- { &hf_fcdns_req_areascope,
- {"Area ID Scope", "fcdns.req.areaid", FT_UINT8, BASE_HEX, NULL,
- 0x0, "", HFILL}},
- { &hf_fcdns_req_fc4type,
- {"FC-4 Type", "fcdns.req.fc4type", FT_UINT8, BASE_HEX,
- VALS (fc_fc4_val), 0x0, "", HFILL}},
- { &hf_fcdns_req_ptype,
- {"Port Type", "fcdns.req.porttype", FT_UINT8, BASE_HEX,
- VALS (fc_dns_port_type_val), 0x0, "", HFILL}},
- { &hf_fcdns_req_ip,
- {"IP Address", "fcdns.req.ip", FT_IPv6, BASE_DEC, NULL, 0x0,
- "", HFILL}},
- { &hf_fcdns_req_fc4feature,
- {"FC-4 Feature Bits", "fcdns.req.fc4feature", FT_STRING,
- BASE_HEX, NULL, 0x0, "", HFILL}},
- { &hf_fcdns_req_cos,
- {"Class of Service Supported", "fcdns.req.class", FT_STRING,
- BASE_HEX, NULL, 0x0, "", HFILL}},
- { &hf_fcdns_req_fc4types,
- {"FC-4 TYPEs Supported", "fcdns.req.fc4types", FT_STRING,
- BASE_HEX, NULL, 0x0, "", HFILL}},
- { &hf_fcdns_rply_fc4type,
- {"FC-4 Descriptor Type", "fcdns.rply.fc4type", FT_UINT8, BASE_HEX,
- VALS (fc_fc4_val), 0x0, "", HFILL}},
- { &hf_fcdns_req_snamelen,
- {"Symbolic Name Length", "fcdns.req.snamelen", FT_UINT8, BASE_DEC,
- NULL, 0x0, "", HFILL}},
- { &hf_fcdns_req_sname,
- {"Symbolic Port Name", "fcdns.req.sname", FT_STRING, BASE_HEX, NULL,
- 0x0, "", HFILL}},
- { &hf_fcdns_rply_spnamelen,
- {"Symbolic Port Name Length", "fcdns.rply.spnamelen", FT_UINT8,
- BASE_DEC, NULL, 0x0, "", HFILL}},
- {&hf_fcdns_rply_spname,
- {"Symbolic Port Name", "fcdns.rply.spname", FT_STRING, BASE_HEX, NULL,
- 0x0, "", HFILL}},
- { &hf_fcdns_rply_ipa,
- {"Initial Process Associator", "fcdns.rply.ipa", FT_BYTES, BASE_HEX,
- NULL, 0x0, "", HFILL}},
- { &hf_fcdns_rply_ipnode,
- {"Node IP Address", "fcdns.rply.ipnode", FT_IPv6, BASE_DEC, NULL,
- 0x0, "", HFILL}},
- { &hf_fcdns_rply_ipport,
- {"Port IP Address", "fcdns.rply.ipport", FT_IPv6, BASE_DEC, NULL,
- 0x0, "", HFILL}},
- { &hf_fcdns_rply_fc4desclen,
- {"FC-4 Descriptor Length", "fcdns.rply.fc4desclen", FT_UINT8,
- BASE_DEC, NULL, 0x0, "", HFILL}},
- { &hf_fcdns_rply_fc4desc,
- {"FC-4 Descriptor", "fcdns.rply.fc4desc", FT_BYTES, BASE_HEX, NULL,
- 0x0, "", HFILL}},
- { &hf_fcdns_rply_hrdaddr,
- {"Hard Address", "fcdns.rply.hrdaddr", FT_STRING, BASE_HEX, NULL,
- 0x0, "", HFILL}},
- { &hf_fcdns_req_fdesclen,
- {"FC-4 Descriptor Length", "fcdns.req.fc4desclen", FT_UINT8, BASE_DEC,
- NULL, 0x0, "", HFILL}},
- { &hf_fcdns_req_fdesc,
- {"FC-4 Descriptor", "fcdns.req.fc4desc", FT_STRING, BASE_HEX, NULL,
- 0x0, "", HFILL}},
- { &hf_fcdns_req_spnamelen,
- {"Symbolic Port Name Length", "fcdns.req.spnamelen", FT_UINT8,
- BASE_DEC, NULL, 0x0, "", HFILL}},
- { &hf_fcdns_req_spname,
- {"Symbolic Port Name", "fcdns.req.spname", FT_STRING, BASE_HEX, NULL,
- 0x0, "", HFILL}},
- { &hf_fcdns_reason,
- {"Reason Code", "fcdns.rply.reason", FT_UINT8, BASE_HEX,
- VALS (fc_ct_rjt_code_vals), 0x0, "", HFILL}},
- { &hf_fcdns_rjtdetail,
- {"Reason Code Explanantion", "fcdns.rply.reasondet", FT_UINT8,
- BASE_HEX, VALS (fc_dns_rjt_det_code_val), 0x0, "", HFILL}},
- { &hf_fcdns_vendor,
- {"Vendor Unique Reject Code", "fcdns.rply.vendor", FT_UINT8,
- BASE_HEX, NULL, 0x0, "", HFILL}},
- { &hf_fcdns_zone_mbrtype,
- {"Zone Member Type", "fcdns.zone.mbrtype", FT_UINT8, BASE_HEX,
- VALS (fc_swils_zonembr_type_val), 0x0, "", HFILL}},
- { &hf_fcdns_zone_mbrid,
- {"Member Identifier", "swils.zone.mbrid", FT_STRING, BASE_HEX, NULL,
- 0x0, "", HFILL}},
- { &hf_fcdns_zonenm,
- {"Zone Name", "fcdns.zonename", FT_STRING, BASE_HEX, NULL, 0x0, "",
- HFILL}},
- { &hf_fcdns_portip,
- {"Port IP Address", "fcdns.portip", FT_IPv4, BASE_DEC, NULL, 0x0,
- "", HFILL}},
- { &hf_fcdns_sw2_objfmt,
- {"Name Entry Object Format", "fcdns.entry.objfmt", FT_UINT8, BASE_HEX,
- NULL, 0x0, "", HFILL}},
- { &hf_fcdns_num_fc4desc,
- {"Number of FC4 Descriptors Registered", "fcdns.entry.numfc4desc",
- FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL}},
- { &hf_fcdns_rply_ownerid,
- {"Owner Id", "fcdns.rply.ownerid", FT_STRING, BASE_HEX, NULL, 0x0, "",
- HFILL}},
- { &hf_fcdns_maxres_size,
- {"Maximum/Residual Size", "fcdns.maxres_size", FT_UINT16, BASE_DEC,
- NULL, 0x0, "", HFILL}},
+{
+#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,
};
+#endif
static gint *ett[] = {
&ett_fcdns,
+ &ett_cos_flags,
+ &ett_fc4flags,
+ &ett_fc4features,
+ };
+
+ static ei_register_info ei[] = {
+ { &ei_fcdns_no_record_of_exchange, { "fcdns.no_record_of_exchange", PI_UNDECODED, PI_WARN, "No record of Exchg. Unable to decode MSG_ACC/RJT", EXPFILL }},
+ { &ei_fcdns_zone_mbrid, { "fcdns.zone.mbrid.unknown_type", PI_PROTOCOL, PI_WARN, "Unknown member type format", EXPFILL }},
};
-
- /* Register the protocol name and description */
- proto_fcdns = proto_register_protocol("Fibre Channel Name Server",
- "FC-dNS", "FC-dNS");
- /* Required function calls to register the header fields and subtrees used */
- proto_register_field_array(proto_fcdns, hf, array_length(hf));
+ 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_subtree_array(ett, array_length(ett));
+ expert_fcdns = expert_register_protocol(proto_fcdns);
+ expert_register_field_array(expert_fcdns, ei, array_length(ei));
register_init_routine (&fcdns_init_protocol);
+
+ dns_handle = new_create_dissector_handle (dissect_fcdns, proto_fcdns);
}
-/* If this dissector uses sub-dissector registration add a registration routine.
- This format is required because a script is used to find these routines and
- create the code that calls these routines.
-*/
void
proto_reg_handoff_fcdns (void)
{
- dissector_handle_t dns_handle;
-
- dns_handle = create_dissector_handle (dissect_fcdns, proto_fcdns);
- dissector_add("fcct.server", FCCT_GSRVR_DNS, dns_handle);
- dissector_add("fcct.server", FCCT_GSRVR_UNS, dns_handle);
-
- data_handle = find_dissector ("data");
+ dissector_add_uint("fcct.server", FCCT_GSRVR_DNS, dns_handle);
+ dissector_add_uint("fcct.server", FCCT_GSRVR_UNS, dns_handle);
}
+
+/*
+ * Editor modelines - http://www.wireshark.org/tools/modelines.html
+ *
+ * Local variables:
+ * c-basic-offset: 4
+ * tab-width: 8
+ * indent-tabs-mode: nil
+ * End:
+ *
+ * vi: set shiftwidth=4 tabstop=8 expandtab:
+ * :indentSize=4:tabSize=8:noTabs=true:
+ */
git.samba.org / metze / wireshark / wip.git / blobdiff