diff options
| author | sahlberg <sahlberg@f5534014-38df-0310-8fa8-9805f1628bb7> | 2006-04-22 02:16:52 +0000 |
|---|---|---|
| committer | sahlberg <sahlberg@f5534014-38df-0310-8fa8-9805f1628bb7> | 2006-04-22 02:16:52 +0000 |
| commit | 02f8436ab7edb1ed6e836f095c43b61f74cebf57 (patch) | |
| tree | 55ac51d7f61e9e784a3dc5ac5d3f76b8cfae6721 /epan/dissectors/packet-fcp.c | |
| parent | 66fec73301d522b98e80c808e94d7ade70fd4cf2 (diff) | |
the scsi transports (fc/fcp and iscsi) now track both itl and itlq
structures for scsi.
we no longer need the scsi_task_id structure passed by pinfo->private_data so get rid of it.
we no longer need the (broken by design) scsi_task_data hash table since this has been replaced byt hte itl and itlq structures and tracking
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@17952 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dissectors/packet-fcp.c')
| -rw-r--r-- | epan/dissectors/packet-fcp.c | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/epan/dissectors/packet-fcp.c b/epan/dissectors/packet-fcp.c index efde328fc1..8e169a5883 100644 --- a/epan/dissectors/packet-fcp.c +++ b/epan/dissectors/packet-fcp.c @@ -398,8 +398,7 @@ dissect_fcp_cmnd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, pro int len, add_len = 0; guint8 flags, lun0; - scsi_task_id_t task_key; - guint16 lun=0xffff; + guint16 lun=0xffff; tvbuff_t *cdb_tvb; int tvb_len, tvb_rlen; itl_nexus_t *itl=NULL; @@ -416,10 +415,6 @@ dissect_fcp_cmnd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, pro len = FCP_DEF_CMND_LEN; } - task_key.conv_id = conversation->index; - task_key.task_id = conversation->index; - pinfo->private_data = (void *)&task_key; - proto_tree_add_uint_hidden(tree, hf_fcp_type, tvb, offset, 0, 0); lun0 = tvb_get_guint8 (tvb, offset); @@ -471,12 +466,6 @@ dissect_fcp_cmnd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, pro static void dissect_fcp_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, conversation_t *conversation, fc_hdr *fchdr, itl_nexus_t *itl) { - scsi_task_id_t task_key; - - task_key.conv_id = conversation->index; - task_key.task_id = conversation->index; - pinfo->private_data = (void *)&task_key; - dissect_scsi_payload(tvb, pinfo, parent_tree, FALSE, fchdr->itlq, itl); } @@ -503,7 +492,6 @@ dissect_fcp_rsp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, prot rsplen = 0; guint8 flags; guint8 status; - scsi_task_id_t task_key; status = tvb_get_guint8 (tvb, offset+11); @@ -512,13 +500,9 @@ dissect_fcp_rsp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, prot val_to_str (status, scsi_status_val, "0x%x")); } - task_key.conv_id = task_key.task_id = conversation->index; - pinfo->private_data = (void *)&task_key; - proto_tree_add_uint_hidden(tree, hf_fcp_type, tvb, offset, 0, 0); - /* 8 reserved bytes */ offset+=8; |