aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-adwin.c
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2016-01-22 19:50:21 -0800
committerGuy Harris <guy@alum.mit.edu>2016-01-23 03:50:58 +0000
commit9141bd97001e4a728c88b2bc7507a2f8bd91cc90 (patch)
treef589699cd32e897619dc250c9ec2c891c02f12d0 /epan/dissectors/packet-adwin.c
parent2fb43f3761f3bc813d85f3771b78a81007283871 (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-adwin.c')
-rw-r--r--epan/dissectors/packet-adwin.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-adwin.c b/epan/dissectors/packet-adwin.c
index ea43b325a4..53591e68d4 100644
--- a/epan/dissectors/packet-adwin.c
+++ b/epan/dissectors/packet-adwin.c
@@ -550,7 +550,7 @@ adwin_request_response_handling(tvbuff_t *tvb, packet_info *pinfo,
adwin_trans = wmem_new(wmem_file_scope(), adwin_transaction_t);
adwin_trans->req_frame = pinfo->fd->num;
adwin_trans->rep_frame = 0;
- adwin_trans->req_time = pinfo->fd->abs_ts;
+ adwin_trans->req_time = pinfo->abs_ts;
wmem_map_insert(adwin_info->pdus, GUINT_TO_POINTER(seq_num), (void *)adwin_trans);
} else {
adwin_trans = (adwin_transaction_t *)wmem_map_lookup(adwin_info->pdus, GUINT_TO_POINTER(seq_num));
@@ -566,7 +566,7 @@ adwin_request_response_handling(tvbuff_t *tvb, packet_info *pinfo,
adwin_trans = wmem_new(wmem_packet_scope(), adwin_transaction_t);
adwin_trans->req_frame = 0;
adwin_trans->rep_frame = 0;
- adwin_trans->req_time = pinfo->fd->abs_ts;
+ adwin_trans->req_time = pinfo->abs_ts;
}
/* print state tracking in the tree */
@@ -589,7 +589,7 @@ adwin_request_response_handling(tvbuff_t *tvb, packet_info *pinfo,
tvb, 0, 0, adwin_trans->req_frame);
PROTO_ITEM_SET_GENERATED(it);
- nstime_delta(&ns, &pinfo->fd->abs_ts, &adwin_trans->req_time);
+ nstime_delta(&ns, &pinfo->abs_ts, &adwin_trans->req_time);
it = proto_tree_add_time(adwin_tree, hf_adwin_response_time, tvb, 0, 0, &ns);
PROTO_ITEM_SET_GENERATED(it);
}