diff options
Diffstat (limited to 'epan/dissectors/packet-btsdp.c')
| -rw-r--r-- | epan/dissectors/packet-btsdp.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/epan/dissectors/packet-btsdp.c b/epan/dissectors/packet-btsdp.c index 81f2a79be5..0b99541731 100644 --- a/epan/dissectors/packet-btsdp.c +++ b/epan/dissectors/packet-btsdp.c @@ -1187,7 +1187,7 @@ dissect_continuation_state(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, proto_item *cont_item; guint length; - length = tvb_length_remaining(tvb, offset); + length = tvb_captured_length_remaining(tvb, offset); if (length == 0) { proto_tree_add_expert(tree, pinfo, &ei_btsdp_continuation_state_none, tvb, offset, -1); } else if (length > 17) { @@ -1285,7 +1285,7 @@ reassemble_continuation_state(tvbuff_t *tvb, packet_info *pinfo, if (is_first) *is_first = TRUE; if (is_continued) *is_continued = TRUE; - length = tvb_length_remaining(tvb, offset); + length = tvb_captured_length_remaining(tvb, offset); if (length == 0) { return offset; } else if (length > 17) { @@ -1709,7 +1709,7 @@ dissect_data_element(proto_tree *tree, proto_tree **next_tree, } pitem = proto_tree_add_item(ptree, hf_data_element_value, tvb, offset, 0, ENC_NA); - if (length > tvb_length_remaining(tvb, offset)) { + if (length > tvb_captured_length_remaining(tvb, offset)) { expert_add_info(pinfo, pitem, &ei_data_element_value_large); length = 0; } @@ -3928,7 +3928,7 @@ dissect_sdp_service_search_response(proto_tree *tree, tvbuff_t *tvb, gint new_offset = 0; gint new_length; - new_length = tvb_length(new_tvb); + new_length = tvb_captured_length(new_tvb); reassembled_item = proto_tree_add_item(tree, (is_continued) ? hf_partial_record_handle_list : hf_reassembled_record_handle_list,new_tvb, 0, new_length, ENC_NA); proto_item_append_text(reassembled_item, " [count = %u]", new_length / 4); @@ -4027,7 +4027,7 @@ dissect_sdp_service_attribute_response(proto_tree *tree, tvbuff_t *tvb, reassembled_item = proto_tree_add_item(tree, (is_continued) ? hf_partial_attribute_list : hf_reassembled_attribute_list, - new_tvb, 0, tvb_length(new_tvb), ENC_NA); + new_tvb, 0, tvb_captured_length(new_tvb), ENC_NA); reassembled_tree = proto_item_add_subtree(reassembled_item, ett_btsdp_reassembled); PROTO_ITEM_SET_GENERATED(reassembled_item); @@ -4152,13 +4152,13 @@ dissect_sdp_service_search_attribute_response(proto_tree *tree, tvbuff_t *tvb, reassembled_item = proto_tree_add_item(tree, (is_continued) ? hf_partial_attribute_list : hf_reassembled_attribute_list, - new_tvb, 0, tvb_length(new_tvb), ENC_NA); + new_tvb, 0, tvb_captured_length(new_tvb), ENC_NA); reassembled_tree = proto_item_add_subtree(reassembled_item, ett_btsdp_reassembled); PROTO_ITEM_SET_GENERATED(reassembled_item); if (!is_continued) dissect_sdp_service_attribute_list_array(reassembled_tree, new_tvb, 0, - pinfo, tvb_length(new_tvb), &uuid, l2cap_data); + pinfo, tvb_captured_length(new_tvb), &uuid, l2cap_data); } return offset; |