diff options
| author | Guy Harris <guy@alum.mit.edu> | 2001-12-10 00:26:21 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2001-12-10 00:26:21 +0000 |
| commit | 23319ff023bcb144347a1307b958359b5226c699 (patch) | |
| tree | b347f1669210e07039ec31051cbb2c5e82422e6b /packet-rtcp.c | |
| parent | a81a607ed5e3d291940ab75dd82d28d72c222b48 (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-rtcp.c')
| -rw-r--r-- | packet-rtcp.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/packet-rtcp.c b/packet-rtcp.c index 685793625c..1f8770e452 100644 --- a/packet-rtcp.c +++ b/packet-rtcp.c @@ -1,6 +1,6 @@ /* packet-rtcp.c * - * $Id: packet-rtcp.c,v 1.26 2001/12/03 08:47:27 guy Exp $ + * $Id: packet-rtcp.c,v 1.27 2001/12/10 00:25:33 guy Exp $ * * Routines for RTCP dissection * RTCP = Real-time Transport Control Protocol @@ -635,37 +635,37 @@ dissect_rtcp( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) unsigned int offset = 0; guint16 packet_length = 0; - if ( check_col( pinfo->fd, COL_PROTOCOL ) ) { - col_set_str( pinfo->fd, COL_PROTOCOL, "RTCP" ); + if ( check_col( pinfo->cinfo, COL_PROTOCOL ) ) { + col_set_str( pinfo->cinfo, COL_PROTOCOL, "RTCP" ); } - if ( check_col( pinfo->fd, COL_INFO) ) { + if ( check_col( pinfo->cinfo, COL_INFO) ) { /* The second octet contains the packet type */ /* switch ( pd[ offset + 1 ] ) { */ switch ( tvb_get_guint8( tvb, 1 ) ) { case RTCP_SR: - col_set_str( pinfo->fd, COL_INFO, "Sender Report"); + col_set_str( pinfo->cinfo, COL_INFO, "Sender Report"); break; case RTCP_RR: - col_set_str( pinfo->fd, COL_INFO, "Receiver Report"); + col_set_str( pinfo->cinfo, COL_INFO, "Receiver Report"); break; case RTCP_SDES: - col_set_str( pinfo->fd, COL_INFO, "Source Description"); + col_set_str( pinfo->cinfo, COL_INFO, "Source Description"); break; case RTCP_BYE: - col_set_str( pinfo->fd, COL_INFO, "Goodbye"); + col_set_str( pinfo->cinfo, COL_INFO, "Goodbye"); break; case RTCP_APP: - col_set_str( pinfo->fd, COL_INFO, "Application defined"); + col_set_str( pinfo->cinfo, COL_INFO, "Application defined"); break; case RTCP_FIR: - col_set_str( pinfo->fd, COL_INFO, "Full Intra-frame Request (H.261)"); + col_set_str( pinfo->cinfo, COL_INFO, "Full Intra-frame Request (H.261)"); break; case RTCP_NACK: - col_set_str( pinfo->fd, COL_INFO, "Negative Acknowledgement (H.261)"); + col_set_str( pinfo->cinfo, COL_INFO, "Negative Acknowledgement (H.261)"); break; default: - col_set_str( pinfo->fd, COL_INFO, "Unknown packet type"); + col_set_str( pinfo->cinfo, COL_INFO, "Unknown packet type"); break; } } |