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-iax2.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-iax2.c')
-rw-r--r-- | epan/dissectors/packet-iax2.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-iax2.c b/epan/dissectors/packet-iax2.c index 1064a6eb55..34c2491256 100644 --- a/epan/dissectors/packet-iax2.c +++ b/epan/dissectors/packet-iax2.c @@ -1026,7 +1026,7 @@ static iax_call_data *iax_new_call( packet_info *pinfo, call -> n_forward_circuit_ids = 0; call -> n_reverse_circuit_ids = 0; call -> subdissector = NULL; - call -> start_time = pinfo->fd->abs_ts; + call -> start_time = pinfo->abs_ts; nstime_delta(&call -> start_time, &call -> start_time, &millisecond); init_dir_data(&call->dirdata[0]); init_dir_data(&call->dirdata[1]); @@ -1582,7 +1582,7 @@ static void iax2_add_ts_fields(packet_info *pinfo, proto_tree *iax2_tree, iax_pa /* deal with short timestamps by assuming that packets are never more than * 16 seconds late */ - while(abs_secs < pinfo->fd->abs_ts.secs - 16) { + while(abs_secs < pinfo->abs_ts.secs - 16) { longts += 32768; abs_secs = (gint32)(start_secs + longts/1000); } @@ -1600,7 +1600,7 @@ static void iax2_add_ts_fields(packet_info *pinfo, proto_tree *iax2_tree, iax_pa item = proto_tree_add_time(iax2_tree, hf_iax2_absts, NULL, 0, 0, &iax_packet->abstime); PROTO_ITEM_SET_GENERATED(item); - ts = pinfo->fd->abs_ts; + ts = pinfo->abs_ts; nstime_delta(&ts, &ts, &iax_packet->abstime); item = proto_tree_add_time(iax2_tree, hf_iax2_lateness, NULL, 0, 0, &ts); |