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-reload-framing.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-reload-framing.c')
| -rw-r--r-- | epan/dissectors/packet-reload-framing.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-reload-framing.c b/epan/dissectors/packet-reload-framing.c index 1af2757634..ef5b553883 100644 --- a/epan/dissectors/packet-reload-framing.c +++ b/epan/dissectors/packet-reload-framing.c @@ -249,7 +249,7 @@ dissect_reload_framing_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr reload_frame = wmem_new(wmem_file_scope(), reload_frame_t); reload_frame->data_frame = 0; reload_frame->ack_frame = 0; - reload_frame->req_time = pinfo->fd->abs_ts; + reload_frame->req_time = pinfo->abs_ts; wmem_tree_insert32_array(reload_framing_info->transaction_pdus, transaction_id_key, (void *)reload_frame); } transaction_id_key[2].key = key_save; @@ -282,7 +282,7 @@ dissect_reload_framing_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr reload_frame = wmem_new(wmem_packet_scope(), reload_frame_t); reload_frame->data_frame = (type==DATA) ? pinfo->fd->num : 0; reload_frame->ack_frame = (type!=DATA) ? pinfo->fd->num : 0; - reload_frame->req_time = pinfo->fd->abs_ts; + reload_frame->req_time = pinfo->abs_ts; } ti = proto_tree_add_item(tree, proto_reload_framing, tvb, 0, -1, ENC_NA); @@ -320,7 +320,7 @@ dissect_reload_framing_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr it = proto_tree_add_uint(reload_framing_tree, hf_reload_framing_response_to, tvb, 0, 0, reload_frame->data_frame); PROTO_ITEM_SET_GENERATED(it); - nstime_delta(&ns, &pinfo->fd->abs_ts, &reload_frame->req_time); + nstime_delta(&ns, &pinfo->abs_ts, &reload_frame->req_time); it = proto_tree_add_time(reload_framing_tree, hf_reload_framing_time, tvb, 0, 0, &ns); PROTO_ITEM_SET_GENERATED(it); } |