aboutsummaryrefslogtreecommitdiffstats
path: root/gtk/rtp_stream.c
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2004-01-31 09:48:26 +0000
committerGuy Harris <guy@alum.mit.edu>2004-01-31 09:48:26 +0000
commitd4857dc7060547a22e644221a6a20a3a85d9b2fd (patch)
treea69295256c9c611d4fe5c88a550bc9df5793afcc /gtk/rtp_stream.c
parentc979950fc6df3a04d269ff63cb995f6d3b7f810f (diff)
Add to the _rtp_info structure a "info_all_data_present" boolean, which
is TRUE if all the RTP raw data is present in the tvbuff and FALSE otherwise. If it's not all present, also set "info_data_len" to 0 and "info_data" to NULL. In the RTP Analysis "Save Payload..." operation, check the "info_all_data_present" flag and fail if it's not set, and use "rtpinfo->info_data" and "rtpinfo->info_payload_offset" to get at the payload, rather than using "cfile.pd", as the latter doesn't necessarily refer to the current frame data. Note that the RTP Streams save operation should also check the "info_all_data_present" flag. svn path=/trunk/; revision=9920
Diffstat (limited to 'gtk/rtp_stream.c')
-rw-r--r--gtk/rtp_stream.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/gtk/rtp_stream.c b/gtk/rtp_stream.c
index a6628f1430..df73005518 100644
--- a/gtk/rtp_stream.c
+++ b/gtk/rtp_stream.c
@@ -1,7 +1,7 @@
/* rtp_stream.c
* RTP streams summary addition for ethereal
*
- * $Id: rtp_stream.c,v 1.10 2004/01/31 03:22:42 guy Exp $
+ * $Id: rtp_stream.c,v 1.11 2004/01/31 09:48:26 guy Exp $
*
* Copyright 2003, Alcatel Business Systems
* By Lars Ruoff <lars.ruoff@gmx.net>
@@ -240,6 +240,8 @@ int rtpstream_packet(rtpstream_tapinfo_t *tapinfo _U_, packet_info *pinfo, epan_
}
else if (tapinfo->mode == TAP_SAVE) {
if (rtp_stream_info_cmp(&tmp_strinfo, tapinfo->filter_stream_fwd)==0) {
+ /* XXX - what if rtpinfo->info_all_data_present is
+ FALSE, so that we don't *have* all the data? */
sample.header.rec_time =
(pinfo->fd->abs_usecs + 1000000 - tapinfo->filter_stream_fwd->start_usec)/1000
+ (pinfo->fd->abs_secs - tapinfo->filter_stream_fwd->start_sec - 1)*1000;