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. diff --git a/epan/req_resp_hdrs.c b/epan/req_resp_hdrs.c index d9cf1eff1d..fe34b820b4 100644 --- a/epan/req_resp_hdrs.c +++ b/epan/req_resp_hdrs.c @@ -38,10 +38,9 @@ * Optionally do reassembly of the request/response line, headers, and body. */ gboolean -req_resp_hdrs_do_reassembly(tvbuff_t *tvb, packet_info *pinfo, +req_resp_hdrs_do_reassembly(tvbuff_t *tvb, int offset, packet_info *pinfo, gboolean desegment_headers, gboolean desegment_body) { - gint offset = 0; gint next_offset; gint next_offset_sav; gint length_remaining, reported_length_remaining; diff --git a/epan/req_resp_hdrs.h b/epan/req_resp_hdrs.h index a4783a5440..3a91483fb5 100644 --- a/epan/req_resp_hdrs.h +++ b/epan/req_resp_hdrs.h @@ -30,7 +30,7 @@ * Optionally do reassembly of the request/response line, headers, and body. */ extern gboolean -req_resp_hdrs_do_reassembly(tvbuff_t *tvb, packet_info *pinfo, +req_resp_hdrs_do_reassembly(tvbuff_t *tvb, int offset, packet_info *pinfo, gboolean desegment_headers, gboolean desegment_body); #endif