diff options
| author | Guy Harris <guy@alum.mit.edu> | 2000-11-10 06:50:37 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2000-11-10 06:50:37 +0000 |
| commit | 07eb30403dae13dde668ff3b06d7d6c9bf677de9 (patch) | |
| tree | 7a4c3b5a8262e5ec32132dd69225fd74d1a5fd16 /packet-rtsp.c | |
| parent | 9eb37f04e72d4d5a6f50e04e808757a648314fac (diff) | |
Tvbuffify the SAP and SDP dissectors.
Add "tvb_find_line_end_unquoted()" for the benefit of the SDP dissector;
get rid of "find_line_end_unquoted()" as nobody uses it any more.
Add "tvb_pbrk_guint8()" for the benefit of
"tvb_find_line_end_unquoted()"; it searches for any of a number of
characters, unlike "tvb_find_guint8()" which searches for only one.
svn path=/trunk/; revision=2595
Diffstat (limited to 'packet-rtsp.c')
| -rw-r--r-- | packet-rtsp.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/packet-rtsp.c b/packet-rtsp.c index f945d1ed07..62e2a26b13 100644 --- a/packet-rtsp.c +++ b/packet-rtsp.c @@ -4,7 +4,7 @@ * Jason Lango <jal@netapp.com> * Liberally copied from packet-http.c, by Guy Harris <guy@alum.mit.edu> * - * $Id: packet-rtsp.c,v 1.22 2000/11/09 10:56:32 guy Exp $ + * $Id: packet-rtsp.c,v 1.23 2000/11/10 06:50:36 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -345,8 +345,7 @@ dissect_rtsp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) datalen = tvb_length_remaining(tvb, offset); if (is_sdp) { if (datalen > 0) { - tvbuff_t *new_tvb = tvb_new_subset(tvb, offset, -1, -1); - const guint8 *pd; + tvbuff_t *new_tvb; /* * Fix up the top-level item so that it doesn't @@ -356,11 +355,11 @@ dissect_rtsp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_item_set_len(ti, offset); /* - * Now create a tvbuff for the SDP stuff, and dissect - * it. + * Now creat a tvbuff for the SDP stuff and + * dissect it. */ - tvb_compat(new_tvb, &pd, &offset); - dissect_sdp(pd, offset, pinfo->fd, tree); + new_tvb = tvb_new_subset(tvb, offset, -1, -1); + dissect_sdp(new_tvb, pinfo, tree); } if (check_col(pinfo->fd, COL_PROTOCOL)) col_add_str(pinfo->fd, COL_PROTOCOL, "RTSP/SDP"); |