diff options
| author | Dario Lombardo <lomato@gmail.com> | 2014-06-17 17:45:00 +0200 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2014-06-18 14:14:58 +0000 |
| commit | 246fe2ca4c67d8c98caa84e2f57694f6322e2f96 (patch) | |
| tree | 5f8651517a3423cce11c50e18371d8a73c3c7665 /epan/dissectors/packet-ubertooth.c | |
| parent | 971ffd683ea23362bd8009567ff7860371e6e2cc (diff) | |
Fixup: tvb_* -> tvb_captured
Change-Id: I9209c1271967405c34c1b6fa43e1726a4d3a5a3f
Reviewed-on: https://code.wireshark.org/review/2377
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-ubertooth.c')
| -rw-r--r-- | epan/dissectors/packet-ubertooth.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/epan/dissectors/packet-ubertooth.c b/epan/dissectors/packet-ubertooth.c index 4ac66a3d62..74866e9707 100644 --- a/epan/dissectors/packet-ubertooth.c +++ b/epan/dissectors/packet-ubertooth.c @@ -1250,9 +1250,9 @@ dissect_usb_rx_packet(proto_tree *main_tree, proto_tree *tree, packet_info *pinf call_dissector(btle_handle, next_tvb, pinfo, main_tree); offset += length; - if (tvb_length_remaining(tvb, offset) > 0) { + if (tvb_captured_length_remaining(tvb, offset) > 0) { proto_tree_add_item(data_tree, hf_reserved, tvb, offset, -1, ENC_NA); - offset += tvb_length_remaining(tvb, offset); + offset += tvb_captured_length_remaining(tvb, offset); } break; @@ -1558,9 +1558,9 @@ dissect_ubertooth(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat break; } - if (tvb_length_remaining(tvb, offset) > 0) { - proto_tree_add_expert(main_tree, pinfo, &ei_unexpected_data, tvb, offset, tvb_length_remaining(tvb, offset)); - offset = tvb_length(tvb); + if (tvb_captured_length_remaining(tvb, offset) > 0) { + proto_tree_add_expert(main_tree, pinfo, &ei_unexpected_data, tvb, offset, tvb_captured_length_remaining(tvb, offset)); + offset = tvb_captured_length(tvb); } /* Save request info (command_data) */ @@ -1602,11 +1602,11 @@ dissect_ubertooth(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat if (!command_data) { col_append_str(pinfo->cinfo, COL_INFO, "Response: Unknown"); - proto_tree_add_expert(main_tree, pinfo, &ei_unknown_data, tvb, offset, tvb_length_remaining(tvb, offset)); + proto_tree_add_expert(main_tree, pinfo, &ei_unknown_data, tvb, offset, tvb_captured_length_remaining(tvb, offset)); pinfo->p2p_dir = p2p_dir_save; - return tvb_length(tvb); + return tvb_captured_length(tvb); } col_append_fstr(pinfo->cinfo, COL_INFO, "Response: %s", @@ -1621,7 +1621,7 @@ dissect_ubertooth(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat case 27: /* Spectrum Analyzer */ if (usb_conv_info->transfer_type == URB_BULK) { - while (tvb_length_remaining(tvb, offset) > 0) { + while (tvb_captured_length_remaining(tvb, offset) > 0) { offset = dissect_usb_rx_packet(tree, main_tree, pinfo, tvb, offset, command_response); } break; @@ -1660,9 +1660,9 @@ dissect_ubertooth(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat case 54: /* BTLE Slave */ case 56: /* BTLE Set Target */ proto_tree_add_expert(command_tree, pinfo, &ei_unexpected_response, tvb, offset, 0); - if (tvb_length_remaining(tvb, offset) > 0) { + if (tvb_captured_length_remaining(tvb, offset) > 0) { proto_tree_add_expert(main_tree, pinfo, &ei_unknown_data, tvb, offset, -1); - offset = tvb_length(tvb); + offset = tvb_captured_length(tvb); } break; case 3: /* Get User LED */ @@ -1818,7 +1818,7 @@ dissect_ubertooth(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat break; case 49: /* Poll */ - if (tvb_length_remaining(tvb, offset) == 1) { + if (tvb_captured_length_remaining(tvb, offset) == 1) { proto_tree_add_item(main_tree, hf_reserved, tvb, offset, 1, ENC_NA); offset += 1; break; @@ -1856,9 +1856,9 @@ dissect_ubertooth(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat break; } - if (tvb_length_remaining(tvb, offset) > 0) { + if (tvb_captured_length_remaining(tvb, offset) > 0) { proto_tree_add_expert(main_tree, pinfo, &ei_unknown_data, tvb, offset, -1); - offset = tvb_length(tvb); + offset = tvb_captured_length(tvb); } pinfo->p2p_dir = p2p_dir_save; |