diff options
| author | Guy Harris <guy@alum.mit.edu> | 2016-01-22 19:50:21 -0800 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2016-01-23 03:50:58 +0000 |
| commit | 9141bd97001e4a728c88b2bc7507a2f8bd91cc90 (patch) | |
| tree | f589699cd32e897619dc250c9ec2c891c02f12d0 /epan/dissectors/packet-ndmp.c | |
| parent | 2fb43f3761f3bc813d85f3771b78a81007283871 (diff) | |
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>
Diffstat (limited to 'epan/dissectors/packet-ndmp.c')
| -rw-r--r-- | epan/dissectors/packet-ndmp.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-ndmp.c b/epan/dissectors/packet-ndmp.c index a67d6ec3b2..f06c269b10 100644 --- a/epan/dissectors/packet-ndmp.c +++ b/epan/dissectors/packet-ndmp.c @@ -1377,7 +1377,7 @@ dissect_execute_cdb_cdb(tvbuff_t *tvb, int offset, packet_info *pinfo, ndmp_conv_data->task->itlq->bidir_data_length=0; ndmp_conv_data->task->itlq->flags=0; ndmp_conv_data->task->itlq->alloc_len=0; - ndmp_conv_data->task->itlq->fc_time=pinfo->fd->abs_ts; + ndmp_conv_data->task->itlq->fc_time=pinfo->abs_ts; ndmp_conv_data->task->itlq->extra_data=NULL; } if(ndmp_conv_data->task && ndmp_conv_data->task->itlq){ @@ -3238,7 +3238,7 @@ dissect_ndmp_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* ndmp_conv_data->task=wmem_new(wmem_file_scope(), ndmp_task_data_t); ndmp_conv_data->task->request_frame=pinfo->fd->num; ndmp_conv_data->task->response_frame=0; - ndmp_conv_data->task->ndmp_time=pinfo->fd->abs_ts; + ndmp_conv_data->task->ndmp_time=pinfo->abs_ts; ndmp_conv_data->task->itlq=NULL; wmem_map_insert(ndmp_conv_data->tasks, GUINT_TO_POINTER(nh.seq), ndmp_conv_data->task); } else { @@ -3268,7 +3268,7 @@ dissect_ndmp_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* PROTO_ITEM_SET_GENERATED(it); - nstime_delta(&delta_ts, &pinfo->fd->abs_ts, &ndmp_conv_data->task->ndmp_time); + nstime_delta(&delta_ts, &pinfo->abs_ts, &ndmp_conv_data->task->ndmp_time); it=proto_tree_add_time(ndmp_tree, hf_ndmp_time, new_tvb, 0, 0, &delta_ts); PROTO_ITEM_SET_GENERATED(it); } |