Add more fields to packet_info structure and use them.

Add fields for the absolute time stamp (and another field for a presence
flag for the absolute time stamp) and the packet encapsulation for the
packet.

This lets us remove the field for the packet encapsulation in the
frame_data structure; do so.

Change-Id: Ifb910a9a192414e2a53086f3f7b97f39ed36aa39
Reviewed-on: https://code.wireshark.org/review/13499
Reviewed-by: Guy Harris <guy@alum.mit.edu>

1 files changed, 5 insertions, 5 deletions

diff --git a/epan/dissectors/packet-fcp.c b/epan/dissectors/packet-fcp.c
index 4e6ae746a3..c900961e9f 100644
--- a/epan/dissectors/packet-fcp.c
+++ b/epan/dissectors/packet-fcp.c
@@ -348,7 +348,7 @@ dissect_fcp_cmnd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, pro
         request_data = wmem_new(wmem_file_scope(), fcp_request_data_t);
         request_data->request_frame = pinfo->fd->num;
         request_data->response_frame = 0;
-        request_data->request_time = pinfo->fd->abs_ts;
+        request_data->request_time = pinfo->abs_ts;
 
         request_data->itlq = wmem_new(wmem_file_scope(), itlq_nexus_t);
         request_data->itlq->first_exchange_frame=0;
@@ -358,7 +358,7 @@ dissect_fcp_cmnd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, pro
         request_data->itlq->task_flags=0;
         request_data->itlq->data_length=0;
         request_data->itlq->bidir_data_length=0;
-        request_data->itlq->fc_time=pinfo->fd->abs_ts;
+        request_data->itlq->fc_time=pinfo->abs_ts;
         request_data->itlq->flags=0;
         request_data->itlq->alloc_len=0;
         request_data->itlq->extra_data=NULL;
@@ -370,7 +370,7 @@ dissect_fcp_cmnd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, pro
     if(!pinfo->fd->flags.visited){
         if(fchdr->fctl&FC_FCTL_EXCHANGE_FIRST){
             request_data->itlq->first_exchange_frame=pinfo->fd->num;
-            request_data->itlq->fc_time = pinfo->fd->abs_ts;
+            request_data->itlq->fc_time = pinfo->abs_ts;
         }
         if(fchdr->fctl&FC_FCTL_EXCHANGE_LAST){
             request_data->itlq->last_exchange_frame=pinfo->fd->num;
@@ -488,7 +488,7 @@ dissect_fcp_rsp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, prot
         if(!pinfo->fd->flags.visited){
             if(fchdr->fctl&FC_FCTL_EXCHANGE_FIRST){
                 request_data->itlq->first_exchange_frame=pinfo->fd->num;
-                request_data->itlq->fc_time = pinfo->fd->abs_ts;
+                request_data->itlq->fc_time = pinfo->abs_ts;
             }
             if(fchdr->fctl&FC_FCTL_EXCHANGE_LAST){
                 request_data->itlq->last_exchange_frame=pinfo->fd->num;
@@ -700,7 +700,7 @@ dissect_fcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data)
             /* 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, &request_data->request_time);
+                nstime_delta(&delta_ts, &pinfo->abs_ts, &request_data->request_time);
                 it = proto_tree_add_time(ti, hf_fcp_time, tvb, 0, 0, &delta_ts);
                 PROTO_ITEM_SET_GENERATED(it);
             }