diff options
Diffstat (limited to 'epan/dissectors/packet-bthid.c')
| -rw-r--r-- | epan/dissectors/packet-bthid.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/epan/dissectors/packet-bthid.c b/epan/dissectors/packet-bthid.c index c888237726..5b3b59e3df 100644 --- a/epan/dissectors/packet-bthid.c +++ b/epan/dissectors/packet-bthid.c @@ -663,20 +663,20 @@ dissect_hid_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, offset += 1; /* not really in HID Specification */ - if (tvb_length_remaining(tvb, offset)) { + if (tvb_captured_length_remaining(tvb, offset)) { proto_tree_add_item(tree, hf_bthid_data_mouse_horizontal_scroll_wheel, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; } /* not really in HID Specification */ - if (tvb_length_remaining(tvb, offset)) { + if (tvb_captured_length_remaining(tvb, offset)) { proto_tree_add_item(tree, hf_bthid_data_mouse_vertical_scroll_wheel, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; } - if (tvb_length_remaining(tvb, offset)) { + if (tvb_captured_length_remaining(tvb, offset)) { proto_tree_add_item(tree, hf_bthid_data, tvb, offset, -1, ENC_NA); - offset += tvb_length_remaining(tvb, offset); + offset += tvb_captured_length_remaining(tvb, offset); } break; } @@ -751,8 +751,8 @@ dissect_bthid(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U Global Items are declared in the report descriptor, and in Boot Protocol Mode. Otherwise the field does not exist." */ - if (((parameter >> 3) && tvb_length_remaining(tvb, offset) >= 3) || - (!(parameter >> 3) && tvb_length_remaining(tvb, offset) >= 1)) { + if (((parameter >> 3) && tvb_captured_length_remaining(tvb, offset) >= 3) || + (!(parameter >> 3) && tvb_captured_length_remaining(tvb, offset) >= 1)) { proto_tree_add_item(bthid_tree, hf_bthid_report_id, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; } @@ -772,7 +772,7 @@ dissect_bthid(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U /* playload */ proto_tree_add_item(bthid_tree, hf_bthid_data, tvb, offset, -1, ENC_NA); - offset += tvb_length_remaining(tvb, offset); + offset += tvb_captured_length_remaining(tvb, offset); break; case 0x06: /* GET_PROTOCOL */ proto_tree_add_item(bthid_tree, hf_bthid_parameter_reserved, tvb, offset, 1, ENC_BIG_ENDIAN); |