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-rtcp.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-rtcp.c')
| -rw-r--r-- | epan/dissectors/packet-rtcp.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-rtcp.c b/epan/dissectors/packet-rtcp.c index f82f32bc00..23fbc1bd41 100644 --- a/epan/dissectors/packet-rtcp.c +++ b/epan/dissectors/packet-rtcp.c @@ -3107,7 +3107,7 @@ static void remember_outgoing_sr(packet_info *pinfo, guint32 lsr) /* Update conversation data */ p_conv_data->last_received_set = TRUE; p_conv_data->last_received_frame_number = pinfo->fd->num; - p_conv_data->last_received_timestamp = pinfo->fd->abs_ts; + p_conv_data->last_received_timestamp = pinfo->abs_ts; p_conv_data->last_received_ts = lsr; @@ -3203,9 +3203,9 @@ static void calculate_roundtrip_delay(tvbuff_t *tvb, packet_info *pinfo, { /* Look at time of since original packet was sent */ gint seconds_between_packets = (gint) - (pinfo->fd->abs_ts.secs - p_conv_data->last_received_timestamp.secs); + (pinfo->abs_ts.secs - p_conv_data->last_received_timestamp.secs); gint nseconds_between_packets = - pinfo->fd->abs_ts.nsecs - p_conv_data->last_received_timestamp.nsecs; + pinfo->abs_ts.nsecs - p_conv_data->last_received_timestamp.nsecs; gint total_gap = (seconds_between_packets*1000) + (nseconds_between_packets / 1000000); |