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-mint.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-mint.c')
| -rw-r--r-- | epan/dissectors/packet-mint.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/epan/dissectors/packet-mint.c b/epan/dissectors/packet-mint.c index 4559132b1a..469d3fddd6 100644 --- a/epan/dissectors/packet-mint.c +++ b/epan/dissectors/packet-mint.c @@ -550,7 +550,7 @@ static int dissect_mint_control(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { guint32 offset = 0; - guint32 packet_length = tvb_captured_length_remaining(tvb, 0); + guint32 packet_length = tvb_length_remaining(tvb, 0); offset += dissect_mint_common(tvb, pinfo, tree, 0, packet_length, PORT_MINT_CONTROL_TUNNEL); @@ -562,7 +562,7 @@ static int dissect_mint_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { guint32 offset = 0; - guint32 packet_length = tvb_captured_length_remaining(tvb, 0); + guint32 packet_length = tvb_length_remaining(tvb, 0); offset += dissect_mint_common(tvb, pinfo, tree, 0, packet_length, PORT_MINT_DATA_TUNNEL); @@ -600,7 +600,7 @@ test_mint_control(tvbuff_t *tvb _U_) { #if 0 /* Minimum of 8 bytes, first byte (version) has value of 3 */ - if ( tvb_captured_length(tvb) < 8 + if ( tvb_length(tvb) < 8 || tvb_get_guint8(tvb, 0) != 3 /* || tvb_get_guint8(tvb, 2) != 0 || tvb_get_ntohs(tvb, 6) > tvb_reported_length(tvb) */ @@ -616,7 +616,7 @@ test_mint_data(tvbuff_t *tvb _U_) { #if 0 /* Minimum of 8 bytes, first byte (version) has value of 3 */ - if ( tvb_captured_length(tvb) < 8 + if ( tvb_length(tvb) < 8 || tvb_get_guint8(tvb, 0) != 3 /* || tvb_get_guint8(tvb, 2) != 0 || tvb_get_ntohs(tvb, 6) > tvb_reported_length(tvb) */ @@ -632,7 +632,7 @@ test_mint_eth(tvbuff_t *tvb _U_) { #if 0 /* Minimum of 8 bytes, first byte (version) has value of 3 */ - if ( tvb_captured_length(tvb) < 8 + if ( tvb_length(tvb) < 8 || tvb_get_guint8(tvb, 0) != 3 /* || tvb_get_guint8(tvb, 2) != 0 || tvb_get_ntohs(tvb, 6) > tvb_reported_length(tvb) */ |