Revert "Fixup: tvb_* -> tvb_captured"

[metze/wireshark/wip.git] / epan / dissectors / packet-teredo.c

diff --git a/epan/dissectors/packet-teredo.c b/epan/dissectors/packet-teredo.c
index ff398c172edf4070af7c013659eadf47a99fa802..1ae394d8c951969d44e7faf7a10d3ed21314c80e 100644 (file)
--- 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);