diff options
| author | Guy Harris <guy@alum.mit.edu> | 2001-04-23 04:35:39 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2001-04-23 04:35:39 +0000 |
| commit | 4f10e27d03d0f4becf442551c45bcb086d0218d2 (patch) | |
| tree | 44840f4460a401668a4d2be8a5fc94582cf6a7df /packet-rtcp.c | |
| parent | 32c0848007033daaedcbb628da2230eadd155051 (diff) | |
Get rid of BYTES_ARE_IN_FRAME references.
svn path=/trunk/; revision=3365
Diffstat (limited to 'packet-rtcp.c')
| -rw-r--r-- | packet-rtcp.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/packet-rtcp.c b/packet-rtcp.c index 40d8927cab..a80b2e5d18 100644 --- a/packet-rtcp.c +++ b/packet-rtcp.c @@ -442,8 +442,7 @@ dissect_rtcp_sdes( tvbuff_t *tvb, int offset, frame_data *fd, proto_tree *tree, * end of frame instead. */ while ( ( tvb_get_guint8( tvb, offset ) != RTCP_SDES_END ) - && ( tvb_length_remaining( tvb, offset) >= 2 ) ) { - /* while ( ( pd[ offset ] != RTCP_SDES_END ) && ( BYTES_ARE_IN_FRAME( offset, 2 ) ) ) { */ + && ( tvb_bytes_exist( tvb, offset, 2) ) ) { /* ID, 8 bits */ sdes_type = tvb_get_guint8( tvb, offset ); proto_tree_add_item( sdes_item_tree, hf_rtcp_ssrc_type, tvb, offset, 1, FALSE ); @@ -678,8 +677,7 @@ dissect_rtcp( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) * RTCP message. The last compound message contains padding, * that enables us to break from the while loop. */ - /* while ( BYTES_ARE_IN_FRAME( offset, 4 ) ) { */ - while ( tvb_length_remaining( tvb, offset) >= 4 ) { + while ( tvb_bytes_exist( tvb, offset, 4) ) { /* * First retreive the packet_type */ |