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-atm.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-atm.c')
| -rw-r--r-- | epan/dissectors/packet-atm.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/epan/dissectors/packet-atm.c b/epan/dissectors/packet-atm.c index f3232b8435..0444334079 100644 --- a/epan/dissectors/packet-atm.c +++ b/epan/dissectors/packet-atm.c @@ -1033,7 +1033,7 @@ dissect_reassembled_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, * succeeded. * Decode the trailer, if present, and then chop it off. */ - length = tvb_length(tvb); + length = tvb_captured_length(tvb); reported_length = tvb_reported_length(tvb); if ((reported_length % 48) == 0) { /* @@ -1151,7 +1151,7 @@ dissect_reassembled_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, break; default: - if (tvb_length(next_tvb) > 7) /* sizeof(octet) */ + if (tvb_captured_length(next_tvb) > 7) /* sizeof(octet) */ { guint8 octet[8]; tvb_memcpy(next_tvb, octet, 0, sizeof(octet)); @@ -1744,7 +1744,7 @@ dissect_atm_cell(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_tree_add_item(aal_tree, hf_atm_aal3_4_seq_num, tvb, offset, 2, ENC_BIG_ENDIAN); proto_tree_add_item(aal_tree, hf_atm_aal3_4_multiplex_id, tvb, offset, 2, ENC_BIG_ENDIAN); - length = tvb_length_remaining(tvb, offset); + length = tvb_captured_length_remaining(tvb, offset); crc10 = update_crc10_by_bytes(0, tvb_get_ptr(tvb, offset, length), length); offset += 2; @@ -1791,7 +1791,7 @@ dissect_atm_cell(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_tree_add_item(aal_tree, hf_atm_aal_oamcell_type_ft, tvb, offset, 1, ENC_BIG_ENDIAN); break; } - length = tvb_length_remaining(tvb, offset); + length = tvb_captured_length_remaining(tvb, offset); crc10 = update_crc10_by_bytes(0, tvb_get_ptr(tvb, offset, length), length); offset += 1; @@ -1891,7 +1891,7 @@ dissect_atm_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, dissect_reassembled_pdu(tvb, pinfo, tree, atm_tree, atm_ti, truncated, pwpd != NULL); } - return tvb_length(tvb); + return tvb_captured_length(tvb); } static int @@ -1926,7 +1926,7 @@ dissect_atm_oam_cell(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* } dissect_atm_cell(tvb, pinfo, tree, atm_tree, AAL_OAMCELL, FALSE, FALSE, pwpd); - return tvb_length(tvb); + return tvb_captured_length(tvb); } |