diff options
author | Guy Harris <guy@alum.mit.edu> | 2005-01-20 04:37:03 +0000 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2005-01-20 04:37:03 +0000 |
commit | c04a9a418006dfad34f25e644789ce44d6584b78 (patch) | |
tree | 0b30d719e7fdc4c8a64e783db9670e3eb6eee55b /epan/dissectors | |
parent | 2b7ca484ace0264f11cf30e5dd3e1c7c78a5530e (diff) |
There's no guaranteee that "req_resp_hdrs_do_reassembly()" gets called
only at the beginning of a tvbuff, so it needs an argument that's the
starting offset in the tvbuff.
svn path=/trunk/; revision=13128
Diffstat (limited to 'epan/dissectors')
-rw-r--r-- | epan/dissectors/packet-http.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-rtsp.c | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/epan/dissectors/packet-http.c b/epan/dissectors/packet-http.c index d881cc170a..722160f99c 100644 --- a/epan/dissectors/packet-http.c +++ b/epan/dissectors/packet-http.c @@ -299,7 +299,7 @@ dissect_http_message(tvbuff_t *tvb, int offset, packet_info *pinfo, * and do body desegmentation if we've been told to and * we find a Content-Length header. */ - if (!req_resp_hdrs_do_reassembly(tvb, pinfo, + if (!req_resp_hdrs_do_reassembly(tvb, offset, pinfo, http_desegment_headers, http_desegment_body)) { /* * More data needed for desegmentation. diff --git a/epan/dissectors/packet-rtsp.c b/epan/dissectors/packet-rtsp.c index 070d1f0865..fc29af4b2b 100644 --- a/epan/dissectors/packet-rtsp.c +++ b/epan/dissectors/packet-rtsp.c @@ -510,6 +510,7 @@ dissect_rtspmessage(tvbuff_t *tvb, int offset, packet_info *pinfo, int value_offset; int value_len; e164_info_t e164_info; + /* * Is this a request or response? * @@ -520,6 +521,7 @@ dissect_rtspmessage(tvbuff_t *tvb, int offset, packet_info *pinfo, first_linelen = tvb_find_line_end(tvb, offset, tvb_ensure_length_remaining(tvb, offset), &next_offset, FALSE); + /* * Is the first line a request or response? */ @@ -533,7 +535,7 @@ dissect_rtspmessage(tvbuff_t *tvb, int offset, packet_info *pinfo, * and do body desegmentation if we've been told to and * we find a Content-Length header. */ - if (!req_resp_hdrs_do_reassembly(tvb, pinfo, + if (!req_resp_hdrs_do_reassembly(tvb, offset, pinfo, rtsp_desegment_headers, rtsp_desegment_body)) { /* * More data needed for desegmentation. |