From 14824e6adf07a1c3cfb6537ce8723d873ecd0d0f Mon Sep 17 00:00:00 2001 From: Michael Mann Date: Thu, 19 Jun 2014 17:18:16 +0000 Subject: 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 --- epan/dissectors/packet-gtp.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'epan/dissectors/packet-gtp.c') diff --git a/epan/dissectors/packet-gtp.c b/epan/dissectors/packet-gtp.c index e895620051..da422a680c 100644 --- a/epan/dissectors/packet-gtp.c +++ b/epan/dissectors/packet-gtp.c @@ -4593,7 +4593,7 @@ static int dissect_diameter_3gpp_qosprofile(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void *data _U_) { decode_qos_umts(tvb, 0, tree, "UMTS GTP QoS Profile", 3); - return tvb_captured_length(tvb); + return tvb_length(tvb); } static const gchar * @@ -5607,7 +5607,7 @@ gchar *dissect_radius_user_loc(proto_tree * tree, tvbuff_t * tvb, packet_info* p int offset = 0; guint8 geo_loc_type; - guint16 length = tvb_captured_length(tvb); + guint16 length = tvb_length(tvb); /* Geographic Location Type */ proto_tree_add_item(tree, hf_gtp_ext_geo_loc_type, tvb, offset, 1, ENC_BIG_ENDIAN); @@ -7814,7 +7814,7 @@ decode_gtp_unknown(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tr proto_tree_add_text(tree, tvb, offset, 1, "Unknown extension header"); - return tvb_captured_length_remaining(tvb, offset); + return tvb_length_remaining(tvb, offset); } static int @@ -8065,7 +8065,7 @@ dissect_gtp_common(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) if (ext_hdr_length == 0) { expert_add_info_format(pinfo, ext_hdr_len_item, &ei_gtp_ext_length_mal, "Extension header length is zero"); - return tvb_captured_length(tvb); + return tvb_length(tvb); } offset++; @@ -8236,7 +8236,7 @@ dissect_gtp_common(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) tap_queue_packet(gtpv1_tap,pinfo, gtp_hdr); - return tvb_captured_length(tvb); + return tvb_length(tvb); } static int @@ -8273,7 +8273,7 @@ dissect_gtp(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, /* GTPv2-C 3GPP TS 29.274 */ if (gtpv2_handle) { call_dissector(gtpv2_handle, tvb, pinfo, tree); - return tvb_captured_length(tvb); + return tvb_length(tvb); } } -- cgit v1.2.1