diff options
Diffstat (limited to 'epan/dissectors/packet-bthfp.c')
| -rw-r--r-- | epan/dissectors/packet-bthfp.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/epan/dissectors/packet-bthfp.c b/epan/dissectors/packet-bthfp.c index b66f4d10d8..7375ef6057 100644 --- a/epan/dissectors/packet-bthfp.c +++ b/epan/dissectors/packet-bthfp.c @@ -885,9 +885,9 @@ dissect_at_command(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboolean quotation; gboolean next; - length = tvb_length_remaining(tvb, offset); + length = tvb_captured_length_remaining(tvb, offset); if (length <= 0) - return tvb_length(tvb); + return tvb_captured_length(tvb); if (!command_number) { proto_tree_add_item(tree, hf_data, tvb, offset, length, ENC_NA | ENC_ASCII); @@ -1120,7 +1120,7 @@ dissect_at_command(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, i_char += i_char_fix; proto_item_set_len(command_item, i_char); } else { - length = tvb_length_remaining(tvb, offset); + length = tvb_captured_length_remaining(tvb, offset); if (length < 0) length = 0; proto_item_set_len(command_item, length); @@ -1268,9 +1268,9 @@ dissect_bthfp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) if (role == ROLE_UNKNOWN) { col_append_fstr(pinfo->cinfo, COL_INFO, "Data: %s", - tvb_format_text(tvb, 0, tvb_length(tvb))); + tvb_format_text(tvb, 0, tvb_captured_length(tvb))); proto_tree_add_item(main_tree, hf_data, tvb, 0, -1, ENC_NA | ENC_ASCII); - return tvb_length(tvb); + return tvb_captured_length(tvb); } /* save fragments */ @@ -1337,7 +1337,7 @@ dissect_bthfp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) fragment->role = role; fragment->index = previous_fragment ? previous_fragment->index + previous_fragment->length : 0; fragment->reassemble_state = REASSEMBLE_FRAGMENT; - fragment->length = tvb_length(tvb); + fragment->length = tvb_captured_length(tvb); fragment->data = (guint8 *) wmem_alloc(wmem_file_scope(), fragment->length); fragment->previous_fragment = previous_fragment; tvb_memcpy(tvb, fragment->data, offset, fragment->length); @@ -1345,7 +1345,7 @@ dissect_bthfp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) wmem_tree_insert32_array(fragments, key, fragment); /* Detect reassemble end character: \r for HS or \n for AG */ - length = tvb_length(tvb); + length = tvb_captured_length(tvb); at_stream = tvb_get_string_enc(wmem_packet_scope(), tvb, 0, length, ENC_ASCII); reassemble_start_offset = 0; @@ -1494,7 +1494,7 @@ dissect_bthfp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) if (fragment->index > 0 && fragment->length > 0) { proto_tree_add_item(main_tree, hf_fragment, tvb, offset, - tvb_length_remaining(tvb, offset), ENC_ASCII | ENC_NA); + tvb_captured_length_remaining(tvb, offset), ENC_ASCII | ENC_NA); reassembled_tvb = tvb_new_child_real_data(tvb, at_data, fragment->index + fragment->length, fragment->index + fragment->length); add_new_data_source(pinfo, reassembled_tvb, "Reassembled HFP"); @@ -1504,24 +1504,24 @@ dissect_bthfp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) if (reassembled_tvb) { guint reassembled_offset = 0; - while (tvb_length(reassembled_tvb) > reassembled_offset) { + while (tvb_captured_length(reassembled_tvb) > reassembled_offset) { reassembled_offset = dissect_at_command(reassembled_tvb, pinfo, main_tree, reassembled_offset, role, command_number); command_number += 1; } } else { - while (tvb_length(tvb) > (guint) offset) { + while (tvb_captured_length(tvb) > (guint) offset) { offset = dissect_at_command(tvb, pinfo, main_tree, offset, role, command_number); command_number += 1; } } } else { col_append_fstr(pinfo->cinfo, COL_INFO, "Fragment: %s", - tvb_format_text_wsp(tvb, offset, tvb_length_remaining(tvb, offset))); + tvb_format_text_wsp(tvb, offset, tvb_captured_length_remaining(tvb, offset))); pitem = proto_tree_add_item(main_tree, hf_fragmented, tvb, 0, 0, ENC_NA); PROTO_ITEM_SET_GENERATED(pitem); proto_tree_add_item(main_tree, hf_fragment, tvb, offset, - tvb_length_remaining(tvb, offset), ENC_ASCII | ENC_NA); + tvb_captured_length_remaining(tvb, offset), ENC_ASCII | ENC_NA); } return offset; |