diff options
| author | Evan Huus <eapache@gmail.com> | 2015-06-23 17:22:18 -0700 |
|---|---|---|
| committer | Evan Huus <eapache@gmail.com> | 2015-06-24 00:22:50 +0000 |
| commit | f92fab41a5266cb380c443882ce5efd5a7ee3318 (patch) | |
| tree | 13e190875507342a2c5847b2629a6dab44d2d61d /epan/dissectors/packet-iwarp-mpa.c | |
| parent | ad784bc7ce29c2d8ad64bca73e4863a6353c578f (diff) | |
Remove a bunch more deprecated tvb_length calls
(getting really close!)
Change-Id: Ibf22a5f727c4dc0070b78144a4b0ab8e0c5e1bce
Reviewed-on: https://code.wireshark.org/review/9081
Reviewed-by: Evan Huus <eapache@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-iwarp-mpa.c')
| -rw-r--r-- | epan/dissectors/packet-iwarp-mpa.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-iwarp-mpa.c b/epan/dissectors/packet-iwarp-mpa.c index e07cf9ec1f..16b6998d83 100644 --- a/epan/dissectors/packet-iwarp-mpa.c +++ b/epan/dissectors/packet-iwarp-mpa.c @@ -307,7 +307,7 @@ remove_markers(tvbuff_t *tvb, packet_info *pinfo, guint32 marker_offset, DISSECTOR_ASSERT(num_markers > 0); DISSECTOR_ASSERT(orig_length > MPA_MARKER_LEN * num_markers); - DISSECTOR_ASSERT(tvb_length(tvb) == orig_length); + DISSECTOR_ASSERT(tvb_captured_length(tvb) == orig_length); /* allocate memory for the marker-free buffer */ mfree_buff_length = orig_length - (MPA_MARKER_LEN * num_markers); @@ -793,7 +793,7 @@ dissect_iwarp_mpa(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat tcpinfo = (struct tcpinfo *)data; /* FPDU */ - if (tvb_length(tvb) >= MPA_SMALLEST_FPDU_LEN && is_mpa_fpdu(pinfo)) { + if (tvb_captured_length(tvb) >= MPA_SMALLEST_FPDU_LEN && is_mpa_fpdu(pinfo)) { conversation = find_conversation(pinfo->fd->num, &pinfo->src, &pinfo->dst, pinfo->ptype, pinfo->srcport, pinfo->destport, 0); @@ -850,7 +850,7 @@ dissect_iwarp_mpa(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat } /* MPA REQUEST or MPA REPLY */ - if (tvb_length(tvb) >= MPA_REQ_REP_FRAME_HEADER_LEN) { + if (tvb_captured_length(tvb) >= MPA_REQ_REP_FRAME_HEADER_LEN) { if (is_mpa_req(tvb, pinfo)) return dissect_mpa_req_rep(tvb, pinfo, tree, MPA_REQUEST_FRAME); else if (is_mpa_rep(tvb, pinfo)) |