diff options
author | Evan Huus <eapache@gmail.com> | 2015-06-22 09:59:50 -0700 |
---|---|---|
committer | Evan Huus <eapache@gmail.com> | 2015-06-22 20:43:34 +0000 |
commit | be6fb606915f4ccc68a62195619d176cd62f79f9 (patch) | |
tree | edd4b63c557923d1196dd779ac91ee1e1bae90ef /epan/dissectors/packet-tpkt.c | |
parent | 45872b9f7bf10476e48187f4b699c6f44943f22a (diff) |
Remove a bunch of deprecated tvb_length calls
Change-Id: I9362e0fdc4519ba5f3d656152966e7030f478839
Reviewed-on: https://code.wireshark.org/review/9022
Petri-Dish: Evan Huus <eapache@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Evan Huus <eapache@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-tpkt.c')
-rw-r--r-- | epan/dissectors/packet-tpkt.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-tpkt.c b/epan/dissectors/packet-tpkt.c index feac15b7b2..cbb5e920d3 100644 --- a/epan/dissectors/packet-tpkt.c +++ b/epan/dissectors/packet-tpkt.c @@ -80,7 +80,7 @@ is_tpkt(tvbuff_t *tvb, int min_len) return -1; /* There should at least be 4 bytes left in the frame */ - if (tvb_length(tvb) < 4) + if (tvb_captured_length(tvb) < 4) return -1; /* there aren't */ /* @@ -255,7 +255,7 @@ dissect_asciitpkt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, return; } - length_remaining = tvb_length_remaining(tvb, offset); + length_remaining = tvb_captured_length_remaining(tvb, offset); /* * Get the length from the TPKT header. @@ -401,7 +401,7 @@ dissect_tpkt_encap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, return; } - length_remaining = tvb_length_remaining(tvb, offset); + length_remaining = tvb_captured_length_remaining(tvb, offset); /* * Can we do reassembly? |