diff options
| author | Ronnie Sahlberg <ronnie_sahlberg@ozemail.com.au> | 2006-10-14 09:18:24 +0000 |
|---|---|---|
| committer | Ronnie Sahlberg <ronnie_sahlberg@ozemail.com.au> | 2006-10-14 09:18:24 +0000 |
| commit | 2b132062392c58d48ee39f8383fd3cade39a0af0 (patch) | |
| tree | d7544c9ba3f68c3bbc4d5055964f928e75342886 /epan | |
| parent | 24ef4fcef051696b2c25080a1ecc5d9fa6d4314d (diff) | |
set both read/write flags in ndmp scsi and also always set the expected length to whatever length is transported inside the ndmp pdu
this fixes a regression caused by the recent scsi data in/out reassembly code which made the scsi dissector fail to dissect data in/out over ndmp correctly if scsi reassembly was enabled
svn path=/trunk/; revision=19525
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/dissectors/packet-ndmp.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/epan/dissectors/packet-ndmp.c b/epan/dissectors/packet-ndmp.c index 130949de39..550f3c4138 100644 --- a/epan/dissectors/packet-ndmp.c +++ b/epan/dissectors/packet-ndmp.c @@ -1241,6 +1241,12 @@ dissect_execute_cdb_payload(tvbuff_t *tvb, int offset, packet_info *pinfo, proto data_tvb=tvb_new_subset(tvb, offset, tvb_len, tvb_rlen); if(ndmp_conv_data->task->itlq){ + /* ndmp conceptually always send both read and write + * data and always a full nonfragmented pdu + */ + ndmp_conv_data->task->itlq->task_flags=SCSI_DATA_READ|SCSI_DATA_WRITE; + ndmp_conv_data->task->itlq->data_length=payload_len; + ndmp_conv_data->task->itlq->bidir_data_length=payload_len; dissect_scsi_payload(data_tvb, pinfo, top_tree, isreq, ndmp_conv_data->task->itlq, get_itl_nexus(ndmp_conv_data, pinfo, FALSE), |