diff options
| author | Ronnie Sahlberg <ronnie_sahlberg@ozemail.com.au> | 2006-04-22 02:16:52 +0000 |
|---|---|---|
| committer | Ronnie Sahlberg <ronnie_sahlberg@ozemail.com.au> | 2006-04-22 02:16:52 +0000 |
| commit | e776696d14b66f7e963d2599b51b8710436f5564 (patch) | |
| tree | 55ac51d7f61e9e784a3dc5ac5d3f76b8cfae6721 /epan/dissectors/packet-ndmp.c | |
| parent | 3cd547dc0a46a9981524a788306214f6c27ce68c (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
svn path=/trunk/; revision=17952
Diffstat (limited to 'epan/dissectors/packet-ndmp.c')
| -rw-r--r-- | epan/dissectors/packet-ndmp.c | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/epan/dissectors/packet-ndmp.c b/epan/dissectors/packet-ndmp.c index c0f1120ac9..6d490f3bb9 100644 --- a/epan/dissectors/packet-ndmp.c +++ b/epan/dissectors/packet-ndmp.c @@ -1205,7 +1205,6 @@ dissect_execute_cdb_request(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, guint32 seq, gint devtype) { conversation_t *conversation; - scsi_task_id_t task_key; /* * We need to provide SCSI task information to the SCSI @@ -1219,9 +1218,6 @@ dissect_execute_cdb_request(tvbuff_t *tvb, int offset, packet_info *pinfo, conversation = conversation_new(pinfo->fd->num, &pinfo->src, &pinfo->dst, pinfo->ptype, pinfo->srcport, pinfo->destport, 0); } - task_key.conv_id = conversation->index; - task_key.task_id = seq; - pinfo->private_data = &task_key; /* flags */ offset = dissect_execute_cdb_flags(tvb, offset, pinfo, tree); @@ -1294,7 +1290,6 @@ dissect_execute_cdb_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, guint32 seq) { conversation_t *conversation; - scsi_task_id_t task_key; /* * We need to provide SCSI task information to the SCSI @@ -1304,14 +1299,6 @@ dissect_execute_cdb_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, */ conversation = find_conversation(pinfo->fd->num, &pinfo->src, &pinfo->dst, pinfo->ptype, pinfo->srcport, pinfo->destport, 0); - if (conversation != NULL) { - task_key.conv_id = conversation->index; - task_key.task_id = seq; - pinfo->private_data = &task_key; - } else { - /* no conversation, meaning we didn't see the request */ - pinfo->private_data = NULL; - } /* error */ offset=dissect_error(tvb, offset, pinfo, tree, seq); |