Adding upstream version 4.2.2.upstream/4.2.2

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

1 files changed, 831 insertions, 0 deletions

diff --git a/epan/dissectors/packet-fip.c b/epan/dissectors/packet-fip.c
new file mode 100644
index 00000000..b8c5cc1f
--- /dev/null
+++ b/epan/dissectors/packet-fip.c
@@ -0,0 +1,831 @@
+/*
+ * packet-fip.c
+ * Routines for FIP dissection - FCoE Initialization Protocol
+ * Copyright (c) 2008 Cisco Systems, Inc. (jeykholt@cisco.com)
+ *
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
+ * Copyright 1998 Gerald Combs
+ *
+ * Based on packet-fcoe.c, Copyright 2006, Nuova Systems, (jre@nuovasystems.com)
+ * Based on packet-fcp.c, Copyright 2001, Dinesh G Dutt (ddutt@cisco.com)
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+
+/*
+ * For FIP protocol details, see http://t11.org.
+ * This version uses preliminary details not yet standardized.
+ * Based on http://www.t11.org/ftp/t11/pub/fc/bb-5/08-543v1.pdf
+ * and      http://www.t11.org/ftp/t11/pub/fc/bb-5/08-545v1.pdf
+ */
+
+#include "config.h"
+
+#include <epan/packet.h>
+#include <epan/to_str.h>
+#include <epan/expert.h>
+#include "packet-fc.h"
+
+void proto_register_fip(void);
+void proto_reg_handoff_fip(void);
+
+static dissector_handle_t fip_handle;
+
+/*
+ * FIP protocol information.
+ */
+#define FIP_HEADER_LEN  10
+#define FIP_BPW          4          /* bytes per descriptor length unit */
+
+/*
+ * FIP opcodes and subcodes.
+ */
+enum fip_opcode {
+    FIP_OP_DISC  = 1,               /* discovery, advertisement, etc. */
+    FIP_OP_LS    = 2,               /* Link Service request or reply */
+    FIP_OP_CTRL  = 3,               /* control */
+    FIP_OP_VLAN  = 4,               /* VLAN request or reply */
+    FIP_OP_VN2VN = 5                /* VN_port to VN_port operation */
+};
+
+/*
+ * Subcodes for FIP_OP_DISC.
+ */
+enum fip_disc_subcode {
+    FIP_SC_SOL =    1,              /* solicitation */
+    FIP_SC_ADV =    2               /* advertisement */
+};
+
+/*
+ * Subcodes for FIP_OP_LS.
+ */
+enum fip_ls_subcode {
+    FIP_SC_REQ =    1,              /* request */
+    FIP_SC_REP =    2               /* reply */
+};
+
+enum fip_ctrl_subcode {
+    FIP_SC_KA =     1,              /* keep-alive */
+    FIP_SC_CVL =    2               /* clear virtual link */
+};
+
+enum fip_vlan_subcode {
+    FIP_VL_REQ =    1,              /* request */
+    FIP_VL_REP =    2               /* reply */
+};
+
+/*
+ * Subcodes for FIP_OP_VN2VN.
+ * XXX proposal
+ */
+enum fip_vn2vn_subcode {
+    FIP_SC_VN_PROBE_REQ    = 1,     /* probe request */
+    FIP_SC_VN_PROBE_REP    = 2,     /* probe reply */
+    FIP_SC_VN_CLAIM_NOTIFY = 3,     /* claim notification */
+    FIP_SC_VN_CLAIM_REP    = 4,     /* claim response */
+    FIP_SC_VN_BEACON       = 5      /* beacon */
+};
+
+static const value_string fip_opcodes[] = {
+    { FIP_OP_DISC,      "Discovery" },
+    { FIP_OP_LS,        "Link Service" },
+    { FIP_OP_CTRL,      "Control" },
+    { FIP_OP_VLAN,      "VLAN" },
+    { FIP_OP_VN2VN,     "VN2VN" },
+    { 0,    NULL }
+};
+
+static const value_string fip_disc_subcodes[] = {
+    { FIP_SC_SOL,       "Solicitation" },
+    { FIP_SC_ADV,       "Advertisement" },
+    { 0,    NULL }
+};
+
+static const value_string fip_ls_subcodes[] = {
+    { FIP_SC_REQ,       "ELS Request" },
+    { FIP_SC_REP,       "ELS Response" },
+    { 0,    NULL }
+};
+
+static const value_string fip_ctrl_subcodes[] = {
+    { FIP_SC_KA,        "Keep-Alive" },
+    { FIP_SC_CVL,       "Clear Virtual Link" },
+    { 0,    NULL }
+};
+
+static const value_string fip_vlan_subcodes[] = {
+    { FIP_VL_REQ,       "VLAN Request" },
+    { FIP_VL_REP,       "VLAN Response" },
+    { 0,    NULL }
+};
+
+static const value_string fip_vn2vn_subcodes[] = {
+    { FIP_SC_VN_PROBE_REQ,    "Probe Request" },
+    { FIP_SC_VN_PROBE_REP,    "Probe Reply" },
+    { FIP_SC_VN_CLAIM_NOTIFY, "Claim Notification" },
+    { FIP_SC_VN_CLAIM_REP,    "Claim Response" },
+    { FIP_SC_VN_BEACON,       "Beacon" },
+    { 0,    NULL }
+};
+
+/*
+ * Descriptor types.
+ */
+enum fip_desc_type {
+    FIP_DT_PRI       =  1, /* priority for forwarder selection */
+    FIP_DT_MAC       =  2, /* MAC address */
+    FIP_DT_MAP_OUI   =  3, /* FC-MAP OUI */
+    FIP_DT_NAME      =  4, /* switch name or node name */
+    FIP_DT_FAB       =  5, /* fabric descriptor */
+    FIP_DT_FCOE_SIZE =  6, /* max FCoE frame size */
+    FIP_DT_FLOGI     =  7, /* FLOGI request or response */
+    FIP_DT_FDISC     =  8, /* FDISC request or response */
+    FIP_DT_LOGO      =  9, /* LOGO request or response */
+    FIP_DT_ELP       = 10, /* ELP request or response */
+    FIP_DT_VN        = 11, /* VN_Port Info */
+    FIP_DT_FKA       = 12, /* FIP keep-alive / advert. period */
+    FIP_DT_VEND      = 13, /* Vendor-specific TLV */
+    FIP_DT_VLAN      = 14, /* VLAN number */
+    FIP_DT_FC4F      = 15  /* FC-4 features */
+};
+
+static const value_string fip_desc_types[] = {
+    { FIP_DT_PRI,       "Priority" },
+    { FIP_DT_MAC,       "MAC Address" },
+    { FIP_DT_MAP_OUI,   "FPMA MAP OUI" },
+    { FIP_DT_NAME,      "Switch or Node Name" },
+    { FIP_DT_FAB,       "Fabric Descriptor" },
+    { FIP_DT_FCOE_SIZE, "Max FCoE frame size" },
+    { FIP_DT_FLOGI,     "FLOGI Encapsulation" },
+    { FIP_DT_FDISC,     "FDISC Encapsulation" },
+    { FIP_DT_LOGO,      "LOGO Encapsulation" },
+    { FIP_DT_ELP,       "ELP Encapsulation" },
+    { FIP_DT_VN,        "VN_Port Info" },
+    { FIP_DT_FKA,       "FKA_ADV_Period" },
+    { FIP_DT_VEND,      "Vendor_ID" },
+    { FIP_DT_VLAN,      "VLAN" },
+    { FIP_DT_FC4F,      "FC-4 features" },
+    { 0,    NULL }
+};
+static value_string_ext fip_desc_types_ext = VALUE_STRING_EXT_INIT(fip_desc_types);
+
+/*
+ * flags in header fip_flags.
+ */
+enum fip_flag {
+    FIP_FL_FPMA    = 0x8000,         /* supports FPMA fabric-provided MACs */
+    FIP_FL_SPMA    = 0x4000,         /* supports SPMA server-provided MACs */
+    FIP_FL_REC_P2P = 0x0008,         /* recorded addr or point-to-point */
+    FIP_FL_AVAIL   = 0x0004,         /* available for FLOGI */
+    FIP_FL_SOL     = 0x0002,         /* this is a solicited message */
+    FIP_FL_FPORT   = 0x0001          /* sent from an F port */
+};
+
+static int proto_fip            = -1;
+static int hf_fip_ver           = -1;
+static int hf_fip_reserved12    = -1;
+static int hf_fip_op            = -1;
+static int hf_fip_reserved8     = -1;
+static int hf_fip_disc_subcode  = -1;
+static int hf_fip_ls_subcode    = -1;
+static int hf_fip_ctrl_subcode  = -1;
+static int hf_fip_vlan_subcode  = -1;
+static int hf_fip_vn2vn_subcode = -1;
+static int hf_fip_hex_subcode   = -1;
+static int hf_fip_dlen          = -1;
+static int hf_fip_flags         = -1;
+static int hf_fip_flag_fpma     = -1;
+static int hf_fip_flag_spma     = -1;
+static int hf_fip_flag_rec_p2p  = -1;
+static int hf_fip_flag_avail    = -1;
+static int hf_fip_flag_sol      = -1;
+static int hf_fip_flag_fport    = -1;
+static int hf_fip_descriptors   = -1;
+
+static int * const hf_fip_flags_fields[] = {
+    &hf_fip_flag_fpma,
+    &hf_fip_flag_spma,
+    &hf_fip_flag_rec_p2p,
+    &hf_fip_flag_avail,
+    &hf_fip_flag_sol,
+    &hf_fip_flag_fport,
+    NULL
+};
+
+static int hf_fip_desc_type       = -1;
+static int hf_fip_desc_len        = -1;
+static int hf_fip_desc_pri        = -1;
+static int hf_fip_desc_mac        = -1;
+static int hf_fip_desc_map        = -1;
+static int hf_fip_desc_name       = -1;
+static int hf_fip_desc_fab_vfid   = -1;
+static int hf_fip_desc_fab_map    = -1;
+static int hf_fip_desc_fab_name   = -1;
+static int hf_fip_desc_fcoe_size  = -1;
+static int hf_fip_desc_vn_mac     = -1;
+static int hf_fip_desc_vn_fid     = -1;
+static int hf_fip_desc_vn_wwpn    = -1;
+static int hf_fip_desc_fka        = -1;
+static int hf_fip_desc_vend       = -1;
+static int hf_fip_desc_vend_data  = -1;
+static int hf_fip_desc_vlan       = -1;
+static int hf_fip_desc_unk        = -1;
+static int hf_fip_desc_fc4f_types = -1;
+static int hf_fip_desc_fcp_feat   = -1;
+static int hf_fip_type_ip         = -1;
+static int hf_fip_type_fcp        = -1;
+static int hf_fip_type_gs3        = -1;
+static int hf_fip_fcp_feat_i      = -1;
+static int hf_fip_fcp_feat_t      = -1;
+
+static int ett_fip                = -1;
+static int ett_fip_flags          = -1;
+static int ett_fip_dt_pri         = -1;
+static int ett_fip_dt_mac         = -1;
+static int ett_fip_dt_map         = -1;
+static int ett_fip_dt_name        = -1;
+static int ett_fip_dt_fab         = -1;
+static int ett_fip_dt_mdl         = -1;
+static int ett_fip_dt_caps        = -1;
+static int ett_fip_dt_vn          = -1;
+static int ett_fip_dt_fka         = -1;
+static int ett_fip_dt_vend        = -1;
+static int ett_fip_dt_vlan        = -1;
+static int ett_fip_dt_unk         = -1;
+static int ett_fip_dt_fc4f        = -1;
+static int ett_fip_dt_fc4f_types  = -1;
+static int ett_fip_dt_fcp_feat    = -1;
+
+static expert_field ei_fip_descriptors = EI_INIT;
+
+static dissector_handle_t fc_handle;
+
+/*
+ * Insert common descriptor type and length fields.
+ */
+static proto_tree*
+fip_desc_type_len(proto_tree *tree, tvbuff_t *tvb, guint8 dtype, int ett, proto_item** item)
+{
+    proto_tree* ret_tree;
+
+    ret_tree = proto_tree_add_subtree_format(tree, tvb, 0, -1, ett, item,
+            "Descriptor: %s ", val_to_str_ext(dtype, &fip_desc_types_ext, "Unknown 0x%x"));
+    proto_tree_add_item(ret_tree, hf_fip_desc_type, tvb, 0, 1, ENC_BIG_ENDIAN);
+    proto_tree_add_item(ret_tree, hf_fip_desc_len, tvb, 1, 1, ENC_BIG_ENDIAN);
+
+    return ret_tree;
+}
+
+/*
+ * Dissect the FC-4 type features descriptor.
+ */
+static void
+fip_desc_fc4f(tvbuff_t *tvb, proto_tree *tree, proto_item *item)
+{
+    guint mask;
+    guint offset;
+
+    static int * const types_word0[] = { /* types 0 - 31 */
+        &hf_fip_type_ip,
+        &hf_fip_type_fcp,
+        NULL
+    };
+    static int * const types_word1[] = { /* types 32 - 63 */
+        &hf_fip_type_gs3,
+        NULL
+    };
+    static int * const fcp_feat[] = {
+        &hf_fip_fcp_feat_t,
+        &hf_fip_fcp_feat_i,
+        NULL
+    };
+
+    /*
+     * First the 256-bit bitmask of types supported.
+     */
+    offset = 4;
+    proto_tree_add_bitmask(tree, tvb, offset, hf_fip_desc_fc4f_types,
+            ett_fip_dt_fc4f_types, types_word0, ENC_BIG_ENDIAN);
+    offset += 4;
+    proto_tree_add_bitmask(tree, tvb, offset, hf_fip_desc_fc4f_types,
+            ett_fip_dt_fc4f_types, types_word1, ENC_BIG_ENDIAN);
+    offset += 256 / 8 - 4;   /* skip to end of bitmask (32 bytes) */
+
+    /*
+     * Next the 4-bit capabilities per type.
+     * Only decode FCP (type 8) for now.
+     */
+    offset += 8 / 2;        /* skip first 8 types, 2 types per byte */
+    proto_tree_add_bitmask(tree, tvb, offset, hf_fip_desc_fcp_feat,
+            ett_fip_dt_fcp_feat, fcp_feat, ENC_BIG_ENDIAN);
+    mask = tvb_get_ntohl(tvb, offset);
+    if (mask & 1) {
+        proto_item_append_text(item, "FCP Target ");
+    }
+    if (mask & 2) {
+        proto_item_append_text(item, "FCP Initiator ");
+    }
+}
+
+static int
+dissect_fip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
+{
+    guint       op;
+    guint       sub;
+    guint       rlen;
+    proto_item *ti;
+    proto_item *item;
+    proto_tree *fip_tree;
+    proto_tree *subtree;
+    guint       dtype;
+    guint       dlen;
+    guint       desc_offset;
+    guint       val;
+    tvbuff_t   *desc_tvb;
+    const char *info;
+
+    col_set_str(pinfo->cinfo, COL_PROTOCOL, "FIP");
+    col_clear(pinfo->cinfo, COL_INFO);
+
+    if (!tvb_bytes_exist(tvb, 0, FIP_HEADER_LEN)) {
+        col_set_str(pinfo->cinfo, COL_INFO, "[packet too short]");
+        proto_tree_add_protocol_format(tree, proto_fip, tvb, 0,
+                                            -1, "FIP [packet too short]");
+        return tvb_captured_length(tvb);
+    }
+
+    op  = tvb_get_ntohs(tvb, 2);
+    sub = tvb_get_guint8(tvb, 5);
+
+    switch (op) {
+    case FIP_OP_DISC:
+        info = val_to_str(sub, fip_disc_subcodes, "Discovery 0x%x");
+        break;
+    case FIP_OP_LS:
+        info = val_to_str(sub, fip_ls_subcodes, "Link Service 0x%x");
+        break;
+    case FIP_OP_CTRL:
+        info = val_to_str(sub, fip_ctrl_subcodes, "Control 0x%x");
+        break;
+    case FIP_OP_VLAN:
+        info = val_to_str(sub, fip_vlan_subcodes, "VLAN 0x%x");
+        break;
+    case FIP_OP_VN2VN:
+        info = val_to_str(sub, fip_vn2vn_subcodes, "VN2VN 0x%x");
+        break;
+    default:
+        info = val_to_str(op, fip_opcodes, "Unknown op 0x%x");
+        break;
+    }
+
+    col_add_str(pinfo->cinfo, COL_INFO, info);
+
+    rlen = tvb_get_ntohs(tvb, 6);
+
+    ti = proto_tree_add_protocol_format(tree, proto_fip, tvb, 0,
+                                        FIP_HEADER_LEN + rlen * FIP_BPW,
+                                        "FIP %s", info);
+    fip_tree = proto_item_add_subtree(ti, ett_fip);
+    proto_tree_add_item(fip_tree, hf_fip_ver, tvb, 0, 1, ENC_BIG_ENDIAN);
+    proto_tree_add_item(fip_tree, hf_fip_reserved12, tvb, 0, 2, ENC_BIG_ENDIAN);
+    proto_tree_add_item(fip_tree, hf_fip_op, tvb, 2, 2, ENC_BIG_ENDIAN);
+    proto_tree_add_item(fip_tree, hf_fip_reserved8, tvb, 4, 1, ENC_NA);
+    switch (op) {
+    case FIP_OP_DISC:
+        proto_tree_add_item(fip_tree, hf_fip_disc_subcode, tvb, 5, 1, ENC_BIG_ENDIAN);
+        break;
+    case FIP_OP_LS:
+        proto_tree_add_item(fip_tree, hf_fip_ls_subcode, tvb, 5, 1, ENC_BIG_ENDIAN);
+        break;
+    case FIP_OP_CTRL:
+        proto_tree_add_item(fip_tree, hf_fip_ctrl_subcode, tvb, 5, 1, ENC_BIG_ENDIAN);
+        break;
+    case FIP_OP_VLAN:
+        proto_tree_add_item(fip_tree, hf_fip_vlan_subcode, tvb, 5, 1, ENC_BIG_ENDIAN);
+        break;
+    case FIP_OP_VN2VN:
+        proto_tree_add_item(fip_tree, hf_fip_vn2vn_subcode, tvb, 5, 1, ENC_BIG_ENDIAN);
+        break;
+    default:
+        proto_tree_add_item(fip_tree, hf_fip_hex_subcode, tvb, 5, 1, ENC_BIG_ENDIAN);
+        break;
+    }
+    proto_tree_add_item(fip_tree, hf_fip_dlen, tvb, 6, 2, ENC_BIG_ENDIAN);
+
+    proto_tree_add_bitmask(fip_tree, tvb, 8, hf_fip_flags,
+            ett_fip_flags, hf_fip_flags_fields, ENC_BIG_ENDIAN);
+
+    desc_offset = FIP_HEADER_LEN;
+    rlen *= FIP_BPW;
+    proto_tree_add_bytes_format(fip_tree, hf_fip_descriptors, tvb, desc_offset, rlen, NULL, "Descriptors");
+
+    while ((rlen > 0) && tvb_bytes_exist(tvb, desc_offset, 2)) {
+        dlen = tvb_get_guint8(tvb, desc_offset + 1) * FIP_BPW;
+        if (!dlen) {
+            proto_tree_add_expert(fip_tree, pinfo, &ei_fip_descriptors, tvb, desc_offset, -1);
+            break;
+        }
+        if (!tvb_bytes_exist(tvb, desc_offset, dlen) || dlen > rlen) {
+            break;
+        }
+        desc_tvb = tvb_new_subset_length_caplen(tvb, desc_offset, dlen, -1);
+        dtype = tvb_get_guint8(desc_tvb, 0);
+        desc_offset += dlen;
+        rlen -= dlen;
+
+        switch (dtype) {
+        case FIP_DT_PRI:
+            subtree = fip_desc_type_len(fip_tree, desc_tvb, dtype, ett_fip_dt_pri, &item);
+            proto_tree_add_item(subtree, hf_fip_desc_pri, desc_tvb,
+                    3, 1, ENC_BIG_ENDIAN);
+            proto_item_append_text(item, "%u", tvb_get_guint8(desc_tvb, 3));
+            break;
+        case FIP_DT_MAC:
+            subtree = fip_desc_type_len(fip_tree, desc_tvb, dtype, ett_fip_dt_mac, &item);
+            proto_tree_add_item(subtree, hf_fip_desc_mac, desc_tvb,
+                    2, 6, ENC_NA);
+            proto_item_append_text(item, "%s",
+                    tvb_bytes_to_str_punct(pinfo->pool, desc_tvb, 2, 6, ':'));
+            break;
+        case FIP_DT_MAP_OUI:
+            subtree = fip_desc_type_len(fip_tree, desc_tvb, dtype, ett_fip_dt_map, &item);
+            proto_tree_add_item(subtree, hf_fip_desc_map, desc_tvb,
+                    5, 3, ENC_NA);
+            proto_item_append_text(item, "%s", tvb_fc_to_str(pinfo->pool, desc_tvb, 5));
+            break;
+        case FIP_DT_NAME:
+            subtree = fip_desc_type_len(fip_tree, desc_tvb, dtype, ett_fip_dt_name, &item);
+            proto_tree_add_item(subtree, hf_fip_desc_name, desc_tvb, 4, 8, ENC_NA);
+            proto_item_append_text(item, "%s", tvb_fcwwn_to_str(pinfo->pool, desc_tvb, 4));
+            break;
+        case FIP_DT_FAB:
+            subtree = fip_desc_type_len(fip_tree, desc_tvb, dtype, ett_fip_dt_fab, &item);
+            proto_tree_add_item(subtree, hf_fip_desc_fab_vfid, desc_tvb,
+                    2, 2, ENC_BIG_ENDIAN);
+            proto_tree_add_item(subtree, hf_fip_desc_fab_map, desc_tvb,
+                    5, 3, ENC_NA);
+            proto_tree_add_item(subtree, hf_fip_desc_fab_name, desc_tvb, 8, 8, ENC_NA);
+            proto_item_append_text(item, "%s", tvb_fcwwn_to_str(pinfo->pool, desc_tvb, 8));
+            break;
+        case FIP_DT_FCOE_SIZE:
+            subtree = fip_desc_type_len(fip_tree, desc_tvb, dtype, ett_fip_dt_mdl, &item);
+            proto_tree_add_item(subtree, hf_fip_desc_fcoe_size, desc_tvb,
+                    2, 2, ENC_BIG_ENDIAN);
+            proto_item_append_text(item, "%u", tvb_get_ntohs(desc_tvb, 2));
+            break;
+        case FIP_DT_FLOGI:
+        case FIP_DT_FDISC:
+        case FIP_DT_LOGO:
+        case FIP_DT_ELP: {
+            tvbuff_t *ls_tvb;
+            fc_data_t fc_data = {ETHERTYPE_FIP, 0};
+
+            subtree = fip_desc_type_len(fip_tree, desc_tvb, dtype, ett_fip_dt_caps, &item);
+            ls_tvb = tvb_new_subset_length_caplen(desc_tvb, 4, dlen - 4, -1);
+            call_dissector_with_data(fc_handle, ls_tvb, pinfo, subtree, &fc_data);
+            proto_item_append_text(item, "%u bytes", dlen - 4);
+        }
+            break;
+        case FIP_DT_VN:
+            subtree = fip_desc_type_len(fip_tree, desc_tvb, dtype, ett_fip_dt_vn, &item);
+            proto_tree_add_item(subtree, hf_fip_desc_vn_mac, desc_tvb,
+                    2, 6, ENC_NA);
+            proto_tree_add_item(subtree, hf_fip_desc_vn_fid, desc_tvb,
+                    9, 3, ENC_BIG_ENDIAN);
+            proto_tree_add_item(subtree, hf_fip_desc_vn_wwpn,
+                    desc_tvb, 12, 8, ENC_NA);
+            proto_item_append_text(item, "MAC %s  FC_ID %6.6x",
+                    tvb_bytes_to_str_punct(pinfo->pool, desc_tvb, 2, 6, ':'),
+                    tvb_get_ntoh24(desc_tvb, 9));
+            break;
+        case FIP_DT_FKA:
+            subtree = fip_desc_type_len(fip_tree, desc_tvb, dtype, ett_fip_dt_fka, &item);
+            val = tvb_get_ntohl(desc_tvb, 4);
+            proto_tree_add_uint_format_value(subtree, hf_fip_desc_fka,
+                    desc_tvb, 4, 4, val, "%u ms", val);
+            proto_item_append_text(item, "%u ms", val);
+            break;
+        case FIP_DT_VEND:
+            subtree = fip_desc_type_len(fip_tree, desc_tvb, dtype, ett_fip_dt_vend, &item);
+            proto_tree_add_item(subtree, hf_fip_desc_vend, desc_tvb,
+                    4, 8, ENC_NA);
+            if (tvb_reported_length_remaining(desc_tvb, 9)) {
+                proto_tree_add_item(subtree, hf_fip_desc_vend_data,
+                     desc_tvb, 9, -1, ENC_NA);
+            }
+            break;
+        case FIP_DT_VLAN:
+            subtree = fip_desc_type_len(fip_tree, desc_tvb, dtype, ett_fip_dt_vlan, &item);
+            proto_tree_add_item(subtree, hf_fip_desc_vlan, desc_tvb,
+                    2, 2, ENC_BIG_ENDIAN);
+            proto_item_append_text(item, "%u", tvb_get_ntohs(desc_tvb, 2));
+            break;
+        case FIP_DT_FC4F:
+            subtree = fip_desc_type_len(fip_tree, desc_tvb, dtype, ett_fip_dt_fc4f, &item);
+            fip_desc_fc4f(desc_tvb, subtree, item);
+            break;
+        default:
+            subtree = fip_desc_type_len(fip_tree, desc_tvb, dtype, ett_fip_dt_unk, &item);
+            proto_tree_add_item(subtree, hf_fip_desc_unk, desc_tvb,
+                    2, -1, ENC_NA);
+            break;
+        }
+    }
+    return tvb_captured_length(tvb);
+}
+
+void
+proto_register_fip(void)
+{
+    /* Setup list of header fields  See Section 1.6.1 for details*/
+    static hf_register_info hf[] = {
+        /*
+         * FIP header fields.
+         */
+        { &hf_fip_ver,
+          { "Version", "fip.ver",
+            FT_UINT8, BASE_DEC, NULL, 0xf0,
+            NULL, HFILL}},
+
+        { &hf_fip_reserved12,
+          { "Reserved", "fip.reserved",
+            FT_UINT16, BASE_HEX, NULL, 0x0fff,
+            NULL, HFILL}},
+
+        { &hf_fip_op,
+          { "Opcode", "fip.opcode",
+            FT_UINT16, BASE_HEX, VALS(fip_opcodes), 0,
+            NULL, HFILL}},
+
+        { &hf_fip_reserved8,
+          { "Reserved", "fip.reserved",
+            FT_UINT8, BASE_HEX, NULL, 0x0,
+            NULL, HFILL}},
+
+        { &hf_fip_disc_subcode,
+          { "Discovery Subcode", "fip.disc_subcode",
+            FT_UINT8, BASE_HEX, VALS(fip_disc_subcodes), 0,
+            NULL, HFILL}},
+
+        { &hf_fip_ls_subcode,
+          { "Link Service Subcode", "fip.ls.subcode",
+            FT_UINT8, BASE_HEX, VALS(fip_ls_subcodes), 0,
+            NULL, HFILL}},
+
+        { &hf_fip_ctrl_subcode,
+          { "Control Subcode", "fip.ctrl_subcode",
+            FT_UINT8, BASE_HEX, VALS(fip_ctrl_subcodes), 0,
+            NULL, HFILL}},
+
+        { &hf_fip_vlan_subcode,
+          { "VLAN Subcode", "fip.vlan_subcode",
+            FT_UINT8, BASE_HEX, VALS(fip_vlan_subcodes), 0,
+            NULL, HFILL}},
+
+        { &hf_fip_vn2vn_subcode,
+          { "VN2VN Subcode", "fip.vn2vn_subcode",
+            FT_UINT8, BASE_HEX, VALS(fip_vn2vn_subcodes), 0,
+            NULL, HFILL}},
+
+        { &hf_fip_hex_subcode,
+          { "Unknown Subcode", "fip.subcode",
+            FT_UINT8, BASE_HEX, NULL, 0,
+            NULL, HFILL}},
+
+        { &hf_fip_dlen,
+          { "Length of Descriptors (words)", "fip.dl_len",
+            FT_UINT16, BASE_DEC, NULL, 0,
+            NULL, HFILL}},
+
+        { &hf_fip_flags,
+          { "Flags", "fip.flags",
+            FT_UINT16, BASE_HEX, NULL, 0,
+            NULL, HFILL}},
+
+        { &hf_fip_flag_fpma,
+          { "Fabric Provided MAC addr", "fip.flags.fpma",
+            FT_BOOLEAN, 16, NULL, FIP_FL_FPMA,
+            NULL, HFILL}},
+
+        { &hf_fip_flag_spma,
+          { "Server Provided MAC addr", "fip.flags.spma",
+            FT_BOOLEAN, 16, NULL, FIP_FL_SPMA,
+            NULL, HFILL}},
+
+        { &hf_fip_flag_rec_p2p,
+          { "REC/P2P", "fip.flags.rec_p2p",
+            FT_BOOLEAN, 16, NULL, FIP_FL_REC_P2P,
+            NULL, HFILL}},
+
+        { &hf_fip_flag_avail,
+          { "Available", "fip.flags.available",
+            FT_BOOLEAN, 16, NULL, FIP_FL_AVAIL,
+            NULL, HFILL}},
+
+        { &hf_fip_flag_sol,
+          { "Solicited", "fip.flags.sol",
+            FT_BOOLEAN, 16, NULL, FIP_FL_SOL,
+            NULL, HFILL}},
+
+        { &hf_fip_flag_fport,
+          { "F_Port", "fip.flags.fport",
+            FT_BOOLEAN, 16, NULL, FIP_FL_FPORT,
+            NULL, HFILL}},
+
+        { &hf_fip_desc_type,
+          { "Descriptor Type", "fip.desc_type",
+            FT_UINT8, BASE_HEX | BASE_EXT_STRING, &fip_desc_types_ext, 0,
+            NULL, HFILL}},
+
+        { &hf_fip_desc_len,
+          { "Descriptor Length (words)", "fip.desc_len",
+            FT_UINT8, BASE_DEC, NULL, 0,
+            NULL, HFILL}},
+
+        /*
+         * Various descriptor fields.
+         */
+        { &hf_fip_desc_pri,
+          { "Priority", "fip.pri",
+            FT_UINT8, BASE_DEC, NULL, 0,
+            NULL, HFILL}},
+
+        { &hf_fip_desc_mac,
+          { "MAC Address", "fip.mac",
+            FT_ETHER, BASE_NONE, NULL, 0,
+            NULL, HFILL}},
+
+        { &hf_fip_desc_map,
+          { "FC-MAP-OUI", "fip.map",
+            FT_BYTES, SEP_DOT, NULL, 0,
+            NULL, HFILL}},
+
+        { &hf_fip_desc_name,
+          { "Switch or Node Name", "fip.name",
+            FT_FCWWN, BASE_NONE, NULL, 0,
+            NULL, HFILL}},
+
+        { &hf_fip_desc_fab_vfid,
+          { "VFID", "fip.fab.vfid",
+            FT_UINT16, BASE_DEC, NULL, 0,
+            NULL, HFILL}},
+
+        { &hf_fip_desc_fab_map,
+          { "FC-MAP", "fip.fab.map",
+            FT_BYTES, SEP_DOT, NULL, 0,
+            NULL, HFILL}},
+
+        { &hf_fip_desc_fab_name,
+          { "Fabric Name", "fip.fab.name",
+            FT_FCWWN, BASE_NONE, NULL, 0,
+            NULL, HFILL}},
+
+        { &hf_fip_desc_fcoe_size,
+          { "Max FCoE frame size", "fip.fcoe_size",
+            FT_UINT16, BASE_DEC, NULL, 0,
+            NULL, HFILL}},
+
+        { &hf_fip_desc_vn_mac,
+          { "VN_Port MAC Address", "fip.vn.mac",
+            FT_ETHER, BASE_NONE, NULL, 0,
+            NULL, HFILL}},
+
+        { &hf_fip_desc_vn_fid,
+          { "VN_Port FC_ID", "fip.vn.fc_id",
+            FT_UINT32, BASE_HEX, NULL, 0,
+            NULL, HFILL}},
+
+        { &hf_fip_desc_vn_wwpn,
+          { "Port Name", "fip.vn.pwwn",
+            FT_FCWWN, BASE_NONE, NULL, 0,
+            NULL, HFILL}},
+
+        { &hf_fip_desc_fka,
+          { "FKA_ADV_Period", "fip.fka",
+            FT_UINT32, BASE_DEC, NULL, 0,
+            NULL, HFILL}},
+
+        { &hf_fip_desc_vend,
+          { "Vendor-ID", "fip.vendor",
+            FT_BYTES, BASE_NONE, NULL, 0,
+            NULL, HFILL}},
+
+        { &hf_fip_desc_vend_data,
+          { "Vendor-specific data", "fip.vendor.data",
+            FT_BYTES, BASE_NONE, NULL, 0,
+            NULL, HFILL}},
+
+        { &hf_fip_desc_vlan,
+          { "VLAN", "fip.vlan",
+            FT_UINT16, BASE_DEC, NULL, 0,
+            NULL, HFILL}},
+
+        { &hf_fip_desc_fc4f_types,
+          { "FC4 Types", "fip.fc4f.types",
+            FT_UINT32, BASE_HEX, NULL, 0,
+            NULL, HFILL}},
+
+        { &hf_fip_desc_fcp_feat,
+          { "FCP Features", "fip.fc4f.feat.fcp",
+            FT_UINT32, BASE_HEX, NULL, 0xf,
+            NULL, HFILL}},
+
+        { &hf_fip_type_ip,
+          { "IP", "fip.fc4f.ip",
+            FT_BOOLEAN, 32, NULL, 1 << 5,
+            NULL, HFILL}},
+
+        { &hf_fip_type_fcp,
+          { "FCP", "fip.fc4f.fcp",
+            FT_BOOLEAN, 32, NULL, 1 << 8,
+            NULL, HFILL}},
+
+        { &hf_fip_type_gs3,
+          { "GS3", "fip.fc4f.gs3",
+            FT_BOOLEAN, 32, NULL, 1 << 0,
+            NULL, HFILL}},
+
+        { &hf_fip_fcp_feat_t,
+          { "FCP Target", "fip.fc4f.feat.fcp.target",
+            FT_BOOLEAN, 32, NULL, 1,
+            NULL, HFILL}},
+
+        { &hf_fip_fcp_feat_i,
+          { "FCP Initiator", "fip.fc4f.feat.fcp.initiator",
+            FT_BOOLEAN, 32, NULL, 2,
+            NULL, HFILL}},
+
+        { &hf_fip_desc_unk,
+          { "Unknown Descriptor", "fip.desc_unk",
+            FT_BYTES, BASE_NONE, NULL, 0,
+            NULL, HFILL}},
+
+        { &hf_fip_descriptors,
+          { "Descriptors", "fip.descriptors",
+            FT_BYTES, BASE_NONE, NULL, 0,
+            NULL, HFILL}},
+
+    };
+    static gint *ett[] = {
+        &ett_fip,
+        &ett_fip_flags,
+        &ett_fip_dt_pri,
+        &ett_fip_dt_mac,
+        &ett_fip_dt_map,
+        &ett_fip_dt_name,
+        &ett_fip_dt_fab,
+        &ett_fip_dt_mdl,
+        &ett_fip_dt_caps,
+        &ett_fip_dt_vn,
+        &ett_fip_dt_fka,
+        &ett_fip_dt_vend,
+        &ett_fip_dt_vlan,
+        &ett_fip_dt_fc4f,
+        &ett_fip_dt_fc4f_types,
+        &ett_fip_dt_fcp_feat,
+        &ett_fip_dt_unk
+    };
+
+    static ei_register_info ei[] = {
+        { &ei_fip_descriptors, { "fip.descriptors.length_error", PI_MALFORMED, PI_ERROR, "Descriptor [length error]", EXPFILL }},
+    };
+
+    expert_module_t* expert_fip;
+
+    /* Register the protocol name and description */
+    proto_fip = proto_register_protocol("FCoE Initialization Protocol",
+        "FIP", "fip");
+    fip_handle = register_dissector("fip", dissect_fip, proto_fip);
+
+    /* Required function calls to register the header fields and
+     * subtrees used */
+    proto_register_field_array(proto_fip, hf, array_length(hf));
+    proto_register_subtree_array(ett, array_length(ett));
+    expert_fip = expert_register_protocol(proto_fip);
+    expert_register_field_array(expert_fip, ei, array_length(ei));
+}
+
+/*
+ * This function name is required because a script is used to find these
+ * routines and create the code that calls these routines.
+ */
+void
+proto_reg_handoff_fip(void)
+{
+    dissector_add_uint("ethertype", ETHERTYPE_FIP, fip_handle);
+    fc_handle = find_dissector_add_dependency("fc", proto_fip);
+}
+
+/*
+ * Editor modelines  -  https://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:
+ */