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-turnchannel.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-turnchannel.c')
| -rw-r--r-- | epan/dissectors/packet-turnchannel.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/epan/dissectors/packet-turnchannel.c b/epan/dissectors/packet-turnchannel.c index 50bcb55b27..a63343b1ae 100644 --- a/epan/dissectors/packet-turnchannel.c +++ b/epan/dissectors/packet-turnchannel.c @@ -66,7 +66,7 @@ dissect_turnchannel_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *turnchannel_tree; heur_dtbl_entry_t *hdtbl_entry; - len = tvb_length(tvb); + len = tvb_captured_length(tvb); /* First, make sure we have enough data to do the check. */ if (len < TURNCHANNEL_HDR_LEN) { return 0; @@ -100,7 +100,7 @@ dissect_turnchannel_message(tvbuff_t *tvb, packet_info *pinfo, tvbuff_t *next_tvb; guint reported_len, new_len; - new_len = tvb_length_remaining(tvb, TURNCHANNEL_HDR_LEN); + new_len = tvb_captured_length_remaining(tvb, TURNCHANNEL_HDR_LEN); reported_len = tvb_reported_length_remaining(tvb, TURNCHANNEL_HDR_LEN); if (data_len < reported_len) { @@ -116,7 +116,7 @@ dissect_turnchannel_message(tvbuff_t *tvb, packet_info *pinfo, } } - return tvb_length(tvb); + return tvb_captured_length(tvb); } static guint @@ -131,7 +131,7 @@ dissect_turnchannel_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, voi { tcp_dissect_pdus(tvb, pinfo, tree, TRUE, TURNCHANNEL_HDR_LEN, get_turnchannel_message_len, dissect_turnchannel_message, data); - return tvb_length(tvb); + return tvb_captured_length(tvb); } @@ -142,7 +142,7 @@ dissect_turnchannel_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, vo guint16 channel_id; guint16 data_len; - len = tvb_length(tvb); + len = tvb_captured_length(tvb); /* First, make sure we have enough data to do the check. */ if (len < TURNCHANNEL_HDR_LEN) { return FALSE; |