diff options
Diffstat (limited to 'epan/dissectors/packet-btle.c')
| -rw-r--r-- | epan/dissectors/packet-btle.c | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/epan/dissectors/packet-btle.c b/epan/dissectors/packet-btle.c index 26f3178a6e..a5fb530f57 100644 --- a/epan/dissectors/packet-btle.c +++ b/epan/dissectors/packet-btle.c @@ -449,12 +449,12 @@ dissect_btle(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) p_add_proto_data(wmem_file_scope(), pinfo, proto_bluetooth, BLUETOOTH_DATA_DST, addr); } - if (tvb_length_remaining(tvb, offset) > 3) { - next_tvb = tvb_new_subset_length(tvb, offset, tvb_length_remaining(tvb, offset) - 3); + if (tvb_reported_length_remaining(tvb, offset) > 3) { + next_tvb = tvb_new_subset_length(tvb, offset, tvb_reported_length_remaining(tvb, offset) - 3); call_dissector(btcommon_ad_handle, next_tvb, pinfo, btle_tree); } - offset += tvb_length_remaining(tvb, offset) - 3; + offset += tvb_reported_length_remaining(tvb, offset) - 3; break; case 0x01: /* ADV_DIRECT_IND */ @@ -530,15 +530,15 @@ dissect_btle(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) p_add_proto_data(wmem_file_scope(), pinfo, proto_bluetooth, BLUETOOTH_DATA_DST, addr); } - sub_item = proto_tree_add_item(btle_tree, hf_scan_response_data, tvb, offset, tvb_length_remaining(tvb, offset) - 3, ENC_NA); + sub_item = proto_tree_add_item(btle_tree, hf_scan_response_data, tvb, offset, tvb_reported_length_remaining(tvb, offset) - 3, ENC_NA); sub_tree = proto_item_add_subtree(sub_item, ett_scan_response_data); - if (tvb_length_remaining(tvb, offset) > 3) { - next_tvb = tvb_new_subset_length(tvb, offset, tvb_length_remaining(tvb, offset) - 3); + if (tvb_reported_length_remaining(tvb, offset) > 3) { + next_tvb = tvb_new_subset_length(tvb, offset, tvb_reported_length_remaining(tvb, offset) - 3); call_dissector(btcommon_ad_handle, next_tvb, pinfo, sub_tree); } - offset += tvb_length_remaining(tvb, offset) - 3; + offset += tvb_reported_length_remaining(tvb, offset) - 3; break; case 0x05: /* CONNECT_REQ */ @@ -625,9 +625,9 @@ dissect_btle(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) break; default: - if (tvb_length_remaining(tvb, offset) > 3) { - proto_tree_add_expert(btle_tree, pinfo, &ei_unknown_data, tvb, offset, tvb_length_remaining(tvb, offset) - 3); - offset += tvb_length_remaining(tvb, offset) - 3; + if (tvb_reported_length_remaining(tvb, offset) > 3) { + proto_tree_add_expert(btle_tree, pinfo, &ei_unknown_data, tvb, offset, tvb_reported_length_remaining(tvb, offset) - 3); + offset += tvb_reported_length_remaining(tvb, offset) - 3; } } } else { /* data PDU */ @@ -758,9 +758,9 @@ dissect_btle(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) case 0x0B: /* LL_PAUSE_ENC_RSP */ case 0x12: /* LL_PING_REQ */ case 0x13: /* LL_PING_RSP */ - if (tvb_length_remaining(tvb, offset) > 3) { - proto_tree_add_expert(btle_tree, pinfo, &ei_unknown_data, tvb, offset, tvb_length_remaining(tvb, offset) - 3); - offset += tvb_length_remaining(tvb, offset) - 3; + if (tvb_reported_length_remaining(tvb, offset) > 3) { + proto_tree_add_expert(btle_tree, pinfo, &ei_unknown_data, tvb, offset, tvb_reported_length_remaining(tvb, offset) - 3); + offset += tvb_reported_length_remaining(tvb, offset) - 3; } break; @@ -905,17 +905,17 @@ dissect_btle(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) break; default: - if (tvb_length_remaining(tvb, offset) > 3) { - proto_tree_add_expert(btle_tree, pinfo, &ei_unknown_data, tvb, offset, tvb_length_remaining(tvb, offset) - 3); - offset += tvb_length_remaining(tvb, offset) - 3; + if (tvb_reported_length_remaining(tvb, offset) > 3) { + proto_tree_add_expert(btle_tree, pinfo, &ei_unknown_data, tvb, offset, tvb_reported_length_remaining(tvb, offset) - 3); + offset += tvb_reported_length_remaining(tvb, offset) - 3; } } break; default: - if (tvb_length_remaining(tvb, offset) > 3) { - proto_tree_add_expert(btle_tree, pinfo, &ei_unknown_data, tvb, offset, tvb_length_remaining(tvb, offset) - 3); - offset += tvb_length_remaining(tvb, offset) - 3; + if (tvb_reported_length_remaining(tvb, offset) > 3) { + proto_tree_add_expert(btle_tree, pinfo, &ei_unknown_data, tvb, offset, tvb_reported_length_remaining(tvb, offset) - 3); + offset += tvb_reported_length_remaining(tvb, offset) - 3; } } |