QSIG fully implemented
[obnox/wireshark/wip.git] / epan / dissectors / packet-fcp.c
index bf579c3c2c31ae8cbcbeed2d059f2728cf63fcef..e12e2ab708c8ea0b43d765bbb011c312e36fd651 100644 (file)
@@ -4,26 +4,20 @@
  *
  * $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.
 
 #include <glib.h>
 
-#ifdef NEED_SNPRINTF_H
-# include "snprintf.h"
-#endif
-
 #include <epan/prefs.h>
+#include <epan/emem.h>
 #include <epan/packet.h>
 #include <epan/conversation.h>
-#include "etypes.h"
+#include <epan/etypes.h>
+#include "packet-scsi.h"
 #include "packet-fc.h"
 #include "packet-fcp.h"
-#include "packet-scsi.h"
 
 /* Initialize the protocol and registered fields */
 static int proto_fcp         = -1;
@@ -70,502 +61,571 @@ static int hf_fcp_addlcdblen = -1;
 static int hf_fcp_rddata     = -1;
 static int hf_fcp_wrdata     = -1;
 static int hf_fcp_dl         = -1;
+static int hf_fcp_bidir_dl   = -1;
 static int hf_fcp_data_ro    = -1;
 static int hf_fcp_burstlen   = -1;
 static int hf_fcp_rspflags   = -1;
+static int hf_fcp_retry_delay_timer   = -1;
 static int hf_fcp_resid      = -1;
+static int hf_fcp_bidir_resid = -1;
 static int hf_fcp_snslen     = -1;
 static int hf_fcp_rsplen     = -1;
 static int hf_fcp_rspcode    = -1;
 static int hf_fcp_scsistatus = -1;
 static int hf_fcp_type = -1;
-
+static int hf_fcp_mgmt_flags_obsolete = -1;
+static int hf_fcp_mgmt_flags_clear_aca = -1;
+static int hf_fcp_mgmt_flags_target_reset = -1;
+static int hf_fcp_mgmt_flags_lu_reset = -1;
+static int hf_fcp_mgmt_flags_rsvd = -1;
+static int hf_fcp_mgmt_flags_clear_task_set = -1;
+static int hf_fcp_mgmt_flags_abort_task_set = -1;
+static int hf_fcp_rsp_flags_bidi = -1;
+static int hf_fcp_rsp_flags_bidi_rru = -1;
+static int hf_fcp_rsp_flags_bidi_rro = -1;
+static int hf_fcp_rsp_flags_conf_req = -1;
+static int hf_fcp_rsp_flags_resid_under = -1;
+static int hf_fcp_rsp_flags_resid_over = -1;
+static int hf_fcp_rsp_flags_sns_vld = -1;
+static int hf_fcp_rsp_flags_res_vld = -1;
+static int hf_fcp_request_in = -1;
+static int hf_fcp_response_in = -1;
+static int hf_fcp_time = -1;
 
 /* Initialize the subtree pointers */
 static gint ett_fcp = -1;
-static dissector_table_t fcp_dissector;
-static dissector_handle_t data_handle;
+static gint ett_fcp_taskmgmt = -1;
+static gint ett_fcp_rsp_flags = -1;
 
