From 95f138e407f2afa9a3b26859116a91b99ff25fbc Mon Sep 17 00:00:00 2001 From: AndersBroman Date: Thu, 16 Apr 2015 13:31:57 +0200 Subject: Replace deprecated tvb_length APIs Change-Id: Idfd3bed012e823de544fe4de483c8f095fc7c65d Reviewed-on: https://code.wireshark.org/review/8086 Reviewed-by: Anders Broman --- epan/dissectors/packet-carp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'epan/dissectors/packet-carp.c') diff --git a/epan/dissectors/packet-carp.c b/epan/dissectors/packet-carp.c index 8975ad2a0a..8c9511370b 100644 --- a/epan/dissectors/packet-carp.c +++ b/epan/dissectors/packet-carp.c @@ -63,7 +63,7 @@ test_carp_packet(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree _U_, vo /* First some simple check if the data is really CARP */ - if (tvb_length(tvb) < 36) + if (tvb_captured_length(tvb) < 36) return FALSE; /* Version must be 1 or 2, type must be in carp_type_vals */ @@ -136,7 +136,7 @@ dissect_carp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) cksum = tvb_get_ntohs(tvb, offset); ti = proto_tree_add_item(carp_tree, hf_carp_checksum, tvb, offset, 2, ENC_BIG_ENDIAN); carp_len = tvb_reported_length(tvb); - if (!pinfo->fragmented && tvb_length(tvb) >= carp_len) { + if (!pinfo->fragmented && tvb_captured_length(tvb) >= carp_len) { /* The packet isn't part of a fragmented datagram and isn't truncated, so we can checksum it. */ SET_CKSUM_VEC_TVB(cksum_vec[0], tvb, 0, carp_len); -- cgit v1.2.3