From 69cdfe9410e0bc2a3f22a0b499dad19e2323864a Mon Sep 17 00:00:00 2001 From: Evan Huus Date: Tue, 23 Jun 2015 21:30:15 -0700 Subject: Remove another batch of deprecated tvb_length calls Change-Id: Icfdde38e40cca05d0705a081153a4ea3e8782ee7 Reviewed-on: https://code.wireshark.org/review/9086 Reviewed-by: Evan Huus --- epan/dissectors/packet-gssapi.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) (limited to 'epan/dissectors/packet-gssapi.c') diff --git a/epan/dissectors/packet-gssapi.c b/epan/dissectors/packet-gssapi.c index ee04ed38dc..397229b539 100644 --- a/epan/dissectors/packet-gssapi.c +++ b/epan/dissectors/packet-gssapi.c @@ -259,8 +259,8 @@ dissect_gssapi_work(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, fd_head=fragment_add(&gssapi_reassembly_table, tvb, 0, pinfo, fi->first_frame, NULL, gss_info->frag_offset, - tvb_length(tvb), TRUE); - gss_info->frag_offset+=tvb_length(tvb); + tvb_captured_length(tvb), TRUE); + gss_info->frag_offset+=tvb_captured_length(tvb); /* we need more fragments */ if(!fd_head){ @@ -307,14 +307,14 @@ dissect_gssapi_work(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, if (!(appclass == BER_CLASS_APP && pc && tag == 0)) { /* It could be NTLMSSP, with no OID. This can happen for anything that microsoft calls 'Negotiate' or GSS-SPNEGO */ - if ((tvb_length_remaining(gss_tvb, start_offset)>7) && (tvb_strneql(gss_tvb, start_offset, "NTLMSSP", 7) == 0)) { + if ((tvb_captured_length_remaining(gss_tvb, start_offset)>7) && (tvb_strneql(gss_tvb, start_offset, "NTLMSSP", 7) == 0)) { return_offset = call_dissector(ntlmssp_handle, tvb_new_subset_remaining(gss_tvb, start_offset), pinfo, subtree); goto done; } /* Maybe it's new NTLMSSP payload */ - if ((tvb_length_remaining(gss_tvb, start_offset)>16) && + if ((tvb_captured_length_remaining(gss_tvb, start_offset)>16) && ((tvb_memeql(gss_tvb, start_offset, "\x01\x00\x00\x00", 4) == 0))) { return_offset = call_dissector(ntlmssp_payload_handle, tvb_new_subset_remaining(gss_tvb, start_offset), @@ -322,7 +322,7 @@ dissect_gssapi_work(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, pinfo->gssapi_data_encrypted = TRUE; goto done; } - if ((tvb_length_remaining(gss_tvb, start_offset)==16) && + if ((tvb_captured_length_remaining(gss_tvb, start_offset)==16) && ((tvb_memeql(gss_tvb, start_offset, "\x01\x00\x00\x00", 4) == 0))) { if( is_verifier ) { return_offset = call_dissector(ntlmssp_verf_handle, @@ -339,7 +339,7 @@ dissect_gssapi_work(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, } /* Maybe it's new GSSKRB5 CFX Wrapping */ - if ((tvb_length_remaining(gss_tvb, start_offset)>2) && + if ((tvb_captured_length_remaining(gss_tvb, start_offset)>2) && ((tvb_memeql(gss_tvb, start_offset, "\04\x04", 2) == 0) || (tvb_memeql(gss_tvb, start_offset, "\05\x04", 2) == 0))) { return_offset = call_dissector(spnego_krb5_wrap_handle, @@ -381,7 +381,7 @@ dissect_gssapi_work(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_tree_add_expert_format(subtree, pinfo, &ei_gssapi_unknown_header, gss_tvb, start_offset, 0, "Unknown header (class=%d, pc=%d, tag=%d)", appclass, pc, tag); - return_offset = tvb_length(gss_tvb); + return_offset = tvb_captured_length(gss_tvb); goto done; } else { tvbuff_t *oid_tvb_local; @@ -393,7 +393,7 @@ dissect_gssapi_work(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, handle = oidvalue->handle; len = call_dissector(handle, oid_tvb_local, pinfo, subtree); if (len == 0) - return_offset = tvb_length(gss_tvb); + return_offset = tvb_captured_length(gss_tvb); else return_offset = start_offset + len; goto done; /* We are finished here */ @@ -419,8 +419,8 @@ dissect_gssapi_work(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, */ if( (!pinfo->fd->flags.visited) && (oidvalue) - && (tvb_length(gss_tvb)==tvb_reported_length(gss_tvb)) - && (len1>(guint32)tvb_length_remaining(gss_tvb, oid_start_offset)) + && (tvb_captured_length(gss_tvb)==tvb_reported_length(gss_tvb)) + && (len1>(guint32)tvb_captured_length_remaining(gss_tvb, oid_start_offset)) && (gssapi_reassembly) ){ fi=wmem_new(wmem_file_scope(), gssapi_frag_info_t); fi->first_frame=pinfo->fd->num; @@ -429,13 +429,13 @@ dissect_gssapi_work(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, fragment_add(&gssapi_reassembly_table, gss_tvb, 0, pinfo, pinfo->fd->num, NULL, - 0, tvb_length(gss_tvb), TRUE); + 0, tvb_captured_length(gss_tvb), TRUE); fragment_set_tot_len(&gssapi_reassembly_table, pinfo, pinfo->fd->num, NULL, len1+oid_start_offset); gss_info->do_reassembly=TRUE; gss_info->first_frame=pinfo->fd->num; - gss_info->frag_offset=tvb_length(gss_tvb); + gss_info->frag_offset=tvb_captured_length(gss_tvb); goto done; } @@ -449,7 +449,7 @@ dissect_gssapi_work(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, /* No dissector for this oid */ proto_tree_add_item(subtree, hf_gssapi_token_object, gss_tvb, oid_start_offset, -1, ENC_NA); - return_offset = tvb_length(gss_tvb); + return_offset = tvb_captured_length(gss_tvb); goto done; } @@ -472,12 +472,12 @@ dissect_gssapi_work(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, len = call_dissector(handle, oid_tvb, pinfo, subtree); if (len == 0) - return_offset = tvb_length(gss_tvb); + return_offset = tvb_captured_length(gss_tvb); else return_offset = offset + len; } else { proto_tree_add_item(subtree, hf_gssapi_auth_verifier, gss_tvb, offset, -1, ENC_NA); - return_offset = tvb_length(gss_tvb); + return_offset = tvb_captured_length(gss_tvb); } } else { handle = oidvalue->handle; @@ -486,12 +486,12 @@ dissect_gssapi_work(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, len = call_dissector(handle, oid_tvb, pinfo, subtree); if (len == 0) - return_offset = tvb_length(gss_tvb); + return_offset = tvb_captured_length(gss_tvb); else return_offset = offset + len; } else { proto_tree_add_item(subtree, hf_gssapi_auth_credentials, gss_tvb, offset, -1, ENC_NA); - return_offset = tvb_length(gss_tvb); + return_offset = tvb_captured_length(gss_tvb); } } @@ -621,7 +621,7 @@ wrap_dissect_gssapi(tvbuff_t *tvb, int offset, packet_info *pinfo, dissect_gssapi(auth_tvb, pinfo, tree); - return tvb_length_remaining(tvb, offset); + return tvb_captured_length_remaining(tvb, offset); } int -- cgit v1.2.3