-typedef struct _fcp_conv_key {
-    guint32 conv_idx;
-} fcp_conv_key_t;
-
-typedef struct _fcp_conv_data {
-    guint32 fcp_dl;
-    gint32 fcp_lun;
-    guint32 abs_secs;
-    guint32 abs_usecs;
+typedef struct _fcp_conv_data_t {
+    emem_tree_t *luns;
 } fcp_conv_data_t;
 
-GHashTable *fcp_req_hash = NULL;
-GMemChunk *fcp_req_keys = NULL;
-GMemChunk *fcp_req_vals = NULL;
-guint32 fcp_init_count = 25;
-
-/*
- * Hash Functions
- */
-static gint
-fcp_equal(gconstpointer v, gconstpointer w)
-{
-  const fcp_conv_key_t *v1 = v;
-  const fcp_conv_key_t *v2 = w;
-
-  return (v1->conv_idx == v2->conv_idx);
-}
-
-static guint
-fcp_hash (gconstpointer v)
-{
-       const fcp_conv_key_t *key = v;
-       guint val;
-
-       val = key->conv_idx;
+static dissector_table_t fcp_dissector;
+static dissector_handle_t data_handle;
 
-       return val;
-}
+/* Information Categories based on lower 4 bits of R_CTL */
+#define FCP_IU_DATA              0x1
+#define FCP_IU_CONFIRM           0x3
+#define FCP_IU_XFER_RDY          0x5
+#define FCP_IU_CMD               0x6
+#define FCP_IU_RSP               0x7
+
+static const value_string fcp_iu_val[] = {
+    {FCP_IU_DATA      , "FCP_DATA"},
+    {FCP_IU_CONFIRM   , "Confirm"},
+    {FCP_IU_XFER_RDY  , "XFER_RDY"},
+    {FCP_IU_CMD       , "FCP_CMND"},
+    {FCP_IU_RSP       , "FCP_RSP"},
+    {0, NULL},
+};
+
+
+/* Task Attribute Values */
+static const value_string fcp_task_attr_val[] = {
+    {0, "Simple"},
+    {1, "Head of Queue"},
+    {2, "Ordered"},
+    {4, "ACA"},
+    {5, "Untagged"},
+    {0, NULL},
+};
+
+/* RSP Code Definitions (from FCP_RSP_INFO) */
+static const value_string fcp_rsp_code_val[] = {
+    {0, "Task Management Function Complete"},
+    {1, "FCP_DATA length Different from FCP_BURST_LEN"},
+    {2, "FCP_CMND Fields Invalid"},
+    {3, "FCP_DATA Parameter Mismatch With FCP_DATA_RO"},
+    {4, "Task Management Function Rejected"},
+    {5, "Task Management Function Failed"},
+    {9, "Task Management Function Incorrect LUN"},
+    {0, NULL},
+};
+
+
+
+static const true_false_string fcp_mgmt_flags_obsolete_tfs = {
+   "OBSOLETE BIT is SET",
+   "OBSOLETE BIT is NOT set",
+};
+static const true_false_string fcp_mgmt_flags_clear_aca_tfs = {
+   "CLEAR ACA is SET",
+   "Clear aca is NOT set",
+};
+static const true_false_string fcp_mgmt_flags_target_reset_tfs = {
+   "TARGET RESET is SET",
+   "Target reset is NOT set",
+};
+static const true_false_string fcp_mgmt_flags_lu_reset_tfs = {
+   "LU RESET is SET",
+   "Lu reset is NOT set",
+};
+static const true_false_string fcp_mgmt_flags_rsvd_tfs = {
+   "RSVD is SET",
+   "Rsvd is NOT set",
+};
+static const true_false_string fcp_mgmt_flags_clear_task_set_tfs = {
+   "CLEAR TASK SET is SET",
+   "Clear task set is NOT set",
+};
+static const true_false_string fcp_mgmt_flags_abort_task_set_tfs = {
+   "ABORT TASK SET is SET",
+   "Abort task set is NOT set",
+};
 
-/*
- * Protocol initialization
- */
 static void
-fcp_init_protocol(void)
+dissect_task_mgmt_flags (packet_info *pinfo, proto_tree *parent_tree, tvbuff_t *tvb, int offset)
 {
-    if (fcp_req_keys)
-        g_mem_chunk_destroy(fcp_req_keys);
-    if (fcp_req_vals)
-        g_mem_chunk_destroy(fcp_req_vals);
-    if (fcp_req_hash)
-        g_hash_table_destroy(fcp_req_hash);
-
-    fcp_req_hash = g_hash_table_new(fcp_hash, fcp_equal);
-    fcp_req_keys = g_mem_chunk_new("fcp_req_keys",
-                                   sizeof(fcp_conv_key_t),
-                                   fcp_init_count * sizeof(fcp_conv_key_t),
-                                   G_ALLOC_AND_FREE);
-    fcp_req_vals = g_mem_chunk_new("fcp_req_vals",
-                                   sizeof(fcp_conv_data_t),
-                                   fcp_init_count * sizeof(fcp_conv_data_t),
-                                   G_ALLOC_AND_FREE);
+       proto_item *item = NULL;
+       proto_tree *tree = NULL;
+
+       guint8 flags;
+
+       if(parent_tree) {
+               item = proto_tree_add_item(parent_tree, hf_fcp_taskmgmt, tvb, offset, 1, TRUE);
+               tree = proto_item_add_subtree(item, ett_fcp_taskmgmt);
+       }
+
+       flags = tvb_get_guint8 (tvb, offset);
+
+       if (!flags)
+               proto_item_append_text(item, " (No values set)");
+
+       proto_tree_add_boolean(tree, hf_fcp_mgmt_flags_obsolete, tvb, offset, 1, flags);
+       if (flags&0x80){
+               proto_item_append_text(item, "  OBSOLETE");
+               if(check_col(pinfo->cinfo, COL_INFO)){
+                       col_prepend_fence_fstr(pinfo->cinfo, COL_INFO, "[FCP OBSOLETE] ");
+               }
+       }
+       flags&=(~( 0x80 ));
+
+       proto_tree_add_boolean(tree, hf_fcp_mgmt_flags_clear_aca, tvb, offset, 1, flags);
+       if (flags&0x40){
+               proto_item_append_text(item, "  CLEAR ACA");
+               if(check_col(pinfo->cinfo, COL_INFO)){
+                       col_prepend_fence_fstr(pinfo->cinfo, COL_INFO, "[FCP CLEAR_ACA] ");
+               }
+       }
+       flags&=(~( 0x40 ));
+
+       proto_tree_add_boolean(tree, hf_fcp_mgmt_flags_target_reset, tvb, offset, 1, flags);
+       if (flags&0x20){
+               proto_item_append_text(item, "  TARGET RESET");
+               if(check_col(pinfo->cinfo, COL_INFO)){
+                       col_prepend_fence_fstr(pinfo->cinfo, COL_INFO, "[FCP TARGET_RESET] ");
+               }
+       }
+       flags&=(~( 0x20 ));
+
+       proto_tree_add_boolean(tree, hf_fcp_mgmt_flags_lu_reset, tvb, offset, 1, flags);
+       if (flags&0x10){
+               proto_item_append_text(item, "  LU RESET");
+               if(check_col(pinfo->cinfo, COL_INFO)){
+                       col_prepend_fence_fstr(pinfo->cinfo, COL_INFO, "[FCP LU_RESET] ");
+               }
+       }
+       flags&=(~( 0x10 ));
+
+       proto_tree_add_boolean(tree, hf_fcp_mgmt_flags_rsvd, tvb, offset, 1, flags);
+       if (flags&0x08){
+               proto_item_append_text(item, "  RSVD");
+               if(check_col(pinfo->cinfo, COL_INFO)){
+                       col_prepend_fence_fstr(pinfo->cinfo, COL_INFO, "[FCP RSVD] ");
+               }
+       }
+       flags&=(~( 0x08 ));
+
+       proto_tree_add_boolean(tree, hf_fcp_mgmt_flags_clear_task_set, tvb, offset, 1, flags);
+       if (flags&0x04){
+               proto_item_append_text(item, "  CLEAR TASK SET");
+               if(check_col(pinfo->cinfo, COL_INFO)){
+                       col_prepend_fence_fstr(pinfo->cinfo, COL_INFO, "[FCP CLEAR_TASK_SET] ");
+               }
+       }
+       flags&=(~( 0x04 ));
+
+       proto_tree_add_boolean(tree, hf_fcp_mgmt_flags_abort_task_set, tvb, offset, 1, flags);
+       if (flags&0x02){
+               proto_item_append_text(item, "  ABORT TASK SET");
+               if(check_col(pinfo->cinfo, COL_INFO)){
+                       col_prepend_fence_fstr(pinfo->cinfo, COL_INFO, "[FCP ABORT_TASK_SET] ");
+               }
+       }
+       flags&=(~( 0x02 ));
+
+       if(flags){
+               proto_item_append_text(item, " Unknown bitmap value 0x%x", flags);
+       }
 }
 
-static gchar *
-task_mgmt_flags_to_str (guint8 flags, gchar *str)
-{
-    int stroff = 0;
-    
-    if (str == NULL)
-        return str;
-
-    *str = '\0';
-    
-    if (flags & 0x80) {
-        strcpy (str, "Obsolete, ");
-        stroff += 10;
-    }
-
-    if (flags & 0x40) {
-        strcpy (&str[stroff], "Clear ACA, ");
-        stroff += 11;
-    }
-
-    if (flags & 0x20) {
-        strcpy (&str[stroff], "Target Reset, ");
-        stroff += 14;
-    }
-
-    if (flags & 0x10) {
-        strcpy (&str[stroff], "LU Reset, ");
-        stroff += 10;
-    }
-
-    if (flags & 0x08) {
-        strcpy (&str[stroff], "Rsvd, ");
-        stroff += 6;
-    }
+static const true_false_string fcp_rsp_flags_bidi_tfs = {
+   "Bidirectional residual fields are PRESENT",
+   "Bidirectional residual fields are NOT present",
+};
+static const true_false_string fcp_rsp_flags_bidi_rru_tfs = {
+   "Bidirectional residual underflow is PRESENT",
+   "Bidirectional residual underflow is NOT present",
+};
+static const true_false_string fcp_rsp_flags_bidi_rro_tfs = {
+   "Bidirectional residual overflow is PRESENT",
+   "Bidirectional residual overflow is NOT present",
+};
+static const true_false_string fcp_rsp_flags_conf_req_tfs = {
+   "CONF REQ is SET",
+   "Conf req set is NOT set",
+};
+static const true_false_string fcp_rsp_flags_resid_under_tfs = {
+   "RESID UNDER is SET",
+   "Resid under is NOT set",
+};
+static const true_false_string fcp_rsp_flags_resid_over_tfs = {
+   "RESID OVER is SET",
+   "Resid over is NOT set",
+};
+static const true_false_string fcp_rsp_flags_sns_vld_tfs = {
+   "SNS VLD is SET",
+   "Sns vld is NOT set",
+};
+static const true_false_string fcp_rsp_flags_res_vld_tfs = {
+   "RES VLD is SET",
+   "Res vld is NOT set",
+};
 
-    if (flags & 0x04) {
-        strcpy (&str[stroff], "Clear Task Set, ");
-        stroff += 16;
-    }
-
-    if (flags & 0x02) {
-        strcpy (&str[stroff], "Abort Task Set");
-        stroff += 14;
-    }
-
-    return (str);
-}
-
-static gchar *
-rspflags_to_str (guint8 flags, gchar *str)
+static void
+dissect_rsp_flags(proto_tree *parent_tree, tvbuff_t *tvb, int offset)
 {
-    int stroff = 0;
-
-    if (str == NULL)
-        return (str);
-
-    *str = '\0';
-    
-    if (flags & 0x10) {
-        strcpy (str, "FCP_CONF_REQ | ");
-        stroff += 15;
-    }
-    if (flags & 0x08) {
-        strcpy (&str[stroff], "FCP_RESID_UNDER | ");
-        stroff += 18;
-    }
-    if (flags & 0x04) {
-        strcpy (&str[stroff], "FCP_RESID_OVER | ");
-        stroff += 17;
-    }
-    if (flags & 0x02) {
-        strcpy (&str[stroff], "FCP_SNS_LEN_VLD | ");
-        stroff += 18;
-    }
-    if (flags & 0x01) {
-        strcpy (&str[stroff], "FCP_RSP_LEN_VLD | ");
-    }
-
-    return (str);
+       proto_item *item = NULL;
+       proto_tree *tree = NULL;
+       gboolean bidi_resid_present=FALSE;
+       guint8 flags;
+
+       if(parent_tree) {
+               item = proto_tree_add_item(parent_tree, hf_fcp_rspflags, tvb, offset, 1, TRUE);
+               tree = proto_item_add_subtree(item, ett_fcp_rsp_flags);
+       }
+
+       flags = tvb_get_guint8 (tvb, offset);
+
+       if (!flags)
+               proto_item_append_text(item, " (No values set)");
+
+       /* BIDI RSP */
+       proto_tree_add_boolean(tree, hf_fcp_rsp_flags_bidi, tvb, offset, 1, flags);
+       if (flags&0x80){
+               bidi_resid_present=TRUE;
+               proto_item_append_text(item, " BIDI_RSP");
+               if (flags & (~( 0x80 )))
+                       proto_item_append_text(item, ",");
+       }
+       flags&=(~( 0x80 ));
+
+       /* these two bits are only defined if the bidi bit is set */
+       if(bidi_resid_present){
+               /* BIDI READ RESID UNDER */
+               proto_tree_add_boolean(tree, hf_fcp_rsp_flags_bidi_rru, tvb, offset, 1, flags);
+               if (flags&0x40){
+                       proto_item_append_text(item, " BIDI_RRU");
+                       if (flags & (~( 0x40 )))
+                               proto_item_append_text(item, ",");
+               }
+               flags&=(~( 0x40 ));
+
+               /* BIDI READ RESID OVER */
+               proto_tree_add_boolean(tree, hf_fcp_rsp_flags_bidi_rro, tvb, offset, 1, flags);
+               if (flags&0x20){
+                       proto_item_append_text(item, " BIDI_RRO");
+                       if (flags & (~( 0x20 )))
+                               proto_item_append_text(item, ",");
+               }
+               flags&=(~( 0x20 ));
+       }
+
+       /* Conf Req */
+       proto_tree_add_boolean(tree, hf_fcp_rsp_flags_conf_req, tvb, offset, 1, flags);
+       if (flags&0x10){
+               proto_item_append_text(item, " CONF REQ");
+               if (flags & (~( 0x10 )))
+                       proto_item_append_text(item, ",");
+       }
+       flags&=(~( 0x10 ));
+
+       /* Resid Under */
+       proto_tree_add_boolean(tree, hf_fcp_rsp_flags_resid_under, tvb, offset, 1, flags);
+       if (flags&0x08){
+               proto_item_append_text(item, " RESID UNDER");
+               if (flags & (~( 0x08 )))
+                       proto_item_append_text(item, ",");
+       }
+       flags&=(~( 0x08 ));
+
+       /* Resid Over */
+       proto_tree_add_boolean(tree, hf_fcp_rsp_flags_resid_over, tvb, offset, 1, flags);
+       if (flags&0x04){
+               proto_item_append_text(item, " RESID OVER");
+               if (flags & (~( 0x04 )))
+                       proto_item_append_text(item, ",");
+       }
+       flags&=(~( 0x04 ));
+
+       /* SNS len valid */
+       proto_tree_add_boolean(tree, hf_fcp_rsp_flags_sns_vld, tvb, offset, 1, flags);
+       if (flags&0x02){
+               proto_item_append_text(item, " SNS VLD");
+               if (flags & (~( 0x02 )))
+                       proto_item_append_text(item, ",");
+       }
+       flags&=(~( 0x02 ));
+
+       /* rsp len valid */
+       proto_tree_add_boolean(tree, hf_fcp_rsp_flags_res_vld, tvb, offset, 1, flags);
+       if (flags&0x01){
+               proto_item_append_text(item, " RES VLD");
+               if (flags & (~( 0x01 )))
+                       proto_item_append_text(item, ",");
+       }
+       flags&=(~( 0x01 ));
+
+       if(flags){
+               proto_item_append_text(item, " Unknown bitmap value 0x%x", flags);
+       }
 }
 
-/* Code to actually dissect the packets */
 static void
-dissect_fcp_cmnd (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
+dissect_fcp_cmnd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, proto_tree *tree, conversation_t *conversation, fc_hdr *fchdr, fcp_conv_data_t *fcp_conv_data)
 {
     int offset = 0;
     int len,
         add_len = 0;
-    gchar str[128];
-    guint8 flags, lun0;
-    proto_item *ti;
-    proto_tree *fcp_tree = NULL;
-    conversation_t *conversation;
-    fcp_conv_data_t *cdata;
-    fcp_conv_key_t ckey, *req_key;
-    scsi_task_id_t task_key;
-    guint16 lun=0xffff;
+    guint8 flags, rwflags, lun0;
+        guint16 lun=0xffff;
+    tvbuff_t *cdb_tvb;
+    int tvb_len, tvb_rlen;
+    itl_nexus_t *itl=NULL;
 
     /* Determine the length of the FCP part of the packet */
     flags = tvb_get_guint8 (tvb, offset+10);
     if (flags) {
         add_len = tvb_get_guint8 (tvb, offset+11) & 0x7C;
         add_len = add_len >> 2;
-        
+
         len = FCP_DEF_CMND_LEN + add_len;
     }
     else {
         len = FCP_DEF_CMND_LEN;
     }
 
-    /* We track the conversation to determine how many bytes is required */
-    /* by the data that is sent back or sent next by the initiator as part */
-    /* of this command. The state is destroyed in the response dissector */
-    
-    conversation = find_conversation (pinfo->fd->num, &pinfo->src, &pinfo->dst,
-                                      pinfo->ptype, pinfo->oxid,
-                                      pinfo->rxid, NO_PORT2);
-    if (!conversation) {
-        conversation = conversation_new (pinfo->fd->num, &pinfo->src, &pinfo->dst,
-                                         pinfo->ptype, pinfo->oxid,
-                                         pinfo->rxid, NO_PORT2);
-    }
-    
-    ckey.conv_idx = conversation->index;
-    task_key.conv_id = conversation->index;
-    task_key.task_id = conversation->index;
-    pinfo->private_data = (void *)&task_key;
-    
-    cdata = (fcp_conv_data_t *)g_hash_table_lookup (fcp_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. 
-         */
-        cdata->fcp_dl = tvb_get_ntohl (tvb, offset+12+16+add_len);
-        cdata->abs_usecs = pinfo->fd->abs_usecs;
-        cdata->abs_secs = pinfo->fd->abs_secs;
-    }
-    else {
-        req_key = g_mem_chunk_alloc (fcp_req_keys);
-        req_key->conv_idx = conversation->index;
-        
-        cdata = g_mem_chunk_alloc (fcp_req_vals);
-        cdata->fcp_dl = tvb_get_ntohl (tvb, offset+12+16+add_len);
-        cdata->abs_usecs = pinfo->fd->abs_usecs;
-        cdata->abs_secs = pinfo->fd->abs_secs;
-        
-        g_hash_table_insert (fcp_req_hash, req_key, cdata);
-    }
-    
-    /* XXX this one is redundant  right?  ronnie
-    dissect_scsi_cdb (tvb, pinfo, fcp_tree, offset+12, 16+add_len,
-                      SCSI_DEV_UNKNOWN, lun);
-    */
+    proto_tree_add_uint_hidden(tree, hf_fcp_type, tvb, offset, 0, 0);
 
-    if (tree) {
-        ti = proto_tree_add_protocol_format (tree, proto_fcp, tvb, 0, len,
-                                             "FCP_CMND");
-        fcp_tree = proto_item_add_subtree (ti, ett_fcp);
-    }    
-    proto_tree_add_uint_hidden (fcp_tree, hf_fcp_type, tvb, offset, 0, 0);
-    
     lun0 = tvb_get_guint8 (tvb, offset);
-    
+
     /* Display single-level LUNs in decimal for clarity */
     /* I'm taking a shortcut here by assuming that if the first byte of the
      * LUN field is 0, it is a single-level LUN. This is not true. For a
      * real single-level LUN, all 8 bytes except byte 1 must be 0.
      */
     if (lun0) {
-      cdata->fcp_lun = -1;
-      proto_tree_add_item (fcp_tree, hf_fcp_multilun, tvb, offset, 8, 0);
+      proto_tree_add_item(tree, hf_fcp_multilun, tvb, offset, 8, 0);
       lun=tvb_get_guint8(tvb, offset)&0x3f;
       lun<<=8;
       lun|=tvb_get_guint8(tvb, offset+1);
-    }
-    else {
-      cdata->fcp_lun = tvb_get_guint8 (tvb, offset+1);
-      proto_tree_add_item (fcp_tree, hf_fcp_singlelun, tvb, offset+1,
+    } else {
+      proto_tree_add_item(tree, hf_fcp_singlelun, tvb, offset+1,
                           1, 0);
       lun=tvb_get_guint8(tvb, offset+1);
     }
 
-    proto_tree_add_item (fcp_tree, hf_fcp_crn, tvb, offset+8, 1, 0);
-    proto_tree_add_item (fcp_tree, hf_fcp_taskattr, tvb, offset+9, 1, 0);
-    proto_tree_add_uint_format (fcp_tree, hf_fcp_taskmgmt, tvb, offset+10,
-                               1, flags,
-                               "Task Management Flags: 0x%x (%s)",
-                               flags,
-                               task_mgmt_flags_to_str (flags, str));
-    proto_tree_add_item (fcp_tree, hf_fcp_addlcdblen, tvb, offset+11, 1, 0);
-    proto_tree_add_item (fcp_tree, hf_fcp_rddata, tvb, offset+11, 1, 0);
-    proto_tree_add_item (fcp_tree, hf_fcp_wrdata, tvb, offset+11, 1, 0);
-    dissect_scsi_cdb (tvb, pinfo, tree, offset+12, 16+add_len,
-                     SCSI_DEV_UNKNOWN, lun);
-    proto_tree_add_item (fcp_tree, hf_fcp_dl, tvb, offset+12+16+add_len,
+    if (fchdr->itlq)
+        fchdr->itlq->lun=lun;
+
+    itl=(itl_nexus_t *)se_tree_lookup32(fcp_conv_data->luns, lun);
+    if(!itl){
+        itl=se_alloc(sizeof(itl_nexus_t));
+        itl->cmdset=0xff;
+       itl->conversation=conversation;
+        se_tree_insert32(fcp_conv_data->luns, lun, itl);
+    }
+
+    proto_tree_add_item(tree, hf_fcp_crn, tvb, offset+8, 1, 0);
+    proto_tree_add_item(tree, hf_fcp_taskattr, tvb, offset+9, 1, 0);
+    dissect_task_mgmt_flags(pinfo, tree, tvb, offset+10);
+    proto_tree_add_item(tree, hf_fcp_addlcdblen, tvb, offset+11, 1, 0);
+    rwflags=tvb_get_guint8(tvb, offset+11);
+    if(fchdr->itlq){
+       if(rwflags&0x02){
+           fchdr->itlq->task_flags|=SCSI_DATA_READ;
+       }
+       if(rwflags&0x01){
+           fchdr->itlq->task_flags|=SCSI_DATA_WRITE;
+       }
+    }
+    proto_tree_add_item(tree, hf_fcp_rddata, tvb, offset+11, 1, 0);
+    proto_tree_add_item(tree, hf_fcp_wrdata, tvb, offset+11, 1, 0);
+
+    tvb_len=tvb_length_remaining(tvb, offset+12);
+    if(tvb_len>(16+add_len))
+      tvb_len=16+add_len;
+    tvb_rlen=tvb_reported_length_remaining(tvb, offset+12);
+    if(tvb_rlen>(16+add_len))
+      tvb_rlen=16+add_len;
+    cdb_tvb=tvb_new_subset(tvb, offset+12, tvb_len, tvb_rlen);
+    dissect_scsi_cdb(cdb_tvb, pinfo, parent_tree, SCSI_DEV_UNKNOWN, fchdr->itlq, itl);
+
+    proto_tree_add_item(tree, hf_fcp_dl, tvb, offset+12+16+add_len,
                         4, 0);
+    if(fchdr->itlq){
+       fchdr->itlq->data_length=tvb_get_ntohl(tvb, offset+12+16+add_len);
+    }
+
+    if( ((rwflags&0x03)==0x03)
+    &&  tvb_length_remaining(tvb, offset+12+16+add_len+4)>=4){
+       proto_tree_add_item(tree, hf_fcp_bidir_dl, tvb, offset+12+16+add_len+4,
+                        4, 0);
+       if(fchdr->itlq){
+           fchdr->itlq->bidir_data_length=tvb_get_ntohl(tvb, offset+12+16+add_len+4);
+       }
+
+    }
+
 }
 
 static void
-dissect_fcp_data (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
+dissect_fcp_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, conversation_t *conversation _U_, fc_hdr *fchdr, itl_nexus_t *itl)
 {
-    conversation_t *conversation;
-    fcp_conv_data_t *cdata = NULL;
-    fcp_conv_key_t ckey;
-    proto_item *ti;
-    proto_tree *fcp_tree;
-    scsi_task_id_t task_key;
-
-    /* Retrieve conversation state to determine expected payload */
-    conversation = find_conversation (pinfo->fd->num, &pinfo->src, &pinfo->dst,
-                                      pinfo->ptype, pinfo->oxid,
-                                      pinfo->rxid, NO_PORT2);
-    if (conversation) {
-        ckey.conv_idx = conversation->index;
-    
-        cdata = (fcp_conv_data_t *)g_hash_table_lookup (fcp_req_hash,
-                                                        &ckey);
-        task_key.conv_id = conversation->index;
-        task_key.task_id = conversation->index;
-        pinfo->private_data = (void *)&task_key;
-    }
-    else {
-        pinfo->private_data = NULL;
-    }
-    if (cdata) {
-        ti = proto_tree_add_protocol_format (tree, proto_fcp, tvb, 0, 0,
-                                             "FCP_DATA");
-        fcp_tree = proto_item_add_subtree (ti, ett_fcp);
+    dissect_scsi_payload(tvb, pinfo, parent_tree, FALSE, fchdr->itlq, itl, fchdr->relative_offset);
+}
 
-        if (cdata->fcp_lun >= 0)
-            proto_tree_add_uint_hidden (fcp_tree, hf_fcp_singlelun, tvb,
-                                        0, 0, cdata->fcp_lun);
+/* fcp-3  9.5 table 24 */
+static void
+dissect_fcp_rspinfo(tvbuff_t *tvb, proto_tree *tree, int offset)
+{
+       /* 2 reserved bytes */
+       offset+=2;
 
-        dissect_scsi_payload (tvb, pinfo, tree, 0, FALSE, cdata->fcp_dl, cdata->fcp_lun);
-    }
-    else {
-        dissect_scsi_payload (tvb, pinfo, tree, 0, FALSE, 0, 0xffff);
-    }
+        /* rsp code */
+       proto_tree_add_item(tree, hf_fcp_rspcode, tvb, offset, 1, 0);
+       offset++;
+
+        /* 4 reserved bytes */
+       offset+=4;
 }
 
 static void
-dissect_fcp_rsp (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
+dissect_fcp_rsp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, proto_tree *tree, conversation_t *conversation _U_, fc_hdr *fchdr, itl_nexus_t *itl)
 {
-    guint32 offset = 0,
-        del_usecs = 0;
-    guint len = 0,
-          add_len = 0,
-          rsplen = 0;
-    gchar str[128];
+    guint32 offset = 0;
+    gint32 snslen = 0,
+           rsplen = 0;
     guint8 flags;
-    proto_item *ti;
-    proto_tree *fcp_tree;
     guint8 status;
-    conversation_t *conversation;
-    fcp_conv_data_t *cdata = NULL;
-    fcp_conv_key_t ckey;
-    scsi_task_id_t task_key;
 
     status = tvb_get_guint8 (tvb, offset+11);
-    
+
     if (check_col (pinfo->cinfo, COL_INFO)) {
-        col_append_fstr (pinfo->cinfo, COL_INFO, " , %s",
+        col_append_fstr (pinfo->cinfo, COL_INFO, ":%s",
                          val_to_str (status, scsi_status_val, "0x%x"));
     }
 
-    /* Response marks the end of the conversation. So destroy state */
-    conversation = find_conversation (pinfo->fd->num, &pinfo->src, &pinfo->dst,
-                                      pinfo->ptype, pinfo->oxid,
-                                      pinfo->rxid, NO_PORT2);
-    if (conversation) {
-        ckey.conv_idx = conversation->index;
-    
-        cdata = (fcp_conv_data_t *)g_hash_table_lookup (fcp_req_hash,
-                                                        &ckey);
-        task_key.conv_id = task_key.task_id = conversation->index;
-        pinfo->private_data = (void *)&task_key;
-    }
-    
-    if (tree) {
-        /* Determine the length of the FCP part of the packet */
-        len = FCP_DEF_RSP_LEN;
+    proto_tree_add_uint_hidden(tree, hf_fcp_type, tvb, offset, 0, 0);
+
+
+        /* 8 reserved bytes */
+        offset+=8;
 
-        flags = tvb_get_guint8 (tvb, offset+10);
+        /* retry delay timer */
+        proto_tree_add_item(tree, hf_fcp_retry_delay_timer, tvb, offset, 2, 0);
+        offset+=2;
+
+        /* flags */
+        flags = tvb_get_guint8 (tvb, offset);
+        dissect_rsp_flags(tree, tvb, offset);
+        offset++;
+
+        /* scsi status code */
+        proto_tree_add_item(tree, hf_fcp_scsistatus, tvb, offset, 1, 0);
+        dissect_scsi_rsp(tvb, pinfo, parent_tree, fchdr->itlq, itl, tvb_get_guint8(tvb, offset));
+        offset++;
+
+        /* residual count */
+        if(flags & 0x0e){
+            proto_tree_add_item(tree, hf_fcp_resid, tvb, offset, 4, 0);
+        }
+        offset+=4;
+
+        /* sense length */
         if (flags & 0x2) {
-            add_len = tvb_get_ntohl (tvb, offset+20);
-            len += add_len;
+            snslen=tvb_get_ntohl(tvb, offset);
+            proto_tree_add_uint(tree, hf_fcp_snslen, tvb, offset, 4,
+                                 snslen);
         }
+        offset+=4;
+
+        /* response length */
         if (flags & 0x1) {
-            add_len = tvb_get_ntohl (tvb, offset+16);
-            len += add_len;
+            rsplen=tvb_get_ntohl(tvb, offset);
+            proto_tree_add_uint(tree, hf_fcp_rsplen, tvb, offset, 4,
+                                 rsplen);
         }
+        offset+=4;
 
-        ti = proto_tree_add_protocol_format (tree, proto_fcp, tvb, 0, len,
-                                             "FCP_RSP");
-        fcp_tree = proto_item_add_subtree (ti, ett_fcp);
-        proto_tree_add_uint_hidden (fcp_tree, hf_fcp_type, tvb, offset, 0, 0);
-
-        if (cdata) {
-            del_usecs = (pinfo->fd->abs_secs - cdata->abs_secs)* 1000000 +
-                (pinfo->fd->abs_usecs - cdata->abs_usecs);
-            if (del_usecs > 1000)
-                proto_tree_add_text (fcp_tree, tvb, offset, 0,
-                                     "Cmd Response Time: %d msecs",
-                                     del_usecs/1000);
-            else
-                proto_tree_add_text (fcp_tree, tvb, offset, 0,
-                                     "Cmd Response Time: %d usecs",
-                                     del_usecs);
-            if (cdata->fcp_lun >= 0)
-                proto_tree_add_uint_hidden (fcp_tree, hf_fcp_singlelun, tvb,
-                                            offset, 0, cdata->fcp_lun);
-        }
-        proto_tree_add_uint_format (fcp_tree, hf_fcp_rspflags, tvb, offset+10,
-                                    1, flags, "Flags: 0x%02x (%s)", flags,
-                                    rspflags_to_str (flags, str));
-        proto_tree_add_item (fcp_tree, hf_fcp_scsistatus, tvb, offset+11, 1, 0);
-        if (flags & 0xC)
-            proto_tree_add_item (fcp_tree, hf_fcp_resid, tvb, offset+12, 4, 0);
-        if (flags & 0x2)
-            proto_tree_add_item (fcp_tree, hf_fcp_snslen, tvb, offset+16, 4, 0);
-        if (flags & 0x1) {
-            rsplen = tvb_get_ntohl (tvb, offset+20);
-            proto_tree_add_item (fcp_tree, hf_fcp_rsplen, tvb, offset+20, 4, 0);
-            proto_tree_add_item (fcp_tree, hf_fcp_rspcode, tvb, offset+27, 1,
-                                 0);
+        /* rsp_info */
+        if(rsplen){
+            tvbuff_t *rspinfo_tvb;
+
+            rspinfo_tvb=tvb_new_subset(tvb, offset, MIN(rsplen, tvb_length_remaining(tvb, offset)), rsplen);
+            dissect_fcp_rspinfo(tvb, tree, 0);
+
+            offset+=rsplen;
         }
-        if (flags & 0x2) {
-            dissect_scsi_snsinfo (tvb, pinfo, tree, offset+24+rsplen,
-                                  tvb_get_ntohl (tvb, offset+16), 
-                                 cdata?cdata->fcp_lun:0xffff);
+
+        /* sense info */
+        if(snslen){
+            tvbuff_t *sns_tvb;
+
+            sns_tvb=tvb_new_subset(tvb, offset, MIN(snslen, tvb_length_remaining(tvb, offset)), snslen);
+            dissect_scsi_snsinfo (sns_tvb, pinfo, parent_tree, 0,
+                                  snslen,
+                                 fchdr->itlq, itl);
+
+            offset+=snslen;
         }
-        if (cdata) {
-            g_mem_chunk_free (fcp_req_vals, cdata);
-            g_hash_table_remove (fcp_req_hash, &ckey);
+
+        /* bidir read resid (only present for bidirectional responses) */
+        if(flags&0x80){
+            if(flags&0x60){
+                proto_tree_add_item(tree, hf_fcp_bidir_resid, tvb, offset, 4, 0);
+            }
+            offset+=4;
         }
-    }
 }
 
 static void
-dissect_fcp_xfer_rdy (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
+dissect_fcp_xfer_rdy(tvbuff_t *tvb, proto_tree *tree)
 {
     int offset = 0;
-    proto_item *ti;
-    proto_tree *fcp_tree;
-    guint del_usecs;
-
-    conversation_t *conversation;
-    fcp_conv_data_t *cdata = NULL;
-    fcp_conv_key_t ckey, *req_key;
-
-    /* Retrieve conversation state to determine expected payload */
-    conversation = find_conversation (pinfo->fd->num, &pinfo->src, &pinfo->dst,
-                                      pinfo->ptype, pinfo->oxid,
-                                      pinfo->rxid, NO_PORT2);
-    if (!conversation) {
-        conversation = conversation_new (pinfo->fd->num, &pinfo->src, &pinfo->dst,
-                                         pinfo->ptype, pinfo->oxid,
-                                         pinfo->rxid, NO_PORT2);
-    }
-    
-    if (conversation) {
-        ckey.conv_idx = conversation->index;
-    
-        cdata = (fcp_conv_data_t *)g_hash_table_lookup (fcp_req_hash,
-                                                        &ckey);
-        if (cdata != NULL) {
-            cdata->fcp_dl = tvb_get_ntohl (tvb, offset+4);
-        }
-        else {
-            req_key = g_mem_chunk_alloc (fcp_req_keys);
-            req_key->conv_idx = conversation->index;
-            
-            cdata = g_mem_chunk_alloc (fcp_req_vals);
-            cdata->fcp_dl = tvb_get_ntohl (tvb, offset+4);
-            cdata->fcp_lun = -1;
-            
-            g_hash_table_insert (fcp_req_hash, req_key, cdata);
-        }
-    }
 
-    if (tree) {
-        ti = proto_tree_add_protocol_format (tree, proto_fcp, tvb, 0, 12,
-                                             "FCP_XFER_RDY");
-        fcp_tree = proto_item_add_subtree (ti, ett_fcp);
-        proto_tree_add_uint_hidden (fcp_tree, hf_fcp_type, tvb, offset, 0, 0);
-
-        if (cdata) {
-            del_usecs = (pinfo->fd->abs_secs - cdata->abs_secs)* 1000000 +
-                (pinfo->fd->abs_usecs - cdata->abs_usecs);
-            if (del_usecs > 1000)
-                proto_tree_add_text (fcp_tree, tvb, offset, 0,
-                                     "Cmd Response Time: %d msecs",
-                                     del_usecs/1000);
-            else
-                proto_tree_add_text (fcp_tree, tvb, offset, 0,
-                                     "Cmd Response Time: %d usecs",
-                                     del_usecs);
-            if (cdata->fcp_lun >= 0)
-                proto_tree_add_uint_hidden (fcp_tree, hf_fcp_singlelun, tvb,
-                                            offset, 0, cdata->fcp_lun);
-        }
-        proto_tree_add_item (fcp_tree, hf_fcp_data_ro, tvb, offset, 4, 0);
-        proto_tree_add_item (fcp_tree, hf_fcp_burstlen, tvb, offset+4, 4, 0);
-    }
+
+    proto_tree_add_uint_hidden(tree, hf_fcp_type, tvb, offset, 0, 0);
+
+    proto_tree_add_item(tree, hf_fcp_data_ro, tvb, offset, 4, 0);
+    proto_tree_add_item(tree, hf_fcp_burstlen, tvb, offset+4, 4, 0);
 }
 
 static void
-dissect_fcp (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
+dissect_fcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-
-/* Set up structures needed to add the protocol subtree and manage it */
+    proto_item *ti=NULL;
+    proto_tree *fcp_tree = NULL;
+    fc_hdr *fchdr;
     guint8 r_ctl;
+    fcp_conv_data_t *fcp_conv_data=NULL;
+    itl_nexus_t *itl=NULL;
+
+    fchdr=(fc_hdr *)pinfo->private_data;
 
     /* Make entries in Protocol column and Info column on summary display */
-    if (check_col(pinfo->cinfo, COL_PROTOCOL)) 
+    if (check_col(pinfo->cinfo, COL_PROTOCOL))
         col_set_str(pinfo->cinfo, COL_PROTOCOL, "FCP");
 
     r_ctl = pinfo->r_ctl;
@@ -576,30 +636,73 @@ dissect_fcp (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
         col_set_str (pinfo->cinfo, COL_INFO, val_to_str (r_ctl, fcp_iu_val,
                                                       "0x%x"));
     }
-    
+
+
+    if (tree) {
+        ti = proto_tree_add_protocol_format(tree, proto_fcp, tvb, 0, -1,
+                                             "FCP: %s", val_to_str(r_ctl, fcp_iu_val, "Unknown 0x%02x"));
+        fcp_tree = proto_item_add_subtree(ti, ett_fcp);
+    }
+
+
+    fcp_conv_data=conversation_get_proto_data(fchdr->conversation, proto_fcp);
+    if(!fcp_conv_data){
+        fcp_conv_data=se_alloc(sizeof(fcp_conv_data_t));
+        fcp_conv_data->luns=se_tree_create_non_persistent(EMEM_TREE_TYPE_RED_BLACK, "FCP Luns");
+        conversation_add_proto_data(fchdr->conversation, proto_fcp, fcp_conv_data);
+    }
+
+    if(r_ctl!=FCP_IU_CMD){
+        itl=(itl_nexus_t *)se_tree_lookup32(fcp_conv_data->luns, fchdr->itlq->lun);
+    }
+
+    /* put a request_in in all frames except the command frame */
+    if((r_ctl!=FCP_IU_CMD)&&(fchdr->itlq->first_exchange_frame)){
+        proto_item *it;
+        it=proto_tree_add_uint(fcp_tree, hf_fcp_singlelun, tvb, 0, 0, fchdr->itlq->lun);
+        PROTO_ITEM_SET_GENERATED(it);
+        it=proto_tree_add_uint(fcp_tree, hf_fcp_request_in, tvb, 0, 0, fchdr->itlq->first_exchange_frame);
+        PROTO_ITEM_SET_GENERATED(it);
+        /* only put the response time in the actual response frame */
+        if(r_ctl==FCP_IU_RSP){
+            nstime_t delta_ts;
+            nstime_delta(&delta_ts, &pinfo->fd->abs_ts, &fchdr->itlq->fc_time);
+            it=proto_tree_add_time(ti, hf_fcp_time, tvb, 0, 0, &delta_ts);
+            PROTO_ITEM_SET_GENERATED(it);
+        }
+    }
+    /* put a response_in in all frames except the response frame */
+    if((r_ctl!=FCP_IU_RSP)&&(fchdr->itlq->last_exchange_frame)){
+        proto_item *it;
+        it=proto_tree_add_uint(fcp_tree, hf_fcp_response_in, tvb, 0, 0, fchdr->itlq->last_exchange_frame);
+        PROTO_ITEM_SET_GENERATED(it);
+    }
+
     switch (r_ctl) {
     case FCP_IU_DATA:
-        dissect_fcp_data (tvb, pinfo, tree);
+        dissect_fcp_data(tvb, pinfo, tree, fchdr->conversation, fchdr, itl);
         break;
     case FCP_IU_CONFIRM:
         /* Nothing to be done here */
         break;
     case FCP_IU_XFER_RDY:
-        dissect_fcp_xfer_rdy (tvb, pinfo, tree);
+        dissect_fcp_xfer_rdy(tvb, fcp_tree);
         break;
     case FCP_IU_CMD:
-        dissect_fcp_cmnd (tvb, pinfo, tree);
+        dissect_fcp_cmnd(tvb, pinfo, tree, fcp_tree, fchdr->conversation, fchdr, fcp_conv_data);
         break;
     case FCP_IU_RSP:
-        dissect_fcp_rsp (tvb, pinfo, tree);
+        dissect_fcp_rsp(tvb, pinfo, tree, fcp_tree, fchdr->conversation, fchdr, itl);
         break;
     default:
-        call_dissector (data_handle, tvb, pinfo, tree);
+        call_dissector(data_handle, tvb, pinfo, tree);
         break;
     }
+/*xxx once the subdissectors return bytes consumed:  proto_item_set_end(ti, tvb, offset);*/
+
 }
 
-/* Register the protocol with Ethereal */
+/* Register the protocol with Wireshark */
 
 /* this format is require because a script is used to build the C function
    that calls all the protocol registration.
@@ -607,7 +710,7 @@ dissect_fcp (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
 void
 proto_register_fcp (void)
-{                 
+{
 
     /* Setup list of header fields  See Section 1.6.1 for details*/
     static hf_register_info hf[] = {
@@ -618,7 +721,7 @@ proto_register_fcp (void)
          {"Multi-Level LUN", "fcp.multilun", FT_BYTES, BASE_HEX, NULL, 0x0,
           "", HFILL}},
         { &hf_fcp_singlelun,
-          {"LUN", "fcp.lun", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL}},
+          {"LUN", "fcp.lun", FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL}},
         { &hf_fcp_crn,
           {"Command Ref Num", "fcp.crn", FT_UINT8, BASE_DEC, NULL, 0x0, "",
            HFILL}},
@@ -637,18 +740,26 @@ proto_register_fcp (void)
           {"WRDATA", "fcp.wrdata", FT_BOOLEAN, 8, NULL, 0x01, "", HFILL}},
         { &hf_fcp_dl,
           {"FCP_DL", "fcp.dl", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL}},
+        { &hf_fcp_bidir_dl,
+          {"FCP_BIDIRECTIONAL_READ_DL", "fcp.bidir_dl", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL}},
         { &hf_fcp_data_ro,
           {"FCP_DATA_RO", "fcp.data_ro", FT_UINT32, BASE_DEC, NULL, 0x0, "",
            HFILL}},
         { &hf_fcp_burstlen,
           {"Burst Length", "fcp.burstlen", FT_UINT32, BASE_DEC, NULL, 0x0, "",
            HFILL}},
+        { &hf_fcp_retry_delay_timer,
+          {"Retry Delay Timer", "fcp.rsp.retry_delay_timer", FT_UINT16, BASE_DEC, NULL, 0x0, "",
+           HFILL}},
         { &hf_fcp_rspflags,
           {"FCP_RSP Flags", "fcp.rspflags", FT_UINT8, BASE_HEX, NULL, 0x0, "",
            HFILL}},
         { &hf_fcp_resid,
           {"FCP_RESID", "fcp.resid", FT_UINT32, BASE_DEC, NULL, 0x0, "",
            HFILL}},
+        { &hf_fcp_bidir_resid,
+          {"Bidirectional Read Resid", "fcp.bidir_resid", FT_UINT32, BASE_DEC, NULL, 0x0, "",
+           HFILL}},
         { &hf_fcp_snslen,
           {"FCP_SNS_LEN", "fcp.snslen", FT_UINT32, BASE_DEC, NULL, 0x0, "",
            HFILL}},
@@ -661,11 +772,52 @@ proto_register_fcp (void)
         { &hf_fcp_scsistatus,
           {"SCSI Status", "fcp.status", FT_UINT8, BASE_HEX,
            VALS (scsi_status_val), 0x0, "", HFILL}},
+       { &hf_fcp_mgmt_flags_obsolete,
+         { "Obsolete", "fcp.mgmt.flags.obsolete", FT_BOOLEAN, 8, TFS(&fcp_mgmt_flags_obsolete_tfs), 0x80, "", HFILL }},
+       { &hf_fcp_mgmt_flags_clear_aca,
+         { "Clear ACA", "fcp.mgmt.flags.clear_aca", FT_BOOLEAN, 8, TFS(&fcp_mgmt_flags_clear_aca_tfs), 0x40, "", HFILL }},
+       { &hf_fcp_mgmt_flags_target_reset,
+         { "Target Reset", "fcp.mgmt.flags.target_reset", FT_BOOLEAN, 8, TFS(&fcp_mgmt_flags_target_reset_tfs), 0x20, "", HFILL }},
+       { &hf_fcp_mgmt_flags_lu_reset,
+         { "LU Reset", "fcp.mgmt.flags.lu_reset", FT_BOOLEAN, 8, TFS(&fcp_mgmt_flags_lu_reset_tfs), 0x10, "", HFILL }},
+       { &hf_fcp_mgmt_flags_rsvd,
+         { "Rsvd", "fcp.mgmt.flags.rsvd", FT_BOOLEAN, 8, TFS(&fcp_mgmt_flags_rsvd_tfs), 0x08, "", HFILL }},
+       { &hf_fcp_mgmt_flags_clear_task_set,
+         { "Clear Task Set", "fcp.mgmt.flags.clear_task_set", FT_BOOLEAN, 8, TFS(&fcp_mgmt_flags_clear_task_set_tfs), 0x04, "", HFILL }},
+       { &hf_fcp_mgmt_flags_abort_task_set,
+         { "Abort Task Set", "fcp.mgmt.flags.abort_task_set", FT_BOOLEAN, 8, TFS(&fcp_mgmt_flags_abort_task_set_tfs), 0x02, "", HFILL }},
+       { &hf_fcp_rsp_flags_bidi,
+         { "Bidi Rsp", "fcp.rsp.flags.bidi", FT_BOOLEAN, 8, TFS(&fcp_rsp_flags_bidi_tfs), 0x80, "", HFILL }},
+       { &hf_fcp_rsp_flags_bidi_rru,
+         { "Bidi Read Resid Under", "fcp.rsp.flags.bidi_rru", FT_BOOLEAN, 8, TFS(&fcp_rsp_flags_bidi_rru_tfs), 0x40, "", HFILL }},
+       { &hf_fcp_rsp_flags_bidi_rro,
+         { "Bidi Read Resid Over", "fcp.rsp.flags.bidi_rro", FT_BOOLEAN, 8, TFS(&fcp_rsp_flags_bidi_rro_tfs), 0x20, "", HFILL }},
+       { &hf_fcp_rsp_flags_conf_req,
+         { "Conf Req", "fcp.rsp.flags.conf_req", FT_BOOLEAN, 8, TFS(&fcp_rsp_flags_conf_req_tfs), 0x10, "", HFILL }},
+       { &hf_fcp_rsp_flags_resid_under,
+         { "Resid Under", "fcp.rsp.flags.resid_under", FT_BOOLEAN, 8, TFS(&fcp_rsp_flags_resid_under_tfs), 0x08, "", HFILL }},
+       { &hf_fcp_rsp_flags_resid_over,
+         { "Resid Over", "fcp.rsp.flags.resid_over", FT_BOOLEAN, 8, TFS(&fcp_rsp_flags_resid_over_tfs), 0x04, "", HFILL }},
+       { &hf_fcp_rsp_flags_sns_vld,
+         { "SNS Vld", "fcp.rsp.flags.sns_vld", FT_BOOLEAN, 8, TFS(&fcp_rsp_flags_sns_vld_tfs), 0x02, "", HFILL }},
+       { &hf_fcp_rsp_flags_res_vld,
+         { "RES Vld", "fcp.rsp.flags.res_vld", FT_BOOLEAN, 8, TFS(&fcp_rsp_flags_res_vld_tfs), 0x01, "", HFILL }},
+        { &hf_fcp_request_in,
+          { "Request In", "fcp.request_in", FT_FRAMENUM, BASE_NONE, NULL,
+           0, "The frame number for the request", HFILL }},
+        { &hf_fcp_response_in,
+          { "Response In", "fcp.response_in", FT_FRAMENUM, BASE_NONE, NULL,
+           0, "The frame number of the response", HFILL }},
+        { &hf_fcp_time,
+          { "Time from FCP_CMND", "fcp.time", FT_RELATIVE_TIME, BASE_NONE, NULL,
+           0, "Time since the FCP_CMND frame", HFILL }},
     };
 
     /* Setup protocol subtree array */
     static gint *ett[] = {
         &ett_fcp,
+       &ett_fcp_taskmgmt,
+       &ett_fcp_rsp_flags,
     };
 
     /* Register the protocol name and description */
@@ -677,7 +829,6 @@ proto_register_fcp (void)
     proto_register_subtree_array(ett, array_length(ett));
     fcp_dissector = register_dissector_table ("fcp.type", "FCP Type", FT_UINT8,
                                               BASE_HEX);
-    register_init_routine (&fcp_init_protocol);
 }
 
 /* If this dissector uses sub-dissector registration add a registration routine.
@@ -694,5 +845,3 @@ proto_reg_handoff_fcp (void)
 
     data_handle = find_dissector ("data");
 }
-
-