aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-gmhdr.c
diff options
context:
space:
mode:
authorDario Lombardo <lomato@gmail.com>2014-06-17 17:45:00 +0200
committerAnders Broman <a.broman58@gmail.com>2014-06-18 14:14:58 +0000
commit246fe2ca4c67d8c98caa84e2f57694f6322e2f96 (patch)
tree5f8651517a3423cce11c50e18371d8a73c3c7665 /epan/dissectors/packet-gmhdr.c
parent971ffd683ea23362bd8009567ff7860371e6e2cc (diff)
Fixup: tvb_* -> tvb_captured
Change-Id: I9209c1271967405c34c1b6fa43e1726a4d3a5a3f Reviewed-on: https://code.wireshark.org/review/2377 Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-gmhdr.c')
-rw-r--r--epan/dissectors/packet-gmhdr.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-gmhdr.c b/epan/dissectors/packet-gmhdr.c
index 018defa87e..bf07ffd282 100644
--- a/epan/dissectors/packet-gmhdr.c
+++ b/epan/dissectors/packet-gmhdr.c
@@ -254,7 +254,7 @@ dissect_gmhdr(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
is_802_2 = TRUE;
/* Don't throw an exception for this check (even a BoundsError) */
- if (tvb_length_remaining(tvb, offset) >= 2) {
+ if (tvb_captured_length_remaining(tvb, offset) >= 2) {
if (tvb_get_ntohs(tvb, offset) == 0xffff) {
is_802_2 = FALSE;
}
@@ -294,7 +294,7 @@ dissect_gmtimestamp_trailer(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *t
/* See if this packet has a Gigamon trailer, if yes, then decode it */
/* (Don't throw any exceptions while checking for the trailer). */
- tvblen = tvb_length(tvb); /* end+1 */
+ tvblen = tvb_captured_length(tvb); /* end+1 */
if (tvblen < trailer_len)
return 0;
@@ -343,7 +343,7 @@ dissect_gmtrailer(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void
/* See if this packet has a Gigamon trailer, if yes, then decode it */
/* (Don't throw any exceptions while checking for the trailer). */
- tvblen = tvb_length(tvb); /* end+1 */
+ tvblen = tvb_captured_length(tvb); /* end+1 */
if (tvblen < 5)
return 0;
extra_trailer = 0;