diff options
author | Michael Mann <mmann78@netscape.net> | 2014-06-19 17:18:16 +0000 |
---|---|---|
committer | Michael Mann <mmann78@netscape.net> | 2014-06-19 18:25:59 +0000 |
commit | 14824e6adf07a1c3cfb6537ce8723d873ecd0d0f (patch) | |
tree | bdf1b52ecffe7825d719f34fb4be63c8a60bd1b4 /epan/dissectors/packet-atm.c | |
parent | 3557ac4ec688b86ec7819005a3a181600e056251 (diff) |
Revert "Fixup: tvb_* -> tvb_captured"
https://www.wireshark.org/lists/wireshark-dev/201406/msg00131.html
This reverts commit 246fe2ca4c67d8c98caa84e2f57694f6322e2f96.
Change-Id: Ib24bae0198c13a84bd7f731bf4af921212109a8f
Reviewed-on: https://code.wireshark.org/review/2430
Reviewed-by: Michael Mann <mmann78@netscape.net>
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 0444334079..f3232b8435 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_captured_length(tvb); + length = tvb_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_captured_length(next_tvb) > 7) /* sizeof(octet) */ + if (tvb_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_captured_length_remaining(tvb, offset); + length = tvb_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_captured_length_remaining(tvb, offset); + length = tvb_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_captured_length(tvb); + return tvb_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_captured_length(tvb); + return tvb_length(tvb); } |