From 246fe2ca4c67d8c98caa84e2f57694f6322e2f96 Mon Sep 17 00:00:00 2001 From: Dario Lombardo Date: Tue, 17 Jun 2014 17:45:00 +0200 Subject: Fixup: tvb_* -> tvb_captured Change-Id: I9209c1271967405c34c1b6fa43e1726a4d3a5a3f Reviewed-on: https://code.wireshark.org/review/2377 Reviewed-by: Anders Broman --- epan/dissectors/packet-sdp.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'epan/dissectors/packet-sdp.c') diff --git a/epan/dissectors/packet-sdp.c b/epan/dissectors/packet-sdp.c index a62eb19166..9bf4b40cba 100644 --- a/epan/dissectors/packet-sdp.c +++ b/epan/dissectors/packet-sdp.c @@ -553,7 +553,7 @@ dissect_sdp_connection_info(tvbuff_t *tvb, proto_item* ti, tokenlen = -1; /* end of tvbuff */ /* Save connection address */ media_info->connection_address = - (char*)tvb_get_string_enc(wmem_packet_scope(), tvb, offset, tvb_length_remaining(tvb, offset), ENC_UTF_8|ENC_NA); + (char*)tvb_get_string_enc(wmem_packet_scope(), tvb, offset, tvb_captured_length_remaining(tvb, offset), ENC_UTF_8|ENC_NA); } else { tokenlen = next_offset - offset; /* Save connection address */ @@ -766,7 +766,7 @@ static void dissect_key_mgmt(tvbuff_t *tvb, packet_info * pinfo, proto_item * ti offset = next_offset + 1; - len = tvb_length_remaining(tvb, offset); + len = tvb_captured_length_remaining(tvb, offset); if (len < 0) return; @@ -1196,7 +1196,7 @@ decode_sdp_fmtp(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, gint offset proto_tree_add_text(tree, tvb, offset, tokenlen, "Could not convert '%s' to 3 bytes", format_specific_parameter); return; } - length = tvb_length(data_tvb); + length = tvb_captured_length(data_tvb); if (length == 3) { if (h264_handle && data_tvb) { dissect_h264_profile(data_tvb, pinfo, tree); @@ -1339,10 +1339,10 @@ static void dissect_sdp_media_attribute(tvbuff_t *tvb, packet_info *pinfo, proto /* Skip colon */ offset = colon_offset + 1; /* skip leading wsp */ - offset = tvb_skip_wsp(tvb, offset, tvb_length_remaining(tvb, offset)); + offset = tvb_skip_wsp(tvb, offset, tvb_captured_length_remaining(tvb, offset)); /* Value is the remainder of the line */ - attribute_value = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, tvb_length_remaining(tvb, offset), ENC_UTF_8|ENC_NA); + attribute_value = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, tvb_captured_length_remaining(tvb, offset), ENC_UTF_8|ENC_NA); @@ -1431,7 +1431,7 @@ static void dissect_sdp_media_attribute(tvbuff_t *tvb, packet_info *pinfo, proto guint8 media_format; /* Reading the Format parameter(fmtp) */ /* Skip leading space, if any */ - offset = tvb_skip_wsp(tvb, offset, tvb_length_remaining(tvb, offset)); + offset = tvb_skip_wsp(tvb, offset, tvb_captured_length_remaining(tvb, offset)); /* Media format extends to the next space */ next_offset = tvb_find_guint8(tvb, offset, -1, ' '); @@ -1461,11 +1461,11 @@ static void dissect_sdp_media_attribute(tvbuff_t *tvb, packet_info *pinfo, proto while (has_more_pars == TRUE) { next_offset = tvb_find_guint8(tvb, offset, -1, ';'); - offset = tvb_skip_wsp(tvb, offset, tvb_length_remaining(tvb, offset)); + offset = tvb_skip_wsp(tvb, offset, tvb_captured_length_remaining(tvb, offset)); if (next_offset == -1) { has_more_pars = FALSE; - next_offset= tvb_length(tvb); + next_offset= tvb_captured_length(tvb); } /* There are at least 2 - add the first parameter */ @@ -1637,7 +1637,7 @@ static void dissect_sdp_media_attribute(tvbuff_t *tvb, packet_info *pinfo, proto param_end_offset = tvb_find_guint8(tvb, offset, -1, ';'); if (param_end_offset == -1) { has_more_pars = FALSE; - param_end_offset = tvb_length(tvb); + param_end_offset = tvb_captured_length(tvb); } /* key-method or key-method-ext */ next_offset = tvb_find_guint8(tvb, offset, -1, ':'); @@ -2608,7 +2608,7 @@ dissect_sdp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } } - datalen = tvb_length_remaining(tvb, offset); + datalen = tvb_captured_length_remaining(tvb, offset); if (datalen > 0) { proto_tree_add_text(sdp_tree, tvb, offset, datalen, "Data (%d bytes)", datalen); } -- cgit v1.2.3