diff options
| author | AndersBroman <a.broman@bredband.net> | 2015-04-15 17:20:35 +0200 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2015-04-15 15:22:42 +0000 |
| commit | 05c0152370cbe084193ad2946e6fc96a1017c08e (patch) | |
| tree | 3214e835a86507969b9cf0a93391fcaa51e56c3a /epan/dissectors/packet-atm.c | |
| parent | d2e880eab134e4414b143b6e03767bf6424b749c (diff) | |
Replcae deprecated API tvb_length with tvb_reported_length or tvb_captured
length.
Change-Id: Id42f3409a32e202528d350f7afde7376e411fc51
Reviewed-on: https://code.wireshark.org/review/8076
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 50ac70f80a..d1cbedb12e 100644 --- a/epan/dissectors/packet-atm.c +++ b/epan/dissectors/packet-atm.c @@ -908,7 +908,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) { /* @@ -997,7 +997,7 @@ dissect_reassembled_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, } else { - if (tvb_length(next_tvb) > 7) /* sizeof(octet) */ + if (tvb_reported_length(next_tvb) > 7) /* sizeof(octet) */ { guint8 octet[8]; tvb_memcpy(next_tvb, octet, 0, sizeof(octet)); @@ -1521,7 +1521,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_reported_length_remaining(tvb, offset); crc10 = update_crc10_by_bytes_tvb(0, tvb, offset, length); offset += 2; @@ -1567,7 +1567,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_reported_length_remaining(tvb, offset); crc10 = update_crc10_by_bytes_tvb(0, tvb, offset, length); offset += 1; @@ -1666,7 +1666,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_reported_length(tvb); } static int @@ -1701,7 +1701,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_reported_length(tvb); } static void atm_prompt(packet_info *pinfo _U_, gchar* result) |