diff options
Diffstat (limited to 'epan/dissectors/packet-bthci_cmd.c')
| -rw-r--r-- | epan/dissectors/packet-bthci_cmd.c | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/epan/dissectors/packet-bthci_cmd.c b/epan/dissectors/packet-bthci_cmd.c index d50ad2f276..0060f91a78 100644 --- a/epan/dissectors/packet-bthci_cmd.c +++ b/epan/dissectors/packet-bthci_cmd.c @@ -1879,7 +1879,7 @@ dissect_link_control_cmd(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree_add_item(tree, hf_bthci_cmd_dedicated_amp_key_type, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset++; proto_tree_add_item(tree, hf_bthci_cmd_dedicated_amp_key, tvb, offset, -1, ENC_NA); - offset+=tvb_length_remaining(tvb, offset); + offset+=tvb_reported_length_remaining(tvb, offset); break; case 0x0037: /* Disconnect Physical Link */ @@ -1931,12 +1931,12 @@ dissect_link_control_cmd(tvbuff_t *tvb, int offset, packet_info *pinfo, case 0x0044: /* Receive Synchronization Train */ /* TODO: Implement above cases */ proto_tree_add_expert(tree, pinfo, &ei_command_undecoded, tvb, offset, -1); - offset += tvb_length_remaining(tvb, offset); + offset += tvb_reported_length_remaining(tvb, offset); break; default: proto_tree_add_expert(tree, pinfo, &ei_command_unknown_command, tvb, offset, -1); - offset += tvb_length_remaining(tvb, offset); + offset += tvb_reported_length_remaining(tvb, offset); } return offset; @@ -2081,7 +2081,7 @@ dissect_link_policy_cmd(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto default: proto_tree_add_expert(tree, pinfo, &ei_command_unknown_command, tvb, offset, -1); - offset += tvb_length_remaining(tvb, offset); + offset += tvb_reported_length_remaining(tvb, offset); } return offset; @@ -2681,12 +2681,12 @@ dissect_host_controller_baseband_cmd(tvbuff_t *tvb, int offset, packet_info *pin case 0x078: /* Write Synchronization Train Parameters */ /* TODO: Implement above cases */ proto_tree_add_expert(tree, pinfo, &ei_command_undecoded, tvb, offset, -1); - offset += tvb_length_remaining(tvb, offset); + offset += tvb_reported_length_remaining(tvb, offset); break; default: proto_tree_add_expert(tree, pinfo, &ei_command_unknown_command, tvb, offset, -1); - offset += tvb_length_remaining(tvb, offset); + offset += tvb_reported_length_remaining(tvb, offset); } return offset; @@ -2716,7 +2716,7 @@ dissect_informational_parameters_cmd(tvbuff_t *tvb, int offset, packet_info *pin default: proto_tree_add_expert(tree, pinfo, &ei_command_unknown_command, tvb, offset, -1); - offset += tvb_length_remaining(tvb, offset); + offset += tvb_reported_length_remaining(tvb, offset); } return offset; @@ -2765,7 +2765,7 @@ dissect_status_parameters_cmd(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree_add_item(tree, hf_bthci_cmd_amp_remaining_assoc_length, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset+=2; proto_tree_add_item(tree, hf_bthci_cmd_amp_assoc_fragment, tvb, offset, -1, ENC_NA); - offset+=tvb_length_remaining(tvb, offset); + offset+=tvb_reported_length_remaining(tvb, offset); break; case 0x000D: /* Set Triggered Clock Capture */ @@ -2775,12 +2775,12 @@ dissect_status_parameters_cmd(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, case 0x000C: /* Get MWS Transport Layer Configuration */ /* TODO: Implement above cases */ proto_tree_add_expert(tree, pinfo, &ei_command_undecoded, tvb, offset, -1); - offset += tvb_length_remaining(tvb, offset); + offset += tvb_reported_length_remaining(tvb, offset); break; default: proto_tree_add_expert(tree, pinfo, &ei_command_unknown_command, tvb, offset, -1); - offset += tvb_length_remaining(tvb, offset); + offset += tvb_reported_length_remaining(tvb, offset); } return offset; @@ -2817,12 +2817,12 @@ dissect_testing_cmd(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tre case 0x009: /* AMP Test */ /* TODO: Implement above cases */ proto_tree_add_expert(tree, pinfo, &ei_command_undecoded, tvb, offset, -1); - offset += tvb_length_remaining(tvb, offset); + offset += tvb_reported_length_remaining(tvb, offset); break; default: proto_tree_add_expert(tree, pinfo, &ei_command_unknown_command, tvb, offset, -1); - offset += tvb_length_remaining(tvb, offset); + offset += tvb_reported_length_remaining(tvb, offset); } return offset; @@ -3043,7 +3043,7 @@ dissect_le_cmd(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, default: proto_tree_add_expert(tree, pinfo, &ei_command_unknown_command, tvb, offset, -1); - offset += tvb_length_remaining(tvb, offset); + offset += tvb_reported_length_remaining(tvb, offset); } return offset; @@ -3210,14 +3210,14 @@ dissect_bthci_cmd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat default: proto_tree_add_expert(bthci_cmd_tree, pinfo, &ei_command_unknown_command, tvb, 3, -1); - offset += tvb_length_remaining(tvb, offset); + offset += tvb_reported_length_remaining(tvb, offset); break; } } - if (tvb_length_remaining(tvb, offset) > 0) { + if (tvb_reported_length_remaining(tvb, offset) > 0) { proto_tree_add_expert(bthci_cmd_tree, pinfo, &ei_command_parameter_unexpected, tvb, offset, -1); - /*offset += tvb_length_remaining(tvb, offset);*/ + offset += tvb_reported_length_remaining(tvb, offset); } return offset; @@ -4744,7 +4744,7 @@ dissect_eir_ad_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) gint64 end_offset; guint i_uuid; - data_size = tvb_length(tvb); + data_size = tvb_reported_length(tvb); while (offset < data_size) { length = tvb_get_guint8(tvb, offset); @@ -5111,9 +5111,9 @@ dissect_eir_ad_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } } - if (tvb_length_remaining(tvb, offset) > 0) { - proto_tree_add_item(tree, hf_btcommon_eir_ad_unused, tvb, offset, -1, ENC_NA); - offset = tvb_length(tvb); + if (tvb_reported_length_remaining(tvb, offset) > 0) { + proto_tree_add_item(tree, hf_btcommon_eir_ad_unused, tvb, offset, tvb_reported_length_remaining(tvb, offset), ENC_NA); + offset = tvb_reported_length(tvb); } return offset + data_size; |