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-cops.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-cops.c')
| -rw-r--r-- | epan/dissectors/packet-cops.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-cops.c b/epan/dissectors/packet-cops.c index c317d33185..1be2fcb337 100644 --- a/epan/dissectors/packet-cops.c +++ b/epan/dissectors/packet-cops.c @@ -1060,7 +1060,7 @@ dissect_cops_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data cops_call->solicited = is_solicited; cops_call->req_num = PINFO_FD_NUM(pinfo); cops_call->rsp_num = 0; - cops_call->req_time = pinfo->fd->abs_ts; + cops_call->req_time = pinfo->abs_ts; g_ptr_array_add(pdus_array, cops_call); } else { @@ -1086,7 +1086,7 @@ dissect_cops_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data for (i=0; i < pdus_array->len; i++) { cops_call = (cops_call_t*)g_ptr_array_index(pdus_array, i); - if (nstime_cmp(&pinfo->fd->abs_ts, &cops_call->req_time) <= 0 || cops_call->rsp_num != 0) + if (nstime_cmp(&pinfo->abs_ts, &cops_call->req_time) <= 0 || cops_call->rsp_num != 0) continue; if ( @@ -1117,7 +1117,7 @@ dissect_cops_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data "Response to a request in frame %u", cops_call->req_num); PROTO_ITEM_SET_GENERATED(ti); - nstime_delta(&delta, &pinfo->fd->abs_ts, &cops_call->req_time); + nstime_delta(&delta, &pinfo->abs_ts, &cops_call->req_time); ti = proto_tree_add_time(cops_tree, hf_cops_response_time, tvb, 0, 0, &delta); PROTO_ITEM_SET_GENERATED(ti); |