diff options
| author | Guy Harris <guy@alum.mit.edu> | 2016-01-23 19:40:51 -0800 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2016-01-24 03:41:28 +0000 |
| commit | bc5a0374bfd162d08834f5f7503bebd33d8ec943 (patch) | |
| tree | 6d5be93a3e35c6eb144ce6d2b1d95650b5cbbd86 /epan/dissectors/packet-rsvd.c | |
| parent | baea677290f84d4e30e86194c79bafef0fdc1ad2 (diff) | |
Add the packet number to the packet_info structure, and use it.
That removes most of the uses of the frame number field in the
frame_data structure.
Change-Id: Ie22e4533e87f8360d7c0a61ca6ffb796cc233f22
Reviewed-on: https://code.wireshark.org/review/13509
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'epan/dissectors/packet-rsvd.c')
| -rw-r--r-- | epan/dissectors/packet-rsvd.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-rsvd.c b/epan/dissectors/packet-rsvd.c index d68d3c6e4c..05115c2d6e 100644 --- a/epan/dissectors/packet-rsvd.c +++ b/epan/dissectors/packet-rsvd.c @@ -139,11 +139,11 @@ get_itl_nexus(packet_info *pinfo) { itl_nexus_t *itl = NULL; - if (!(itl = (itl_nexus_t *)wmem_tree_lookup32_le(rsvd_conv_data->itl, pinfo->fd->num))) { + if (!(itl = (itl_nexus_t *)wmem_tree_lookup32_le(rsvd_conv_data->itl, pinfo->num))) { itl = wmem_new(wmem_file_scope(), itl_nexus_t); itl->cmdset = 0xff; itl->conversation = rsvd_conv_data->conversation; - wmem_tree_insert32(rsvd_conv_data->itl, pinfo->fd->num, itl); + wmem_tree_insert32(rsvd_conv_data->itl, pinfo->num, itl); } return itl; @@ -210,7 +210,7 @@ dissect_RSVD_TUNNEL_SCSI(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *pare *key_copy = request_id; rsvd_conv_data->task = wmem_new(wmem_file_scope(), rsvd_task_data_t); - rsvd_conv_data->task->request_frame=pinfo->fd->num; + rsvd_conv_data->task->request_frame=pinfo->num; rsvd_conv_data->task->response_frame=0; rsvd_conv_data->task->itlq = NULL; wmem_map_insert(rsvd_conv_data->tasks, (const void *)key_copy, @@ -282,7 +282,7 @@ dissect_RSVD_TUNNEL_SCSI(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *pare if (rsvd_conv_data->task && !rsvd_conv_data->task->itlq) { rsvd_conv_data->task->itlq = wmem_new(wmem_file_scope(), itlq_nexus_t); - rsvd_conv_data->task->itlq->first_exchange_frame = pinfo->fd->num; + rsvd_conv_data->task->itlq->first_exchange_frame = pinfo->num; rsvd_conv_data->task->itlq->last_exchange_frame = 0; rsvd_conv_data->task->itlq->lun = 0xffff; rsvd_conv_data->task->itlq->scsi_opcode = 0xffff; |