diff options
author | Michael Mann <mmann78@netscape.net> | 2014-06-19 17:18:16 +0000 |
---|---|---|
committer | Michael Mann <mmann78@netscape.net> | 2014-06-19 18:25:59 +0000 |
commit | 14824e6adf07a1c3cfb6537ce8723d873ecd0d0f (patch) | |
tree | bdf1b52ecffe7825d719f34fb4be63c8a60bd1b4 /epan/dissectors/packet-teredo.c | |
parent | 3557ac4ec688b86ec7819005a3a181600e056251 (diff) |
Revert "Fixup: tvb_* -> tvb_captured"
https://www.wireshark.org/lists/wireshark-dev/201406/msg00131.html
This reverts commit 246fe2ca4c67d8c98caa84e2f57694f6322e2f96.
Change-Id: Ib24bae0198c13a84bd7f731bf4af921212109a8f
Reviewed-on: https://code.wireshark.org/review/2430
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-teredo.c')
-rw-r--r-- | epan/dissectors/packet-teredo.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-teredo.c b/epan/dissectors/packet-teredo.c index ff398c172e..1ae394d8c9 100644 --- a/epan/dissectors/packet-teredo.c +++ b/epan/dissectors/packet-teredo.c @@ -265,7 +265,7 @@ dissect_teredo_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *d if (!global_teredo_heur) return FALSE; - if (tvb_captured_length_remaining(tvb, offset) < 40) + if (tvb_length_remaining(tvb, offset) < 40) return FALSE; val = tvb_get_ntohs(tvb, offset); @@ -282,7 +282,7 @@ dissect_teredo_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *d aulen = tvb_get_guint8(tvb, offset); offset += 10; - if (tvb_captured_length_remaining(tvb, offset) < idlen + aulen + 40) + if (tvb_length_remaining(tvb, offset) < idlen + aulen + 40) return FALSE; offset += idlen + aulen; @@ -294,7 +294,7 @@ dissect_teredo_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *d { offset += 8; - if (tvb_captured_length_remaining(tvb, offset) < 40) + if (tvb_length_remaining(tvb, offset) < 40) return FALSE; val = tvb_get_ntohs(tvb, offset); @@ -316,7 +316,7 @@ dissect_teredo_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *d if (val > 65467) return FALSE; /* length too big for Teredo */ - if (tvb_captured_length_remaining(tvb, offset) != val) + if (tvb_length_remaining(tvb, offset) != val) return FALSE; /* length mismatch */ dissect_teredo (tvb, pinfo, tree); |