aboutsummaryrefslogtreecommitdiffstats
path: root/packet-rtp.c
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2001-12-10 00:26:21 +0000
committerGuy Harris <guy@alum.mit.edu>2001-12-10 00:26:21 +0000
commit23319ff023bcb144347a1307b958359b5226c699 (patch)
treeb347f1669210e07039ec31051cbb2c5e82422e6b /packet-rtp.c
parenta81a607ed5e3d291940ab75dd82d28d72c222b48 (diff)
Move the pointer to the "column_info" structure in the "frame_data"
structure to the "packet_info" structure; only stuff that's permanently stored with each frame should be in the "frame_data" structure, and the "column_info" structure is not guaranteed to hold the column values for that frame at all times - it was only in the "frame_data" structure so that it could be passed to dissectors, and, as all dissectors are now passed a pointer to a "packet_info" structure, it could just as well be put in the "packet_info" structure. That saves memory, by shrinking the "frame_data" structure (there's one of those per frame), and also lets us clean up the code a bit. svn path=/trunk/; revision=4370
Diffstat (limited to 'packet-rtp.c')
-rw-r--r--packet-rtp.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/packet-rtp.c b/packet-rtp.c
index cdd3d5f368..d04e3e38de 100644
--- a/packet-rtp.c
+++ b/packet-rtp.c
@@ -6,7 +6,7 @@
* Copyright 2000, Philips Electronics N.V.
* Written by Andreas Sikkema <andreas.sikkema@philips.com>
*
- * $Id: packet-rtp.c,v 1.30 2001/12/03 08:47:27 guy Exp $
+ * $Id: packet-rtp.c,v 1.31 2001/12/10 00:25:33 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -355,12 +355,12 @@ dissect_rtp( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree )
/*
* Unknown or unsupported version.
*/
- if ( check_col( pinfo->fd, COL_PROTOCOL ) ) {
- col_set_str( pinfo->fd, COL_PROTOCOL, "RTP" );
+ if ( check_col( pinfo->cinfo, COL_PROTOCOL ) ) {
+ col_set_str( pinfo->cinfo, COL_PROTOCOL, "RTP" );
}
- if ( check_col( pinfo->fd, COL_INFO) ) {
- col_add_fstr( pinfo->fd, COL_INFO,
+ if ( check_col( pinfo->cinfo, COL_INFO) ) {
+ col_add_fstr( pinfo->cinfo, COL_INFO,
"Unknown RTP version %u", version);
}
@@ -388,12 +388,12 @@ dissect_rtp( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree )
timestamp = tvb_get_ntohl( tvb, offset + 4 );
sync_src = tvb_get_ntohl( tvb, offset + 8 );
- if ( check_col( pinfo->fd, COL_PROTOCOL ) ) {
- col_set_str( pinfo->fd, COL_PROTOCOL, "RTP" );
+ if ( check_col( pinfo->cinfo, COL_PROTOCOL ) ) {
+ col_set_str( pinfo->cinfo, COL_PROTOCOL, "RTP" );
}
- if ( check_col( pinfo->fd, COL_INFO) ) {
- col_add_fstr( pinfo->fd, COL_INFO,
+ if ( check_col( pinfo->cinfo, COL_INFO) ) {
+ col_add_fstr( pinfo->cinfo, COL_INFO,
"Payload type=%s, SSRC=%u, Seq=%u, Time=%u%s",
val_to_str( payload_type, rtp_payload_type_vals,
"Unknown (%u)" ),